From 816b8a2ff723b527e16198e0831613a77b4fac95 Mon Sep 17 00:00:00 2001
From: Patrick Radtke <patrick@cirrusidentity.com>
Date: Thu, 25 Feb 2016 11:17:21 -0800
Subject: [PATCH] Only warn about RegistraionInfo overrides that change the
authority
---
lib/SimpleSAML/Metadata/SAMLParser.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 7955fba22..82b912db4 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -1039,10 +1039,11 @@ class SimpleSAML_Metadata_SAMLParser
if ($e instanceof SAML2_XML_mdrpi_RegistrationInfo) {
- // Registration Authority cannot be overridden
- if (isset($ret['RegistrationInfo']['registrationAuthority'])) {
- SimpleSAML_Logger::debug('Invalid attempt to override registrationAuthority '
- . $ret['RegistrationInfo']['registrationAuthority'] . " with {$e->registrationAuthority}");
+ // Registration Authority cannot be overridden (warn only if override attempts to change the value)
+ if (isset($ret['RegistrationInfo']['registrationAuthority'])
+ && $ret['RegistrationInfo']['registrationAuthority'] !== $e->registrationAuthority) {
+ SimpleSAML_Logger::warning('Invalid attempt to override registrationAuthority \''
+ . $ret['RegistrationInfo']['registrationAuthority'] . "' with '{$e->registrationAuthority}'");
} else {
$ret['RegistrationInfo']['registrationAuthority'] = $e->registrationAuthority;
}
--
GitLab