Skip to content

Fix für Maintenance-AddOn URL-Parameter Authentifizierung #143

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

Merged
AWqxKAWERbXo merged 3 commits into from
Apr 17, 2025
+18 −2
Merged

Fix für Maintenance-AddOn URL-Parameter Authentifizierung #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb59ec
Update update.php
skerbis Apr 15, 2025
735deee
Update Maintenance.php
skerbis Apr 15, 2025
d760792
Apply php-cs-fixer changes
skerbis Apr 15, 2025
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
7 changes: 5 additions & 2 deletions lib/Maintenance.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,11 @@ public static function isSecretAllowed(): bool
$maintenance_secret = rex_request('maintenance_secret', 'string', '');
$authentification_mode = (string) self::getConfig('authentification_mode', '');

// Check if the correct secret is passed via URL or password
if (('URL' === $authentification_mode || 'password' === $authentification_mode) && '' !== $config_secret && $maintenance_secret === $config_secret) {
// Authentifizierung prüfen - für URL-Parameter und auch bei leerem Modus
$authentification_mode = (string) self::getConfig('authentification_mode', '');
if (('' === $authentification_mode || 'URL' === $authentification_mode || 'password' === $authentification_mode)
&& '' !== $config_secret
&& $maintenance_secret === $config_secret) {
rex_set_session('maintenance_secret', $maintenance_secret);
return true;
}
Expand Down
13 changes: 13 additions & 0 deletions update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,16 @@
$addon->removeConfig('type');
$addon->removeConfig('secret');
}

// Leerer String ('') und 'URL' werden beide als gültige URL-Authentifizierung betrachtet
$authentification_mode = $addon->getConfig('authentification_mode', '');
if (!in_array($authentification_mode, ['URL', 'password'], true)) {
// Wenn kein gültiger Modus gesetzt ist, standardmäßig auf URL setzen
$addon->setConfig('authentification_mode', 'URL');
}

// Überprüfen, ob ein maintenance_secret existiert
if (!$addon->hasConfig('maintenance_secret') || '' === $addon->getConfig('maintenance_secret')) {
// Falls kein Secret vorhanden, ein neues generieren
$addon->setConfig('maintenance_secret', bin2hex(random_bytes(16)));
}