external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-11 18:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

added ipv6 support in ALLOWED_SUBNET variable

Browse Source
This commit is contained in:
Christian Haschek
2022-02-19 08:56:29 +01:00
parent d6f3b7b5df
commit adb1c468cd
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
inc/core.php
View File

@@ -594,31 +594,38 @@ function deleteHash($hash)
} }
/** /**
* Check if a given ip is in a network * Check if a given IPv4 or IPv6 is in a network
* @param string $ip IP to check in IPV4 format eg. 127.0.0.1 * @param string $ip IP to check in IPV4 format eg. 127.0.0.1
* @param string $range IP/CIDR netmask eg. 127.0.0.0/24, also 127.0.0.1 is accepted and /32 assumed * @param string $range IP/CIDR netmask eg. 127.0.0.0/24, or 2001:db8::8a2e:370:7334/128
* @return boolean true if the ip is in this range / false if not. * @return boolean true if the ip is in this range / false if not.
* via https://gist.github.com/tott/7684443 * via https://stackoverflow.com/a/56050595/1174516
*/ */
function isIPInRange( $ip, $range ) { function isIPInRange( $ip, $range ) {
if(strpos($range,',')!==false) // Get mask bits
{ list($net, $maskBits) = explode('/', $range);
$ranges = explode(',',$range);
foreach($ranges as $range) // Size
if(isIPInRange( $ip, $range )) return true; $size = (strpos($ip, ':') === false) ? 4 : 16;
return false;
// Convert to binary
$ip = inet_pton($ip);
$net = inet_pton($net);
if (!$ip || !$net) {
throw new InvalidArgumentException('Invalid IP address');
} }
if ( strpos( $range, '/' ) == false )
{ // Build mask
$range .= '/32'; $solid = floor($maskBits / 8);
$solidBits = $solid * 8;
$mask = str_repeat(chr(255), $solid);
for ($i = $solidBits; $i < $maskBits; $i += 8) {
$bits = max(0, min(8, $maskBits - $i));
$mask .= chr((pow(2, $bits) - 1) << (8 - $bits));
} }
// $range is in IP/CIDR format eg 127.0.0.1/24 $mask = str_pad($mask, $size, chr(0));
list( $range, $netmask ) = explode( '/', $range, 2 );
$range_decimal = ip2long( $range ); // Compare the mask
$ip_decimal = ip2long( $ip ); return ($ip & $mask) === ($net & $mask);
$wildcard_decimal = pow( 2, ( 32 - $netmask ) ) - 1;
$netmask_decimal = ~ $wildcard_decimal;
return ( ( $ip_decimal & $netmask_decimal ) == ( $range_decimal & $netmask_decimal ) );
} }
function loadContentControllers() function loadContentControllers()

2
rtfm/CONFIG.md
View File

@@ -17,7 +17,7 @@ In this file you can set the following options. For a simple working example con
| MASTER_DELETE_CODE | string | If set, this code will be accepted to delete any image by adding "delete_yourmasterdeletecode" to any image | | MASTER_DELETE_CODE | string | If set, this code will be accepted to delete any image by adding "delete_yourmasterdeletecode" to any image |
| MASTER_DELETE_IP | IP addr | If set, allows deletion of image no matter what delete code you provided if request is coming from this single IP | | MASTER_DELETE_IP | IP addr | If set, allows deletion of image no matter what delete code you provided if request is coming from this single IP |
| UPLOAD_FORM_LOCATION | string | If set, will only show the upload form if this url is requested. eg if you set it to /secret/upload then you only see the form if you go to http://your.pictshare.server/secret/upload but bare in mind that the uploads [via API](/rtfm/API.md) will still work for anyone| | UPLOAD_FORM_LOCATION | string | If set, will only show the upload form if this url is requested. eg if you set it to /secret/upload then you only see the form if you go to http://your.pictshare.server/secret/upload but bare in mind that the uploads [via API](/rtfm/API.md) will still work for anyone|
| ALLOWED_SUBNET | IP addr | If set, will only show the upload form and allow to upload via API if request is coming from this subnet | | ALLOWED_SUBNET | IPv4 or IPv6 CIDR | If set, will limit uploads to IPs that match this CIDR |
| UPLOAD_QUOTA (NOT IMPLEMENTED) | int | Size in MB. If set, will only allow uploads if combined size of uploads on Server is smaller than this value. Does not account for ALT_FOLDER data and resized versions of original uploads won't be added to calculation | | UPLOAD_QUOTA (NOT IMPLEMENTED) | int | Size in MB. If set, will only allow uploads if combined size of uploads on Server is smaller than this value. Does not account for ALT_FOLDER data and resized versions of original uploads won't be added to calculation |
| UPLOAD_CODE (NOT IMPLEMENTED | string | If set, all uploads require this code via GET or POST variable "uploadcode" or upload will fail | | UPLOAD_CODE (NOT IMPLEMENTED | string | If set, all uploads require this code via GET or POST variable "uploadcode" or upload will fail |
| MAX_RESIZED_IMAGES (NOT IMPLEMENTED | string | If set, limits count of resized images/videos per file on server | | MAX_RESIZED_IMAGES (NOT IMPLEMENTED | string | If set, limits count of resized images/videos per file on server |