Fix Organization element on SP metadata. Minor style code fix

Author: pitbulk

src/onelogin/saml2/metadata.py

@@ -97,17 +97,17 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
 
         str_organization = ''
         if len(organization) > 0:
-            organization_info = []
+            organization_names = []
+            organization_displaynames = []
+            organization_urls = []
             for (lang, info) in organization.items():
-                org = OneLogin_Saml2_Templates.MD_ORGANISATION % \
-                    {
-                        'lang': lang,
-                        'name': info['name'],
-                        'display_name': info['displayname'],
-                        'url': info['url'],
-                    }
-                organization_info.append(org)
-            str_organization = '\n'.join(organization_info)
+                organization_names.append("""        <md:OrganizationName xml:lang="%s">%s</md:OrganizationName>""" % (lang, info['name']))
+                organization_displaynames.append("""        <md:OrganizationDisplayName xml:lang="%s">%s</md:OrganizationDisplayName>""" % (lang, info['displayname']))
+                organization_urls.append("""        <md:OrganizationURL xml:lang="%s">%s</md:OrganizationURL>""" % (lang, info['url']))
+            org_data = '\n'.join(organization_names) + '\n' + '\n'.join(organization_displaynames) + '\n' + '\n'.join(organization_urls)
+            str_organization = """    <md:Organization>
+            %(org)s
+                </md:Organization>""" % {'org': org_data}
 
         str_contacts = ''
         if len(contacts) > 0:

tests/src/OneLogin/saml2_tests/auth_test.py

@@ -400,7 +400,7 @@ def testProcessSLORequestInvalidValid(self):
         slo_url = settings_info['idp']['singleLogoutService']['url']
         self.assertIn(slo_url, target_url)
         self.assertIn('SAMLResponse', parsed_query)
-        #self.assertNotIn('RelayState', parsed_query)
+        # self.assertNotIn('RelayState', parsed_query)
 
         auth.set_strict(True)
         auth.process_slo(True)
@@ -414,7 +414,7 @@ def testProcessSLORequestInvalidValid(self):
         slo_url = settings_info['idp']['singleLogoutService']['url']
         self.assertIn(slo_url, target_url_2)
         self.assertIn('SAMLResponse', parsed_query_2)
-        #self.assertNotIn('RelayState', parsed_query_2)
+        # self.assertNotIn('RelayState', parsed_query_2)
 
     def testProcessSLORequestNotOnOrAfterFailed(self):
         """
@@ -463,7 +463,7 @@ def testProcessSLORequestDeletingSession(self):
         slo_url = settings_info['idp']['singleLogoutService']['url']
         self.assertIn(slo_url, target_url)
         self.assertIn('SAMLResponse', parsed_query)
-        #self.assertNotIn('RelayState', parsed_query)
+        # self.assertNotIn('RelayState', parsed_query)
 
         # FIXME // Session is not alive
         # $this->assertFalse(isset($_SESSION['samltest']));
@@ -477,7 +477,7 @@ def testProcessSLORequestDeletingSession(self):
         slo_url = settings_info['idp']['singleLogoutService']['url']
         self.assertIn(slo_url, target_url_2)
         self.assertIn('SAMLResponse', parsed_query_2)
-        #self.assertNotIn('RelayState', parsed_query_2)
+        # self.assertNotIn('RelayState', parsed_query_2)
 
         # FIXME // Session is alive
         # $this->assertTrue(isset($_SESSION['samltest']));

tests/src/OneLogin/saml2_tests/response_test.py

@@ -457,7 +457,6 @@ def testIsValidOptionalStatement(self):
         self.assertFalse(response.is_valid(self.get_request_data()))
         self.assertEqual('There is no AttributeStatement on the Response', response.get_error())
 
-        security = settings.get_security_data()
         # change wantAttributeStatement to optional
         json_settings['security']['wantAttributeStatement'] = False
         settings = OneLogin_Saml2_Settings(json_settings)