Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-10-01 01:26:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

QA

Browse Source
This commit is contained in:
rodehoed 2021-05-04 11:14:11 +02:00 committed by GitHub
parent b21efd8336
commit 805eb288d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Persistence/TrafficLimiter.php
View File

@ -82,7 +82,6 @@ class TrafficLimiter extends AbstractPersistence
*/ */
public static function setConfiguration(Configuration $conf) public static function setConfiguration(Configuration $conf)
{ {
self::setLimit($conf->getKey('limit', 'traffic')); self::setLimit($conf->getKey('limit', 'traffic'));
self::setPath($conf->getKey('dir', 'traffic')); self::setPath($conf->getKey('dir', 'traffic'));
self::setExemptedIp($conf->getKey('exemptedIp', 'traffic')); self::setExemptedIp($conf->getKey('exemptedIp', 'traffic'));
@ -127,11 +126,11 @@ class TrafficLimiter extends AbstractPersistence
// Check if $_ipKey is exempted from ratelimiting // Check if $_ipKey is exempted from ratelimiting
if (!is_null(self::$_exemptedIp)) { if (!is_null(self::$_exemptedIp)) {
$exIp_array = explode(",", self::$_exemptedIp); $exIp_array = explode(',', self::$_exemptedIp);
foreach ($exIp_array as $ipRange) { foreach ($exIp_array as $ipRange) {
// Match $_ipKey to $ipRange and if it matches it will return with a true // Match $_ipKey to $ipRange and if it matches it will return with a true
$address = \IPLib\Factory::addressFromString($_SERVER[self::$_ipKey]); $address = \IPLib\Factory::addressFromString($_SERVER[self::$_ipKey]);
$range = \IPLib\Factory::rangeFromString(trim($ipRange)); $range = \IPLib\Factory::rangeFromString(trim($ipRange));
// If $range is null something went wrong (possible invalid ip given in config) // If $range is null something went wrong (possible invalid ip given in config)
if ($range == null) { if ($range == null) {
$contained = false; $contained = false;