Skip to content

Improve validate binary sign [master] #621

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
pitbulk merged 2 commits into from
May 25, 2025
Merged

Improve validate binary sign [master] #621

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
0342f0f
Add Parameter checking on validateBinarySign, inspired on CVE-2025-27…
pitbulk May 25, 2025
d423211
Fix typo and compatibility
pitbulk May 25, 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
1 change: 1 addition & 0 deletions lib/Saml2/Error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class OneLogin_Saml2_Error extends Exception
const SAML_SINGLE_LOGOUT_NOT_SUPPORTED = 12;
const PRIVATE_KEY_NOT_FOUND = 13;
const UNSUPPORTED_SETTINGS_OBJECT = 14;
const INVALID_PARAMETER = 15;

/**
* Constructor
Expand Down
33 changes: 33 additions & 0 deletions lib/Saml2/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,10 @@ protected static function buildWithBaseURLPath($info)
*/
public static function extractOriginalQueryParam($name)
{
if (!isset($_SERVER['QUERY_STRING']) || empty($_SERVER['QUERY_STRING'])) {
return '';
}

$index = strpos($_SERVER['QUERY_STRING'], $name.'=');
$substring = substr($_SERVER['QUERY_STRING'], $index + strlen($name) + 1);
$end = strpos($substring, '&');
Expand Down Expand Up @@ -1511,12 +1515,41 @@ public static function validateBinarySign($messageType, $getData, $idpData, $ret
}

if ($retrieveParametersFromServer) {
if (!isset($_SERVER['QUERY_STRING']) || empty($_SERVER['QUERY_STRING'])) {
throw new OneLogin_Saml2_Error(
"No query string provided",
OneLogin_Saml2_Error::INVALID_PARAMETER
);
}
$keys = array("SAMLRequest", "SAMLResponse", "RelayState", "SigAlg", "Signature");
foreach ($keys as $key) {
if (substr_count($_SERVER['QUERY_STRING'], $key) > 1) {
throw new OneLogin_Saml2_Error(
"Duplicate parameter in query string",
OneLogin_Saml2_Error::INVALID_PARAMETER
);
}
}
if (substr_count($_SERVER['QUERY_STRING'], "SAMLRequest") > 0 && substr_count($_SERVER['QUERY_STRING'], "SAMLResponse") > 0) {
throw new OneLogin_Saml2_Error(
"Both SAMLRequest and SAMLResponse provided",
OneLogin_Saml2_Error::INVALID_PARAMETER
);
}

$signedQuery = $messageType.'='.OneLogin_Saml2_Utils::extractOriginalQueryParam($messageType);
if (isset($getData['RelayState'])) {
$signedQuery .= '&RelayState='.OneLogin_Saml2_Utils::extractOriginalQueryParam('RelayState');
}
$signedQuery .= '&SigAlg='.OneLogin_Saml2_Utils::extractOriginalQueryParam('SigAlg');
} else {
if (isset($getData['SAMLRequest']) && isset($getData['SAMLResponse'])) {
throw new OneLogin_Saml2_Error(
"Both SAMLRequest and SAMLResponse provided",
OneLogin_Saml2_Error::INVALID_PARAMETER
);
}

$signedQuery = $messageType.'='.urlencode($getData[$messageType]);
if (isset($getData['RelayState'])) {
$signedQuery .= '&RelayState='.urlencode($getData['RelayState']);
Expand Down
Loading