From 96b87dfb706b64405faf78ee01cab2d0818a5fe4 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 19 May 2022 09:21:03 +0100 Subject: [PATCH] Issue #3272956 by xjm, Wim Leers, tedbow, dww: Hardcode security coverage EOL dates for Drupal 9.4 and 9.5 (as was done for 8.8 and 8.9) --- .../update/src/ProjectSecurityData.php | 8 +- .../release-history/drupal.sec.10.5.0.xml | 57 ++++++++++ .../release-history/drupal.sec.9.0.xml | 102 ----------------- .../release-history/drupal.sec.9.5.0.xml | 57 ++++++++++ .../release-history/drupal.sec.9.9.0.xml | 102 ----------------- .../src/Functional/UpdateSemverCoreTest.php | 104 ++++++++++-------- 6 files changed, 177 insertions(+), 253 deletions(-) create mode 100644 core/modules/update/tests/fixtures/release-history/drupal.sec.10.5.0.xml delete mode 100644 core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml create mode 100644 core/modules/update/tests/fixtures/release-history/drupal.sec.9.5.0.xml delete mode 100644 core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml diff --git a/core/modules/update/src/ProjectSecurityData.php b/core/modules/update/src/ProjectSecurityData.php index 6df3899a3af..6c927c5e0f3 100644 --- a/core/modules/update/src/ProjectSecurityData.php +++ b/core/modules/update/src/ProjectSecurityData.php @@ -39,11 +39,13 @@ final class ProjectSecurityData { * * @see \Drupal\update\ProjectSecurityRequirement::getDateEndRequirement() */ - const SECURITY_COVERAGE_END_DATE_8_8 = '2020-12-02'; + const SECURITY_COVERAGE_END_DATE_9_4 = '2023-06-21'; - const SECURITY_COVERAGE_ENDING_WARN_DATE_8_8 = '2020-06-02'; + const SECURITY_COVERAGE_ENDING_WARN_DATE_9_4 = '2022-12-14'; - const SECURITY_COVERAGE_END_DATE_8_9 = '2021-11'; + const SECURITY_COVERAGE_END_DATE_9_5 = '2023-11'; + + const SECURITY_COVERAGE_ENDING_WARN_DATE_9_5 = '2023-05-14'; /** * The existing (currently installed) version of the project. diff --git a/core/modules/update/tests/fixtures/release-history/drupal.sec.10.5.0.xml b/core/modules/update/tests/fixtures/release-history/drupal.sec.10.5.0.xml new file mode 100644 index 00000000000..511111f9513 --- /dev/null +++ b/core/modules/update/tests/fixtures/release-history/drupal.sec.10.5.0.xml @@ -0,0 +1,57 @@ + + + + Drupal + drupal + Drupal + 10.4.,10.5. + published + http://example.com/project/drupal + ProjectsDrupal project + + + Drupal 10.5.0 + 10.5.0 + published + http://example.com/drupal-10-5-0-release + http://example.com/drupal-10-5-0.tar.gz + 1750424641 + + + Release type + New features + + + Release type + Bug fixes + + + + + Drupal 10.4.0 + 10.4.0 + published + http://example.com/drupal-10-4-0-release + http://example.com/drupal-10-4-0.tar.gz + 1730424641 + + + Release type + New features + + + Release type + Bug fixes + + + + + diff --git a/core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml b/core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml deleted file mode 100644 index 03bb1c7af9b..00000000000 --- a/core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - Drupal - drupal - Drupal - 8.x - 8 - 8,9 - 8 - published - http://example.com/project/drupal - ProjectsDrupal project - - - Drupal 8.9.0 - 8.9.0 - published - http://example.com/drupal-8-9-0-release - http://example.com/drupal-8-9-0.tar.gz - 1250424641 - - - Release type - New features - - - Release type - Bug fixes - - - - - drupal 8.9.0-beta2 - 8.9.0-beta2 - published - http://example.com/drupal-8-9-0-beta2-release - http://example.com/drupal-8-9-0-beta2.tar.gz - 1533298080 - - Release typeBug fixes - Release typeNew features - - - Beta releases are not covered by Drupal security advisories. - - - - Drupal 8.8.0 - 8.8.0 - published - http://example.com/drupal-8-8-0-release - http://example.com/drupal-8-8-0.tar.gz - 1250424641 - - - Release type - New features - - - Release type - Bug fixes - - - - - Drupal 8.1.0 - 8.1.0 - published - http://example.com/drupal-8-1-0-release - http://example.com/drupal-8-1-0.tar.gz - 1250424521 - - - Release type - New features - - - Release type - Bug fixes - - - - - Drupal 8.0.0 - 8.0.0 - published - http://example.com/drupal-8-0-0-release - http://example.com/drupal-8-0-0.tar.gz - 1250424521 - - - Release type - New features - - - Release type - Bug fixes - - - - - diff --git a/core/modules/update/tests/fixtures/release-history/drupal.sec.9.5.0.xml b/core/modules/update/tests/fixtures/release-history/drupal.sec.9.5.0.xml new file mode 100644 index 00000000000..282070c81c5 --- /dev/null +++ b/core/modules/update/tests/fixtures/release-history/drupal.sec.9.5.0.xml @@ -0,0 +1,57 @@ + + + + Drupal + drupal + Drupal + 9.4.,9.5. + published + http://example.com/project/drupal + ProjectsDrupal project + + + Drupal 9.5.0 + 9.5.0 + published + http://example.com/drupal-9-5-0-release + http://example.com/drupal-9-5-0.tar.gz + 1670972400 + + + Release type + New features + + + Release type + Bug fixes + + + + + Drupal 9.4.0 + 9.4.0 + published + http://example.com/drupal-9-4-0-release + http://example.com/drupal-9-4-0.tar.gz + 1655244000 + + + Release type + New features + + + Release type + Bug fixes + + + + + diff --git a/core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml b/core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml deleted file mode 100644 index 84aee5093c4..00000000000 --- a/core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - Drupal - drupal - Drupal - 9.x - 8 - 8,9 - 9 - published - http://example.com/project/drupal - ProjectsDrupal project - - - Drupal 9.9.0 - 9.9.0 - published - http://example.com/drupal-9-9-0-release - http://example.com/drupal-9-9-0.tar.gz - 1250424641 - - - Release type - New features - - - Release type - Bug fixes - - - - - drupal 9.9.0-beta2 - 9.9.0-beta2 - published - http://example.com/drupal-9-9-0-beta2-release - http://example.com/drupal-9-9-0-beta2.tar.gz - 1533298080 - - Release typeBug fixes - Release typeNew features - - - Beta releases are not covered by Drupal security advisories. - - - - Drupal 9.8.0 - 9.8.0 - published - http://example.com/drupal-9-8-0-release - http://example.com/drupal-9-8-0.tar.gz - 1250424641 - - - Release type - New features - - - Release type - Bug fixes - - - - - Drupal 9.1.0 - 9.1.0 - published - http://example.com/drupal-9-1-0-release - http://example.com/drupal-9-1-0.tar.gz - 1250424521 - - - Release type - New features - - - Release type - Bug fixes - - - - - Drupal 9.0.0 - 9.0.0 - published - http://example.com/drupal-9-0-0-release - http://example.com/drupal-9-0-0.tar.gz - 1250424521 - - - Release type - New features - - - Release type - Bug fixes - - - - - diff --git a/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php b/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php index a8886d4a82a..d740425fbd6 100644 --- a/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php +++ b/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php @@ -99,10 +99,12 @@ class UpdateSemverCoreTest extends UpdateSemverTestBase { * - drupal.sec.2.0_9.0.0.xml * - 8.2.0 * - 9.0.0 - * - drupal.sec.9.0.xml - * - 8.9.0 - * - drupal.sec.9.9.0.xml - * - 9.9.0 + * - drupal.sec.9.5.0.xml + * - 9.4.0 + * - 9.5.0 + * - drupal.sec.10.5.0.xml + * - 10.4.0 + * - 10.5.0 */ public function securityCoverageMessageProvider() { $release_coverage_message = 'Visit the release cycle overview for more information on supported releases.'; @@ -182,78 +184,88 @@ class UpdateSemverCoreTest extends UpdateSemverTestBase { ], ]; - // Drupal 8.8.x test cases. + // Drupal 9.4.x test cases. $test_cases += [ - // Ensure that a message is displayed during 8.8's active support. - '8.8.0, supported' => [ - 'installed_version' => '8.8.0', - 'fixture' => 'sec.9.0', + // Ensure that a message is displayed during 9.4's active support. + '9.4.0, supported' => [ + 'installed_version' => '9.4.0', + 'fixture' => 'sec.9.5.0', 'requirements_section_heading' => 'Checked', - 'message' => "Covered until 2020-Dec-02 $release_coverage_message", - 'mock_date' => '2020-06-01', + 'message' => "Covered until 2023-Jun-21 $release_coverage_message", + 'mock_date' => '2022-12-13', ], // Ensure a warning is displayed if less than six months remain until the - // end of 8.8's security coverage. - '8.8.0, supported, 6 months warn' => [ - 'installed_version' => '8.8.0', - 'fixture' => 'sec.9.0', + // end of 9.4's security coverage. + '9.4.0, supported, 6 months warn' => [ + 'installed_version' => '9.4.0', + 'fixture' => 'sec.9.5.0', 'requirements_section_heading' => 'Warnings found', - 'message' => "Covered until 2020-Dec-02 $update_soon_message $release_coverage_message", - 'mock_date' => '2020-06-02', + 'message' => "Covered until 2023-Jun-21 $update_soon_message $release_coverage_message", + 'mock_date' => '2022-12-14', ], ]; // Ensure that the message does not change, including on the last day of // security coverage. - $test_cases['8.8.0, supported, last day warn'] = $test_cases['8.8.0, supported, 6 months warn']; - $test_cases['8.8.0, supported, last day warn']['mock_date'] = '2020-12-01'; + $test_cases['9.4.0, supported, last day warn'] = $test_cases['9.4.0, supported, 6 months warn']; + $test_cases['9.4.0, supported, last day warn']['mock_date'] = '2023-06-20'; - // Ensure that if the 8.8 support window is finished a message is + // Ensure that if the 9.4 support window is finished a message is // displayed. - $test_cases['8.8.0, support over'] = [ - 'installed_version' => '8.8.0', - 'fixture' => 'sec.9.0', + $test_cases['9.4.0, support over'] = [ + 'installed_version' => '9.4.0', + 'fixture' => 'sec.9.5.0', 'requirements_section_heading' => 'Errors found', 'message' => "$coverage_ended_message $update_asap_message $release_coverage_message", - 'mock_date' => '2020-12-02', + 'mock_date' => '2023-06-22', ]; - // Drupal 8.9 LTS test cases. - $test_cases['8.9.0, lts supported'] = [ - 'installed_version' => '8.9.0', - 'fixture' => 'sec.9.0', + // Drupal 9.5 test cases. + $test_cases['9.5.0, supported'] = [ + 'installed_version' => '9.5.0', + 'fixture' => 'sec.9.5.0', 'requirements_section_heading' => 'Checked', - 'message' => "Covered until 2021-Nov $release_coverage_message", - 'mock_date' => '2021-01-01', + 'message' => "Covered until 2023-Nov $release_coverage_message", + 'mock_date' => '2023-01-01', ]; + // Ensure a warning is displayed if less than six months remain until the + // end of 9.5's security coverage. + $test_cases['9.5.0, supported, 6 months warn'] = [ + 'installed_version' => '9.5.0', + 'fixture' => 'sec.9.5.0', + 'requirements_section_heading' => 'Warnings found', + 'message' => "Covered until 2023-Nov $update_soon_message $release_coverage_message", + 'mock_date' => '2023-05-15', + ]; + // Ensure that the message does not change, including on the last day of // security coverage. - $test_cases['8.9.0, lts supported, last day'] = $test_cases['8.9.0, lts supported']; - $test_cases['8.9.0, lts supported, last day']['mock_date'] = '2021-10-31'; + $test_cases['9.5.0, supported, last day warn'] = $test_cases['9.5.0, supported, 6 months warn']; + $test_cases['9.5.0, supported, last day warn']['mock_date'] = '2023-10-31'; - // Ensure that if LTS support window is finished a message is displayed. - $test_cases['8.9.0, lts support over'] = [ - 'installed_version' => '8.9.0', - 'fixture' => 'sec.9.0', + // Ensure that if the support window is finished a message is displayed. + $test_cases['9.5.0, support over'] = [ + 'installed_version' => '9.5.0', + 'fixture' => 'sec.9.5.0', 'requirements_section_heading' => 'Errors found', 'message' => "$coverage_ended_message $update_asap_message $release_coverage_message", - 'mock_date' => '2021-11-01', + 'mock_date' => '2023-11-01', ]; // Drupal 9 test cases. $test_cases += [ - // Ensure the end dates for 8.8 and 8.9 only apply to major version 8. - '9.9.0' => [ - 'installed_version' => '9.9.0', - 'fixture' => 'sec.9.9.0', + // Ensure the end dates for 9.4 and 9.5 only apply to major version 9. + '10.5.0' => [ + 'installed_version' => '10.5.0', + 'fixture' => 'sec.10.5.0', 'requirements_section_heading' => 'Checked', - 'message' => "Covered until 9.11.0 $release_coverage_message", + 'message' => "Covered until 10.7.0 $release_coverage_message", 'mock_date' => '', ], - '9.8.0' => [ - 'installed_version' => '9.8.0', - 'fixture' => 'sec.9.9.0', + '10.4.0' => [ + 'installed_version' => '10.4.0', + 'fixture' => 'sec.10.5.0', 'requirements_section_heading' => 'Warnings found', - 'message' => "Covered until 9.10.0 Update to 9.9 or higher soon to continue receiving security updates. $release_coverage_message", + 'message' => "Covered until 10.6.0 Update to 10.5 or higher soon to continue receiving security updates. $release_coverage_message", 'mock_date' => '', ], ];