Fixed the RegistrationInfo None condition

entities_security_contacts.py

@@ -26,7 +26,7 @@ ns = {
     'shibmd': 'urn:mace:shibboleth:metadata:1.0',
     'remd': 'http://refeds.org/metadata',
     'icmd': 'http://id.incommon.org/metadata',
-    'mdrpi': 'urn:oasis:names:tc:SAML:2.0:metadata:rpi',
+    'mdrpi': 'urn:oasis:names:tc:SAML:metadata:rpi',
 }
 
 
@@ -37,10 +37,10 @@ for entity in entities:
 
     registration_authority = ''
     registration_info = entity.find('./md:Extensions/mdrpi:RegistrationInfo', ns)
-    if not registration_info:
+    if registration_info == None:
         continue
     else:
-        registration_authority = registration_info.attrib['RegistrationAuthority']
+        registration_authority = registration_info.attrib['registrationAuthority'].strip()
     orgname = entity.find('./md:Organization/md:OrganizationDisplayName', ns).text.strip()
     if not orgname:
         continue
@@ -70,7 +70,7 @@ for entity in entities:
         for mail in sec_mails:
             if (domain,mail) not in seen_doms_mails:
                 seen_doms_mails.add((domain, mail))
-                contacts.add('{},{},{}'.format(domain, mail, orgname, registration_authority))
+                contacts.add('{},{},{},{}'.format(registration_authority, domain, mail, orgname))
 
 for contact in sorted(contacts):
     print(contact)