public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Alternative fix for #9941 to avoid code duplication

pull/9942/head
Jordi Boggiano 2021-06-05 15:58:55 +02:00
parent cbd1e3c2af
commit 288e19153d
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/Util/Url.php
View File

@ -109,25 +109,13 @@ class Url
// e.g. https://api.github.com/repositories/9999999999?access_token=github_token // e.g. https://api.github.com/repositories/9999999999?access_token=github_token
$url = preg_replace('{([&?]access_token=)[^&]+}', '$1***', $url); $url = preg_replace('{([&?]access_token=)[^&]+}', '$1***', $url);
// duplication here to apparent PCRE regression in v10.37 26-May-2021 which $url = preg_replace_callback('{^(?P<prefix>[a-z0-9]+://)?(?P<user>[^:/\s@]+):(?P<password>[^@\s/]+)@}i', function ($m) {
// makes (?P<prefix>://|^) not match anymore
// should be reverted ideally when fixed in upstream
$url = preg_replace_callback('{^(?P<user>[^:/\s@]+):(?P<password>[^@\s/]+)@}i', function ($m) {
// if the username looks like a long (12char+) hex string, or a modern github token (e.g. gp1_xxx) we obfuscate that // if the username looks like a long (12char+) hex string, or a modern github token (e.g. gp1_xxx) we obfuscate that
if (preg_match('{^([a-f0-9]{12,}|g[a-z]\d_[a-zA-Z0-9_]+)$}', $m['user'])) { if (preg_match('{^([a-f0-9]{12,}|g[a-z]\d_[a-zA-Z0-9_]+)$}', $m['user'])) {
return '***:***@'; return $m['prefix'].'***:***@';
} }
return $m['user'].':***@'; return $m['prefix'].$m['user'].':***@';
}, $url);
$url = preg_replace_callback('{://(?P<user>[^:/\s@]+):(?P<password>[^@\s/]+)@}i', function ($m) {
// if the username looks like a long (12char+) hex string, or a modern github token (e.g. gp1_xxx) we obfuscate that
if (preg_match('{^([a-f0-9]{12,}|g[a-z]\d_[a-zA-Z0-9_]+)$}', $m['user'])) {
return '://***:***@';
}
return '://'.$m['user'].':***@';
}, $url); }, $url);
return $url; return $url;