Merge pull request #688 from nextcloud/backport/687/stable28

[stable28] [stable30] fix(generation): Fix common-password check when we accidentally hit t…

Author: nickvergessen

.github/workflows/block-merge-eol.yml

@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Block merges for EOL
 
@@ -23,15 +26,15 @@ jobs:
     runs-on: ubuntu-latest-low
 
     steps:
-      - name: Download updater config
-        run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php
-
       - name: Set server major version environment
         run: |
           # retrieve version number from branch reference
           server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p')
           echo "server_major=$server_major" >> $GITHUB_ENV
+          echo "current_month=$(date +%Y-%m)" >> $GITHUB_ENV
 
       - name: Checking if ${{ env.server_major }} is EOL
         run: |
-          php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol // .beta[$version]["100"].eol' | grep --silent -i 'false'
+          curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \
+            | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \
+            | grep -q true

lib/Validator/CommonPasswordsValidator.php

@@ -45,7 +45,7 @@ public function validate(string $password): void {
 		$enforceNonCommonPassword = $this->config->getEnforceNonCommonPassword();
 		$passwordFile = __DIR__ . '/../../lists/list-'.strlen($password).'.php';
 		if ($enforceNonCommonPassword && file_exists($passwordFile)) {
-			$commonPasswords = require_once $passwordFile;
+			$commonPasswords = require $passwordFile;
 			if (isset($commonPasswords[strtolower($password)])) {
 				$message = 'Password is among the 1,000,000 most common ones. Please make it unique.';
 				$message_t = $this->l->t(

tests/lib/Validator/CommonPasswordsValidatorTest.php

@@ -72,11 +72,15 @@ public function testValidate(string $password, bool $enforced, bool $valid) {
 	}
 
 	public function dataValidate() {
-		return [
+		$attempts = [
 			['banana', false,  true],
 			['bananabananabananabanana', false,  true],
 			['banana',  true, false],
 			['bananabananabananabanana',  true,  true],
 		];
+		for ($i = 1; $i <= 39; $i++) {
+			$attempts[] = [str_repeat('$', $i), true, true];
+		}
+		return $attempts;
 	}
 }