Skip to content

Commit 0470546

Browse files
committed
Fix Organization element on SP metadata.
There was a bug when adding more than 1 organization.
1 parent bf97c34 commit 0470546

1 file changed

Lines changed: 10 additions & 15 deletions

File tree

src/onelogin/saml2/metadata.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,17 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
9090

9191
str_organization = ''
9292
if len(organization) > 0:
93-
organization_info = []
93+
organization_names = []
94+
organization_displaynames = []
95+
organization_urls = []
9496
for (lang, info) in organization.items():
95-
org = """ <md:Organization>
96-
<md:OrganizationName xml:lang="%(lang)s">%(name)s</md:OrganizationName>
97-
<md:OrganizationDisplayName xml:lang="%(lang)s">%(display_name)s</md:OrganizationDisplayName>
98-
<md:OrganizationURL xml:lang="%(lang)s">%(url)s</md:OrganizationURL>
99-
</md:Organization>""" % \
100-
{
101-
'lang': lang,
102-
'name': info['name'],
103-
'display_name': info['displayname'],
104-
'url': info['url'],
105-
}
106-
organization_info.append(org)
107-
str_organization = '\n'.join(organization_info)
97+
organization_names.append(""" <md:OrganizationName xml:lang="%s">%s</md:OrganizationName>""" % (lang, info['name']))
98+
organization_displaynames.append(""" <md:OrganizationDisplayName xml:lang="%s">%s</md:OrganizationDisplayName>""" % (lang, info['displayname']))
99+
organization_urls.append(""" <md:OrganizationURL xml:lang="%s">%s</md:OrganizationURL>""" % (lang, info['url']))
100+
org_data = '\n'.join(organization_names) + '\n' + '\n'.join(organization_displaynames) + '\n' + '\n'.join(organization_urls)
101+
str_organization = """ <md:Organization>
102+
%(org)s
103+
</md:Organization>""" % {'org': org_data}
108104

109105
str_contacts = ''
110106
if len(contacts) > 0:
@@ -149,7 +145,6 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
149145
'organization': str_organization,
150146
'contacts': str_contacts,
151147
}
152-
153148
return metadata
154149

155150
@staticmethod

0 commit comments

Comments
 (0)