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

Jump to bottom

X509 cert comments #570

Merged
merged 10 commits into from
May 19, 2024
Merged

X509 cert comments #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d92a64b
Wrapped loadXML method within a try-catch and return false instead of…
Apr 22, 2021
b8561d9
Fixed broken tests
Apr 22, 2021
1935f59
Revert "Wrapped loadXML method within a try-catch and return false in…
May 1, 2021
6ae5b8e
Fixed unit test: Catch exception when providing invalid xml
May 1, 2021
f884f64
Merge pull request #472 from Fredrik82/4.0.0
pitbulk Jun 29, 2021
210cdb7
fix: skip comments in .crt file
gr8b Dec 18, 2023
30a0d4f
fix: replaced incorrect strtr usage with str_replace
gr8b Dec 18, 2023
451298d
Merge branch '4.x-dev' into x509-cert-comments
pitbulk May 15, 2024
944efe9
Fix typo Utils.php
pitbulk May 15, 2024
0e20972
Fix tests
pitbulk May 19, 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
23 changes: 11 additions & 12 deletions src/Saml2/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,28 +212,27 @@ public static function treeCopyReplace(DomNode $targetNode, DomNode $sourceNode,
/**
* Returns a x509 cert (adding header & footer if required).
*
* @param string $cert A x509 unformated cert
* @param bool $heads True if we want to include head and footer
* @param string $x509cert A x509 unformated cert
* @param bool $heads True if we want to include head and footer
*
* @return string $x509 Formatted cert
*/
public static function formatCert($cert, $heads = true)
public static function formatCert($x509cert, $heads = true)
{
if (is_null($cert)) {
if (is_null($x509cert)) {
return;
}

$x509cert = str_replace(array("\x0D", "\r", "\n"), "", $cert);
if (!empty($x509cert)) {
$x509cert = str_replace('-----BEGIN CERTIFICATE-----', "", $x509cert);
$x509cert = str_replace('-----END CERTIFICATE-----', "", $x509cert);
$x509cert = str_replace(' ', '', $x509cert);
if (strpos($x509cert, '-----BEGIN CERTIFICATE-----') !== false) {
$x509cert = static::getStringBetween($x509cert, '-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----');
}

if ($heads) {
$x509cert = "-----BEGIN CERTIFICATE-----\n".chunk_split($x509cert, 64, "\n")."-----END CERTIFICATE-----\n";
}
$x509cert = str_replace(["\x0d", "\r", "\n", " "], '', $x509cert);

if ($heads && $x509cert !== '') {
$x509cert = "-----BEGIN CERTIFICATE-----\n".chunk_split($x509cert, 64, "\n")."-----END CERTIFICATE-----\n";
}

return $x509cert;
}

Expand Down
17 changes: 17 additions & 0 deletions tests/certs/with.comment.crt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# certificate comments should be ignored
-----BEGIN CERTIFICATE-----
MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
Tk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYD
VQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG
9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4
MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xi
ZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2Zl
aWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5v
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LO
NoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHIS
KOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d
1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8
BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7n
bK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2Qar
Q4/67OZfHd7R+POBXhophSMv1ZOo
-----END CERTIFICATE-----
5 changes: 3 additions & 2 deletions tests/src/OneLogin/Saml2/AuthTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,8 @@ public function testProcessSLORequestRelayState()
$_GET['RelayState'] = 'http://relaystate.com';

$this->_auth->setStrict(true);
$targetUrl = $this->_auth->processSLO(false, null, null, null, true);
$targetUrl = $this->_auth->processSLO(false, null, false, null, true);

$parsedQuery = getParamsFromUrl($targetUrl);

$sloResponseUrl = $this->_settingsInfo['idp']['singleLogoutService']['responseUrl'];
Expand Down Expand Up @@ -818,7 +819,7 @@ public function testProcessSLORequestSignedResponse()
$_GET['RelayState'] = 'http://relaystate.com';

$auth->setStrict(true);
$targetUrl = $auth->processSLO(false, null, null, null, true);
$targetUrl = $auth->processSLO(false, null, false, null, true);

$parsedQuery = getParamsFromUrl($targetUrl);

Expand Down
9 changes: 7 additions & 2 deletions tests/src/OneLogin/Saml2/UtilsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public function testLoadXML()
try {
$res1 = Utils::loadXML($dom, $metadataUnloaded);
$this->assertFalse($res1);
} catch (Exception $e) {
$this->assertEquals('DOMDocument::loadXML(): Premature end of data in tag EntityDescriptor line 1 in Entity, line: 1', $e->getMessage());
} catch (\Exception $e) {
$this->assertEquals('DOMDocument::loadXML(): Premature end of data in tag EntityDescriptor line 1 in Entity, line: 1', $e->getMessage());
}

$metadataInvalid = file_get_contents(TEST_ROOT .'/data/metadata/noentity_metadata_settings1.xml');
Expand Down Expand Up @@ -194,6 +194,11 @@ public function testFormatCert()
$this->assertStringNotContainsString('-----END CERTIFICATE-----', $formatedCert6);
$this->assertEquals(strlen($cert2), 860);

$cert = file_get_contents(TEST_ROOT.'/certs/with.comment.crt');
$formatedCert7 = Utils::formatCert($cert, true);
$this->assertStringContainsString('-----BEGIN CERTIFICATE-----', $formatedCert7);
$this->assertStringContainsString('-----END CERTIFICATE-----', $formatedCert7);
$this->assertStringNotContainsString('comments', $formatedCert7);
}

/**
Expand Down
Loading