Commit 55d2288b authored by catch's avatar catch
Browse files

Issue #3378393 by quietone, xjm, dww: Hardcode security coverage EOL dates for... 

Issue #3378393 by quietone, xjm, dww: Hardcode security coverage EOL dates for Drupal 10.last-1 and 10.last

(cherry picked from commit 6e4863ff)
parent bcf6c4a0

core/modules/update/src/ProjectSecurityData.php

+4 −4
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ final class ProjectSecurityData { 
   *

   * @see \Drupal\update\ProjectSecurityRequirement::getDateEndRequirement()

   */

  const SECURITY_COVERAGE_END_DATE_9_4 = '2023-06-21';

  const SECURITY_COVERAGE_END_DATE_10_5 = '2026-06-17';



  const SECURITY_COVERAGE_ENDING_WARN_DATE_9_4 = '2022-12-14';

  const SECURITY_COVERAGE_ENDING_WARN_DATE_10_5 = '2025-12-10';



  const SECURITY_COVERAGE_END_DATE_9_5 = '2023-11';

  const SECURITY_COVERAGE_END_DATE_10_6 = '2026-12-09';



  const SECURITY_COVERAGE_ENDING_WARN_DATE_9_5 = '2023-05-14';

  const SECURITY_COVERAGE_ENDING_WARN_DATE_10_6 = '2026-06-17';



  /**

   * The existing (currently installed) version of the project.

core/modules/update/tests/fixtures/release-history/drupal.sec.10.5.0.xml→core/modules/update/tests/fixtures/release-history/drupal.sec.10.6.0.xml

+12 −12
Original line number Diff line number Diff line
@@ -4,26 +4,26 @@ This fixture is used by Drupal\Tests\update\Functional\UpdateSemverCoreTest. 


It contains 2 releases:



- 10.4.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.

- 10.5.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.

- 10.6.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.



-->

<project xmlns:dc="http://purl.org/dc/elements/1.1/">

    <title>Drupal</title>

    <short_name>drupal</short_name>

    <dc:creator>Drupal</dc:creator>

    <supported_branches>10.4.,10.5.</supported_branches>

    <supported_branches>10.5.,10.6.</supported_branches>

    <project_status>published</project_status>

    <link>http://example.com/project/drupal</link>

    <terms><term><name>Projects</name><value>Drupal project</value></term></terms>

    <releases>

        <release>

            <name>Drupal 10.5.0</name>

            <version>10.5.0</version>

            <name>Drupal 10.6.0</name>

            <version>10.6.0</version>

            <status>published</status>

            <release_link>http://example.com/drupal-10-5-0-release</release_link>

            <download_link>http://example.com/drupal-10-5-0.tar.gz</download_link>

            <date>1750424641</date>

            <release_link>http://example.com/drupal-10-6-0-release</release_link>

            <download_link>http://example.com/drupal-10-6-0.tar.gz</download_link>

            <date>1765392356</date>

            <terms>

                <term>

                    <name>Release type</name>
@@ -36,12 +36,12 @@ It contains 2 releases: 
            </terms>

        </release>

        <release>

          <name>Drupal 10.4.0</name>

          <version>10.4.0</version>

          <name>Drupal 10.5.0</name>

          <version>10.5.0</version>

          <status>published</status>

          <release_link>http://example.com/drupal-10-4-0-release</release_link>

          <download_link>http://example.com/drupal-10-4-0.tar.gz</download_link>

          <date>1730424641</date>

          <release_link>http://example.com/drupal-10-5-0-release</release_link>

          <download_link>http://example.com/drupal-10-5-0.tar.gz</download_link>

          <date>1750272356</date>

          <terms>

            <term>

              <name>Release type</name>

core/modules/update/tests/fixtures/release-history/drupal.sec.9.5.0.xml→core/modules/update/tests/fixtures/release-history/drupal.sec.11.6.0.xml

+13 −13
Original line number Diff line number Diff line
@@ -4,26 +4,26 @@ This fixture is used by Drupal\Tests\update\Functional\UpdateSemverCoreTest. 


It contains 2 releases:



- 9.4.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.

- 9.5.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.

- 11.5.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.

- 11.6.0: testSecurityCoverageMessage() checks EOL date warnings on the Status Report.



-->

<project xmlns:dc="http://purl.org/dc/elements/1.1/">

    <title>Drupal</title>

    <short_name>drupal</short_name>

    <dc:creator>Drupal</dc:creator>

    <supported_branches>9.4.,9.5.</supported_branches>

    <supported_branches>11.5.,11.6.</supported_branches>

    <project_status>published</project_status>

    <link>http://example.com/project/drupal</link>

    <terms><term><name>Projects</name><value>Drupal project</value></term></terms>

    <releases>

        <release>

            <name>Drupal 9.5.0</name>

            <version>9.5.0</version>

            <name>Drupal 11.6.0</name>

            <version>11.6.0</version>

            <status>published</status>

            <release_link>http://example.com/drupal-9-5-0-release</release_link>

            <download_link>http://example.com/drupal-9-5-0.tar.gz</download_link>

            <date>1670972400</date>

            <release_link>http://example.com/drupal-11-6-0-release</release_link>

            <download_link>http://example.com/drupal-11-6-0.tar.gz</download_link>

            <date>1828291556</date>

            <terms>

                <term>

                    <name>Release type</name>
@@ -36,12 +36,12 @@ It contains 2 releases: 
            </terms>

        </release>

        <release>

          <name>Drupal 9.4.0</name>

          <version>9.4.0</version>

          <name>Drupal 11.5.0</name>

          <version>11.5.0</version>

          <status>published</status>

          <release_link>http://example.com/drupal-9-4-0-release</release_link>

          <download_link>http://example.com/drupal-9-4-0.tar.gz</download_link>

          <date>1655244000</date>

          <release_link>http://example.com/drupal-11-5-0-release</release_link>

          <download_link>http://example.com/drupal-11-5-0.tar.gz</download_link>

          <date>1813171556</date>

          <terms>

            <term>

              <name>Release type</name>

core/modules/update/tests/modules/update_test/src/Datetime/TestTime.php

+12 −0
Original line number Diff line number Diff line
@@ -19,4 +19,16 @@ public function getRequestTime() { 
    return parent::getRequestTime();

  }



  /**

   * {@inheritdoc}

   */

  public function getCurrentTime() {

    // Ensure that request for the current time returns any previously set mock

    // date. If a mock date is not set then return the real current time.

    if ($mock_date = \Drupal::state()->get('update_test.mock_date', NULL)) {

      return \DateTime::createFromFormat('Y-m-d', $mock_date)->getTimestamp();

    }

    return parent::getCurrentTime();

  }



}

