diff options
| author | Faraz Samapoor <fsamapoor@gmail.com> | 2023-05-15 15:17:19 +0330 |
|---|---|---|
| committer | Faraz Samapoor <fsamapoor@gmail.com> | 2023-05-15 15:17:19 +0330 |
| commit | e7cc7653b885c49b1b3f0a78f91ea05a53e102d8 (patch) | |
| tree | 42da61d5c6e988d7c9eff7e081327a73f661dc89 /lib/private/Security | |
| parent | 8bdb50fd507bfe68161ab98eba903872083ea4f3 (diff) | |
| download | nextcloud-server-e7cc7653b885c49b1b3f0a78f91ea05a53e102d8.tar.gz nextcloud-server-e7cc7653b885c49b1b3f0a78f91ea05a53e102d8.zip | |
Refactors "strpos" calls in lib/private to improve code readability.
Signed-off-by: Faraz Samapoor <fsamapoor@gmail.com>
Diffstat (limited to 'lib/private/Security')
| -rw-r--r-- | lib/private/Security/Bruteforce/Throttler.php | 2 | ||||
| -rw-r--r-- | lib/private/Security/RemoteHostValidator.php | 3 | ||||
| -rw-r--r-- | lib/private/Security/TrustedDomainHelper.php | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php index d5fd0984baa..8c0f6f3d1a9 100644 --- a/lib/private/Security/Bruteforce/Throttler.php +++ b/lib/private/Security/Bruteforce/Throttler.php @@ -157,7 +157,7 @@ class Throttler implements IThrottler { $keys = $this->config->getAppKeys('bruteForce'); $keys = array_filter($keys, function ($key) { - return 0 === strpos($key, 'whitelist_'); + return str_starts_with($key, 'whitelist_'); }); if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { diff --git a/lib/private/Security/RemoteHostValidator.php b/lib/private/Security/RemoteHostValidator.php index e48bd862472..38129fbd81b 100644 --- a/lib/private/Security/RemoteHostValidator.php +++ b/lib/private/Security/RemoteHostValidator.php @@ -30,7 +30,6 @@ use OC\Net\IpAddressClassifier; use OCP\IConfig; use OCP\Security\IRemoteHostValidator; use Psr\Log\LoggerInterface; -use function strpos; use function strtolower; use function substr; use function urldecode; @@ -61,7 +60,7 @@ final class RemoteHostValidator implements IRemoteHostValidator { $host = idn_to_utf8(strtolower(urldecode($host))); // Remove brackets from IPv6 addresses - if (strpos($host, '[') === 0 && substr($host, -1) === ']') { + if (str_starts_with($host, '[') && str_ends_with($host, ']')) { $host = substr($host, 1, -1); } diff --git a/lib/private/Security/TrustedDomainHelper.php b/lib/private/Security/TrustedDomainHelper.php index 1927af9cb1d..ca6a5cba073 100644 --- a/lib/private/Security/TrustedDomainHelper.php +++ b/lib/private/Security/TrustedDomainHelper.php @@ -98,7 +98,7 @@ class TrustedDomainHelper implements ITrustedDomainHelper { return true; } // Reject malformed domains in any case - if (strpos($domain, '-') === 0 || strpos($domain, '..') !== false) { + if (str_starts_with($domain, '-') || str_contains($domain, '..')) { return false; } // Match, allowing for * wildcards |