From 96acad1e45555380a8ca90767b3bc00a2f44bf4f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 1 Apr 2021 09:13:32 +0200 Subject: [PATCH 1/2] Update github token pattern to match their latest updates --- src/Composer/Util/ProcessExecutor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php index cb1886e94..658c2a136 100644 --- a/src/Composer/Util/ProcessExecutor.php +++ b/src/Composer/Util/ProcessExecutor.php @@ -45,8 +45,8 @@ class ProcessExecutor { if ($this->io && $this->io->isDebug()) { $safeCommand = preg_replace_callback('{://(?P[^:/\s]+):(?P[^@\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'])) { + // if the username looks like a long (12char+) hex string, or a modern github token (e.g. ghp_xxx) we obfuscate that + if (preg_match('{^([a-f0-9]{12,}|gh[a-z]_[a-zA-Z0-9_]+)$}', $m['user'])) { return '://***:***@'; } From 4dc293b289fd12a28a3f13780339a0393f094d7c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 1 Apr 2021 09:16:28 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f476eec..844f1b5e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### [1.10.21] 2021-04-01 + + * Fixed support for new GitHub OAuth token format + * Fixed processes silently ignoring the CWD when it does not exist + ### [1.10.20] 2021-01-27 * Fixed exclude-from-classmap causing regex issues when having too many paths @@ -929,6 +934,7 @@ * Initial release +[1.10.21]: https://github.com/composer/composer/compare/1.10.20...1.10.21 [1.10.20]: https://github.com/composer/composer/compare/1.10.19...1.10.20 [1.10.19]: https://github.com/composer/composer/compare/1.10.18...1.10.19 [1.10.18]: https://github.com/composer/composer/compare/1.10.17...1.10.18