core/modules/update/tests/src/Functional/UpdateSemverCoreSecurityCoverageTest.php

+50 −53
Original line number Diff line number Diff line
@@ -75,12 +75,9 @@ protected function doTestSecurityCoverageMessage($installed_version, $fixture, $ 
   * - drupal.sec.8.2.0_9.0.0.xml

   *   - 8.2.0

   *   - 9.0.0

   * - drupal.sec.9.5.0.xml

   *   - 9.4.0

   *   - 9.5.0

   * - drupal.sec.10.5.0.xml

   *   - 10.4.0

   * - drupal.sec.10.6.0.xml

   *   - 10.5.0

   *   - 10.6.0

   */

  protected static function securityCoverageMessageProvider() {

    $release_coverage_message = 'Visit the release cycle overview for more information on supported releases.';
@@ -160,88 +157,88 @@ protected static function securityCoverageMessageProvider() { 
      ],

    ];



    // Drupal 9.4.x test cases.

    // Drupal 10.5.x test cases.

    $test_cases += [

      // 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',

      // Ensure that a message is displayed during 10.5's active support.

      '10.5.0, supported' => [

        'installed_version' => '10.5.0',

        'fixture' => 'sec.10.6.0',

        'requirements_section_heading' => 'Checked',

        'message' => "Covered until 2023-Jun-21 $release_coverage_message",

        'mock_date' => '2022-12-13',

        'message' => "Covered until 2026-Jun-17 $release_coverage_message",

        'mock_date' => '2025-06-25',

      ],

      // Ensure a warning is displayed if less than six months remain until the

      // end of 9.4's security coverage.

      '9.4.0, supported, 6 months warn' => [

        'installed_version' => '9.4.0',

        'fixture' => 'sec.9.5.0',

      // end of 10.5's security coverage.

      '10.5.0, supported, 6 months warn' => [

        'installed_version' => '10.5.0',

        'fixture' => 'sec.10.6.0',

        'requirements_section_heading' => 'Warnings found',

        'message' => "Covered until 2023-Jun-21 $update_soon_message $release_coverage_message",

        'mock_date' => '2022-12-14',

        'message' => "Covered until 2026-Jun-17 $update_soon_message $release_coverage_message",

        'mock_date' => '2025-12-10',

      ],

    ];

    // Ensure that the message does not change, including on the last day of

    // security coverage.

    $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';

    $test_cases['10.5.0, supported, last day warn'] = $test_cases['10.5.0, supported, 6 months warn'];

    $test_cases['10.5.0, supported, last day warn']['mock_date'] = '2026-06-16';



    // Ensure that if the 9.4 support window is finished a message is

    // Ensure that if the 10.5 support window is finished a message is

    // displayed.

    $test_cases['9.4.0, support over'] = [

      'installed_version' => '9.4.0',

      'fixture' => 'sec.9.5.0',

    $test_cases['10.5.0, support over'] = [

      'installed_version' => '10.5.0',

      'fixture' => 'sec.10.6.0',

      'requirements_section_heading' => 'Errors found',

      'message' => "$coverage_ended_message $update_asap_message $release_coverage_message",

      'mock_date' => '2023-06-22',

      'mock_date' => '2026-06-18',

    ];



    // Drupal 9.5 test cases.

    $test_cases['9.5.0, supported'] = [

      'installed_version' => '9.5.0',

      'fixture' => 'sec.9.5.0',

    // Drupal 10.6 test cases.

    $test_cases['10.6.0, supported'] = [

      'installed_version' => '10.6.0',

      'fixture' => 'sec.10.6.0',

      'requirements_section_heading' => 'Checked',

      'message' => "Covered until 2023-Nov $release_coverage_message",

      'mock_date' => '2023-01-01',

      'message' => "Covered until 2026-Dec-09 $release_coverage_message",

      'mock_date' => '2026-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',

    // end of 10.6's security coverage.

    $test_cases['10.6.0, supported, 6 months warn'] = [

      'installed_version' => '10.6.0',

      'fixture' => 'sec.10.6.0',

      'requirements_section_heading' => 'Warnings found',

      'message' => "Covered until 2023-Nov $update_soon_message $release_coverage_message",

      'mock_date' => '2023-05-15',

      'message' => "Covered until 2026-Dec-09 $update_soon_message $release_coverage_message",

      'mock_date' => '2026-06-17',

    ];



    // Ensure that the message does not change, including on the last day of

    // security coverage.

    $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';

    $test_cases['10.6.0, supported, last day warn'] = $test_cases['10.6.0, supported, 6 months warn'];

    $test_cases['10.6.0, supported, last day warn']['mock_date'] = '2026-12-08';



    // 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',

    $test_cases['10.6.0, support over'] = [

      'installed_version' => '10.6.0',

      'fixture' => 'sec.10.6.0',

      'requirements_section_heading' => 'Errors found',

      'message' => "$coverage_ended_message $update_asap_message $release_coverage_message",

      'mock_date' => '2023-11-01',

      'mock_date' => '2026-12-10',

    ];



    // Drupal 9 test cases.

    // Drupal 11 test cases.

    $test_cases += [

      // 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',

      // Ensure the end dates for 10.5 and 10.6 only apply to major version 10.

      '11.6.0' => [

        'installed_version' => '11.6.0',

        'fixture' => 'sec.11.6.0',

        'requirements_section_heading' => 'Checked',

        'message' => "Covered until 10.7.0 $release_coverage_message",

        'message' => "Covered until 11.8.0 $release_coverage_message",

        'mock_date' => '',

      ],

      '10.4.0' => [

        'installed_version' => '10.4.0',

        'fixture' => 'sec.10.5.0',

      '11.5.0' => [

        'installed_version' => '11.5.0',

        'fixture' => 'sec.11.6.0',

        'requirements_section_heading' => 'Warnings found',

        'message' => "Covered until 10.6.0 Update to 10.5 or higher soon to continue receiving security updates. $release_coverage_message",

        'message' => "Covered until 11.7.0 Update to 11.6 or higher soon to continue receiving security updates. $release_coverage_message",

        'mock_date' => '',

      ],

    ];