From a9f3d1a281d3ae138376ad0e3d06f95ad1e5b593 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Mon, 6 Oct 2014 15:07:48 +0200
Subject: [PATCH] Give absolute priority to DisplayName also for SAML 1.x
IdPs/SPs.
---
lib/SimpleSAML/Metadata/SAMLParser.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index be930bd35..cfe30af45 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -498,6 +498,11 @@ class SimpleSAML_Metadata_SAMLParser {
/* Add extensions. */
$this->addExtensions($ret, $spd);
+ // prioritize mdui:DisplayName as the name if available
+ if (!empty($ret['UIInfo']['DisplayName'])) {
+ $ret['name'] = $ret['UIInfo']['DisplayName'];
+ }
+
return $ret;
}
@@ -549,6 +554,11 @@ class SimpleSAML_Metadata_SAMLParser {
/* Add extensions. */
$this->addExtensions($ret, $idp);
+ // prioritize mdui:DisplayName as the name if available
+ if (!empty($ret['UIInfo']['DisplayName'])) {
+ $ret['name'] = $ret['UIInfo']['DisplayName'];
+ }
+
return $ret;
}
--
GitLab