StarMirror
/
PrivateBin
mirror of https://github.com/PrivateBin/PrivateBin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

address Scrutinizer issues

pull/795/head
El RIDO 2021-05-22 11:30:17 +02:00
parent 7a1de52e05
commit b6460616ba
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Persistence/TrafficLimiter.php
View File

@ -38,7 +38,7 @@ class TrafficLimiter extends AbstractPersistence
* *
* @access private * @access private
* @static * @static
* @var array * @var string|null
*/ */
private static $_exemptedIp = null; private static $_exemptedIp = null;
@ -110,7 +110,7 @@ class TrafficLimiter extends AbstractPersistence
} }
/** /**
* Validate $_ipKey against configured ipranges. If matched ratelimiter will ignore ip * Validate $_ipKey against configured ipranges. If matched we will ignore the ip
* *
* @access private * @access private
* @static * @static
@ -119,9 +119,11 @@ class TrafficLimiter extends AbstractPersistence
*/ */
private static function matchIp($ipRange = null) private static function matchIp($ipRange = null)
{ {
// Match $_ipKey to $ipRange and if it matches it will return with a true if (is_string($ipRange)) {
$ipRange = trim($ipRange);
}
$address = Factory::addressFromString($_SERVER[self::$_ipKey]); $address = Factory::addressFromString($_SERVER[self::$_ipKey]);
$range = Factory::rangeFromString(trim($ipRange)); $range = Factory::rangeFromString($ipRange);
// address could not be parsed, we might not be in IP space and try a string comparison instead // address could not be parsed, we might not be in IP space and try a string comparison instead
if ($address == null) { if ($address == null) {
@ -148,7 +150,7 @@ class TrafficLimiter extends AbstractPersistence
* *
* @access public * @access public
* @static * @static
* @throws \Exception * @throws Exception
* @return bool * @return bool
*/ */
public static function canPass() public static function canPass()