Handle registration_policy None

2 files changed, 11 insertions, 1 deletions

diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
index 76a981a8..a6f18fe2 100644
--- a/src/saml2/mdstore.py
+++ b/src/saml2/mdstore.py
@@ -1445,7 +1445,7 @@ class MetadataStore(MetaData):
             if elem["__class__"] == classnames["mdrpi_registration_info"]:
                 res["registration_authority"] = elem["registration_authority"]
                 res["registration_instant"] = elem.get("registration_instant")
-                for policy in elem.get('registration_policy'):
+                for policy in elem.get('registration_policy', list()):
                     if policy["__class__"] == classnames["mdrpi_registration_policy"]:
                         res['registration_policy'][policy["lang"]] = policy["text"]
         return res
diff --git a/tests/test_30_mdstore.py b/tests/test_30_mdstore.py
index fede1010..4dfa80f3 100644
--- a/tests/test_30_mdstore.py
+++ b/tests/test_30_mdstore.py
@@ -575,6 +575,16 @@ def test_registration_info():
            registration_info['registration_policy']['en']
 
 
+def test_registration_info_no_policy():
+    mds = MetadataStore(ATTRCONV, sec_config,
+                        disable_ssl_certificate_validation=True)
+    mds.imp(METADATACONF["13"])
+    registration_info = mds.registration_info(entity_id='https://idp.szie.hu/idp/shibboleth')
+    assert 'http://eduid.hu' == registration_info['registration_authority']
+    assert registration_info['registration_instant'] is None
+    assert registration_info['registration_policy'] == {}
+
+
 def test_extension():
     mds = MetadataStore(ATTRCONV, None)
     # use ordered dict to force expected entity to be last