diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-06-23 11:20:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 11:20:19 +0200 |
| commit | ee7a4842844f19fb14f332ef85252d6adc968283 (patch) | |
| tree | a7f91df996235bb022a3b18da9f12ed64fab698e | |
| parent | c6d5653a85df1d007baca42ae67643fff937c2ab (diff) | |
| parent | 5f468c0248b6a36bcbf20953a4223168617c6926 (diff) | |
| download | nextcloud-server-ee7a4842844f19fb14f332ef85252d6adc968283.tar.gz nextcloud-server-ee7a4842844f19fb14f332ef85252d6adc968283.zip | |
Merge pull request #26346 from J0WI/clean-auth-regex
Cleaner removePassword regex
| -rw-r--r-- | lib/private/Log/ErrorHandler.php | 2 | ||||
| -rw-r--r-- | tests/lib/ErrorHandlerTest.php | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/private/Log/ErrorHandler.php b/lib/private/Log/ErrorHandler.php index 1d2376befbf..6c969fa093c 100644 --- a/lib/private/Log/ErrorHandler.php +++ b/lib/private/Log/ErrorHandler.php @@ -39,7 +39,7 @@ class ErrorHandler { * @return string */ protected static function removePassword($msg) { - return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg); + return preg_replace('#//(.*):(.*)@#', '//xxx:xxx@', $msg); } public static function register($debug = false) { diff --git a/tests/lib/ErrorHandlerTest.php b/tests/lib/ErrorHandlerTest.php index 702f64bfb99..ea53e67005c 100644 --- a/tests/lib/ErrorHandlerTest.php +++ b/tests/lib/ErrorHandlerTest.php @@ -30,11 +30,15 @@ class ErrorHandlerTest extends \Test\TestCase { */ public function passwordProvider() { return [ - ['user', 'password'], - ['user@owncloud.org', 'password'], - ['user', 'pass@word'], + ['us:er', 'pass@word'], ['us:er', 'password'], + ['user', '-C:R,w)@6*}'], ['user', 'pass:word'], + ['user', 'pass@word'], + ['user', 'password'], + ['user:test@cloud', 'password'], + ['user@owncloud.org', 'password'], + ['user@test@owncloud.org', 'password'], ]; } |