Skip to content

Fix HTML injection in SAML POST login #1037

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
blizzz merged 3 commits into from
Jan 29, 2026
+72 −6
Merged

Fix HTML injection in SAML POST login #1037

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
c451968
fix: escape saml post template values
hweihwang Jan 28, 2026
776c879
test: load template helpers for login_post
hweihwang Jan 28, 2026
2c92f18
test: inline p helper for template test
hweihwang Jan 28, 2026
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
12 changes: 6 additions & 6 deletions templates/login_post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
p($l->t('Please wait while you are redirected to the SSO server.'));
?>

<form action="<?= $_['ssoUrl'] ?>" method="post">
<input type="hidden" name="SAMLRequest" value="<?= $_['samlRequest'] ?>" />
<input type="hidden" name="RelayState" value="<?= $_['relayState'] ?>" />
<input type="hidden" name="SigAlg" value="<?= $_['sigAlg'] ?>" />
<input type="hidden" name="Signature" value="<?= $_['signature'] ?>" />
<form action="<?php p($_['ssoUrl']); ?>" method="post">
<input type="hidden" name="SAMLRequest" value="<?php p($_['samlRequest']); ?>" />
<input type="hidden" name="RelayState" value="<?php p($_['relayState']); ?>" />
<input type="hidden" name="SigAlg" value="<?php p($_['sigAlg']); ?>" />
<input type="hidden" name="Signature" value="<?php p($_['signature']); ?>" />
<noscript>
<p>
<?php p($l->t('JavaScript is disabled in your browser. Please enable it to continue.')) ?>
</p>
<input type="submit" value="Continue" />
</noscript>
</form>
<script nonce="<?= $_['nonce'] ?>">
<script nonce="<?php p($_['nonce']); ?>">
document.addEventListener('DOMContentLoaded', function() {
document.forms[0].submit()
})
Expand Down
66 changes: 66 additions & 0 deletions tests/unit/Template/LoginPostTemplateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?php

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace {
if (!function_exists('p')) {
function p($string): void {
print(htmlspecialchars((string)$string, ENT_QUOTES, 'UTF-8'));
}
}
}

namespace OCA\User_SAML\Tests\Template {
use OCP\IL10N;
use OCP\Util;
use Test\TestCase;

class LoginPostTemplateTest extends TestCase {
public function testLoginPostTemplateEscapesValues(): void {
$l = $this->createMock(IL10N::class);
$l->method('t')->willReturnCallback(static fn (string $text): string => $text);

$_ = [
'ssoUrl' => 'https://example.com/" onmouseover="alert(1)',
'samlRequest' => '"><input name="submit">',
'relayState' => '"><img src=x onerror=alert(1)>',
'sigAlg' => '"><svg onload=alert(1)>',
'signature' => '"><div>sig</div>',
'nonce' => '" onload="alert(1)',
];

ob_start();
include __DIR__ . '/../../../templates/login_post.php';
$output = ob_get_clean();

$this->assertNotFalse($output);
$this->assertStringContainsString(
'action="' . Util::sanitizeHTML($_['ssoUrl']) . '"',
$output
);
$this->assertStringContainsString(
'name="SAMLRequest" value="' . Util::sanitizeHTML($_['samlRequest']) . '"',
$output
);
$this->assertStringContainsString(
'name="RelayState" value="' . Util::sanitizeHTML($_['relayState']) . '"',
$output
);
$this->assertStringContainsString(
'name="SigAlg" value="' . Util::sanitizeHTML($_['sigAlg']) . '"',
$output
);
$this->assertStringContainsString(
'name="Signature" value="' . Util::sanitizeHTML($_['signature']) . '"',
$output
);
$this->assertStringContainsString(
'nonce="' . Util::sanitizeHTML($_['nonce']) . '"',
$output
);
}
}
}
Loading