From f3eb8f9c8ac7c1612d0073f835b897619e23097c Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Tue, 20 Apr 2021 02:59:49 +0000 Subject: [PATCH] Refactor gpg key organization --- downloads.php | 16 +-- gpg-keys.php | 10 +- include/gpg-keys.inc | 244 +++++++++++++++++++++++-------------------- 3 files changed, 132 insertions(+), 138 deletions(-) diff --git a/downloads.php b/downloads.php index 01de834c9..ff23d5ee5 100644 --- a/downloads.php +++ b/downloads.php @@ -91,21 +91,7 @@ The following official GnuPG keys of the current PHP Release Manager can be used to verify the tags:

- $major_releases): /* major releases loop start */ - $releases = array_slice($major_releases, 0, $SHOW_COUNT); -?> - $_): ?> - - -

PHP

-
- 
-
-
-
- - - +

diff --git a/gpg-keys.php b/gpg-keys.php index 00a43eac0..eaea08536 100644 --- a/gpg-keys.php +++ b/gpg-keys.php @@ -14,15 +14,7 @@ site_header('GPG Keys'); verify these tags:

- $data): ?> -

PHP

- -
- 
-
-
-
- +

Keyring

diff --git a/include/gpg-keys.inc b/include/gpg-keys.inc index b8a2bd37b..ff64881be 100644 --- a/include/gpg-keys.inc +++ b/include/gpg-keys.inc @@ -1,132 +1,148 @@  <<< GPG -pub 4096R/70D12172 2017-04-14 [expires: 2024-04-21] - Key fingerprint = 1729 F839 38DA 44E2 7BA0 F4D3 DBDB 3974 70D1 2172 -uid Sara Golemon <pollita@php.net> -pub rsa4096 2020-05-09 [SC] [expires: 2024-05-08] - BFDD D286 4282 4F81 18EF 7790 9B67 A5C1 2229 118F -uid [ultimate] Gabriel Caruso (Release Manager) <carusogabriel@php.net> -sub rsa4096 2020-05-09 [E] [expires: 2024-05-08] -GPG -, +function gpg_key_get(string $rm): ?string { + switch ($rm) { + case 'ab': + return + "pub 2048R/9C0D5763 2015-06-09 [expires: 2024-06-06]\n" . + " Key fingerprint = 1A4E 8B72 77C4 2E53 DBA9 C7B9 BCAA 30EA 9C0D 5763\n" . + "uid Anatol Belski "; - "7.4" => <<< GPG -sec rsa4096 2019-06-11 [SC] [expires: 2029-06-08] - 5A52880781F755608BF815FC910DEB46F53EA312 -uid [ultimate] Derick Rethans <gpg@derickrethans.nl> -uid [ultimate] Derick Rethans <derick@derickrethans.nl> -uid [ultimate] Derick Rethans (GitHub) <github@derickrethans.nl> -uid [ultimate] Derick Rethans (PHP) <derick@php.net> -ssb rsa4096 2019-06-11 [E] [expires: 2029-06-08] + case 'carusogabriel': + return + "pub rsa4096 2020-05-09 [SC] [expires: 2024-05-08]\n" . + " BFDD D286 4282 4F81 18EF 7790 9B67 A5C1 2229 118F\n" . + "uid [ultimate] Gabriel Caruso (Release Manager) \n" . + "sub rsa4096 2020-05-09 [E] [expires: 2024-05-08]"; -pub rsa4096 2019-05-29 [SC] [expires: 2021-05-28] - 4267 0A7F E4D0 441C 8E46 3234 9E4F DC07 4A4E F02D -uid [ultimate] Peter Kokot <petk@php.net> -sub rsa4096 2019-05-29 [E] [expires: 2021-05-28] -GPG -, - "7.3" => <<< GPG -pub rsa4096/118BCCB6 2018-06-05 [SC] [expires: 2022-06-04] - Key fingerprint = CBAF 69F1 73A0 FEA4 B537 F470 D66C 9593 118B CCB6 -uid Christoph M. Becker <cmb@php.net> + case 'cmb': + return + "pub rsa4096/118BCCB6 2018-06-05 [SC] [expires: 2022-06-04]\n" . + " Key fingerprint = CBAF 69F1 73A0 FEA4 B537 F470 D66C 9593 118B CCB6\n" . + "uid Christoph M. Becker "; -pub 2048D/5DA04B5D 2012-03-19 - Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D -uid Stanislav Malyshev (PHP key) <smalyshev@gmail.com> -uid Stanislav Malyshev (PHP key) <stas@php.net> -uid Stanislav Malyshev (PHP key) <smalyshev@sugarcrm.com> -GPG -, - "7.2" => <<< GPG -pub 4096R/70D12172 2017-04-14 [expires: 2024-04-21] - Key fingerprint = 1729 F839 38DA 44E2 7BA0 F4D3 DBDB 3974 70D1 2172 -uid Sara Golemon <pollita@php.net> + case 'davey': + return + "pub 4096R/7BD5DCD0 2016-05-07\n" . + " Key fingerprint = A917 B1EC DA84 AEC2 B568 FED6 F50A BC80 7BD5 DCD0\n" . + "uid Davey Shafik "; -pub 4096R/EE5AF27F 2017-05-24 [expires: 2024-05-22] - Key fingerprint = B1B4 4D8F 021E 4E2D 6021 E995 DC9F F8D3 EE5A F27F -uid Remi Collet <remi@php.net> + case 'derick': + return + "sec rsa4096 2019-06-11 [SC] [expires: 2029-06-08]\n" . + " 5A52880781F755608BF815FC910DEB46F53EA312\n" . + "uid [ultimate] Derick Rethans \n" . + "uid [ultimate] Derick Rethans \n" . + "uid [ultimate] Derick Rethans (GitHub) \n" . + "uid [ultimate] Derick Rethans (PHP) \n" . + "ssb rsa4096 2019-06-11 [E] [expires: 2029-06-08]"; -pub rsa4096/118BCCB6 2018-06-05 [SC] [expires: 2022-06-04] - Key fingerprint = CBAF 69F1 73A0 FEA4 B537 F470 D66C 9593 118B CCB6 -uid Christoph M. Becker <cmb@php.net> -GPG -, - "7.1" => <<< GPG -pub 4096R/7BD5DCD0 2016-05-07 - Key fingerprint = A917 B1EC DA84 AEC2 B568 FED6 F50A BC80 7BD5 DCD0 -uid Davey Shafik <davey@php.net> + case 'dsp': + return + "pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19]\n" . + " Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D\n" . + "uid David Soria Parra "; -pub 2048R/31CBD89E 2016-12-08 - Key fingerprint = 5289 95BF EDFB A719 1D46 839E F9BA 0ADA 31CB D89E -uid Joe Watkins <krakjoe@php.net> + case 'johannes': + return + "pub 2048R/FC9C83D7 2012-03-18 [expires: 2017-03-17]\n" . + " Key fingerprint = 0A95 E9A0 2654 2D53 835E 3F3A 7DEC 4E69 FC9C 83D7\n" . + "uid Johannes Schlüter \n" . + "uid Johannes Schlüter "; -pub 4096R/70D12172 2017-04-14 [expires: 2024-04-21] - Key fingerprint = 1729 F839 38DA 44E2 7BA0 F4D3 DBDB 3974 70D1 2172 -uid Sara Golemon <pollita@php.net> + case 'jpauli': + return + "pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17]\n" . + " Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1\n" . + "uid Julien Pauli "; -GPG -, - "7.0" => <<< GPG -pub 2048R/9C0D5763 2015-06-09 [expires: 2024-06-06] - Key fingerprint = 1A4E 8B72 77C4 2E53 DBA9 C7B9 BCAA 30EA 9C0D 5763 -uid Anatol Belski <ab@php.net> + case 'krakjoe': + return + "pub 2048R/31CBD89E 2016-12-08\n" . + " Key fingerprint = 5289 95BF EDFB A719 1D46 839E F9BA 0ADA 31CB D89E\n" . + "uid Joe Watkins "; -pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13] - Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3 -uid Ferenc Kovacs <tyrael@php.net> + case 'petk': + return + "pub rsa4096 2019-05-29 [SC] [expires: 2021-05-28]\n" . + " 4267 0A7F E4D0 441C 8E46 3234 9E4F DC07 4A4E F02D\n" . + "uid [ultimate] Peter Kokot \n" . + "sub rsa4096 2019-05-29 [E] [expires: 2021-05-28]"; -GPG -, - "5.6" => <<< GPG -pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13] - Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3 -uid Ferenc Kovacs <tyrael@php.net> + case 'pollita': + return + "pub 4096R/70D12172 2017-04-14 [expires: 2024-04-21]\n" . + " Key fingerprint = 1729 F839 38DA 44E2 7BA0 F4D3 DBDB 3974 70D1 2172\n" . + "uid Sara Golemon "; -pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] - Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 -uid Julien Pauli <jpauli@php.net> + case 'remi': + return + "pub 4096R/EE5AF27F 2017-05-24 [expires: 2024-05-22]\n" . + " Key fingerprint = B1B4 4D8F 021E 4E2D 6021 E995 DC9F F8D3 EE5A F27F\n" . + "uid Remi Collet "; -GPG -, - "5.5" => <<< GPG -pub 2048R/90D90EC1 2013-07-18 [expire : 2016-07-17] - Key fingerprint = 0BD7 8B5F 9750 0D45 0838 F95D FE85 7D9A 90D9 0EC1 -uid Julien Pauli <jpauli@php.net> + case 'stas': + return + "pub 2048D/5DA04B5D 2012-03-19\n" . + " Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D\n" . + "uid Stanislav Malyshev (PHP key) \n" . + "uid Stanislav Malyshev (PHP key) \n" . + "uid Stanislav Malyshev (PHP key) "; -pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] - Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D -uid David Soria Parra <dsp@php.net> + case 'tyrael': + return + "pub 2048R/33CFC8B3 2014-01-14 [expires: 2020-01-13]\n" . + " Key fingerprint = 6E4F 6AB3 21FD C07F 2C33 2E3A C2BF 0BC4 33CF C8B3\n" . + "uid Ferenc Kovacs "; -pub 2048D/5DA04B5D 2012-03-19 - Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D -uid Stanislav Malyshev (PHP key) <smalyshev@gmail.com> -uid Stanislav Malyshev (PHP key) <stas@php.net> -uid Stanislav Malyshev (PHP key) <smalyshev@sugarcrm.com> + default: + return null; + } +} -GPG -, - "5.4" => <<< GPG -pub 2048D/5DA04B5D 2012-03-19 - Key fingerprint = F382 5282 6ACD 957E F380 D39F 2F79 56BC 5DA0 4B5D -uid Stanislav Malyshev (PHP key) <smalyshev@gmail.com> -uid Stanislav Malyshev (PHP key) <stas@php.net> -uid Stanislav Malyshev (PHP key) <smalyshev@sugarcrm.com> -GPG -, - "5.3" => <<< GPG -pub 4096R/7267B52D 2012-03-20 [expires: 2016-03-19] - Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D -uid David Soria Parra <dsp@php.net> -pub 2048R/FC9C83D7 2012-03-18 [expires: 2017-03-17] - Key fingerprint = 0A95 E9A0 2654 2D53 835E 3F3A 7DEC 4E69 FC9C 83D7 -uid Johannes Schlüter <johannes@schlueters.de> -uid Johannes Schlüter <johannes@php.net> -GPG -); +function gpg_key_get_branches(bool $activeOnly): array { + $branches = [ + '8.0' => [ 'pollita', 'carusogabriel' ], + '7.4' => [ 'derick', 'petk' ], + '7.3' => [ 'cmb', 'stas' ], + '7.2' => [ 'pollita', 'remi', 'cmb' ], + '7.1' => [ 'davey', 'krakjoe', 'pollita' ], + '7.0' => [ 'ab', 'tyrael' ], + '5.6' => [ 'tyrael', 'jpauli' ], + '5.5' => [ 'jpauli', 'dsp', 'stas' ], + '5.4' => [ 'stas' ], + '5.3' => [ 'dsp', 'johannes' ], + ]; + + if (!$activeOnly) { return $branches; } + + $active = get_active_branches(); + return array_filter($branches, function($branch) use ($active) { + [$major] = explode('.', $branch, 2); + return isset($active[$major][$branch]); + }, ARRAY_FILTER_USE_KEY); +} + +function gpg_key_show_keys(bool $activeOnly): void { + $branches = gpg_key_get_branches($activeOnly); + + foreach (gpg_key_get_branches($activeOnly) as $branch => $rms) { + $keys = array_filter( + array_map(function($rm) { return gpg_key_get($rm); }, $rms), + function($key) { return $key !== null; }); + if (empty($keys)) { continue; } + + $branch = htmlentities($branch, ENT_QUOTES, 'UTF-8'); + $keys = htmlentities(implode("\n\n", $keys), ENT_QUOTES, 'UTF-8'); + + echo "

PHP $branch

\n"; + echo "
\n"; + echo " 
\n";
+        echo $keys, "\n";
+        echo "
\n"; + echo "
\n\n\n"; + } +}