Merge pull request #150 from tpazderka/MetadataStore

Roland Hedberg · Roland Hedberg · commit 25704a9faeaa · 2014-12-10T20:14:19.000+01:00
Metadata store
diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
diff --git a/src/saml2/mongo_store.py b/src/saml2/mongo_store.py
@@ -6,7 +6,7 @@
 import pymongo.uri_parser
 import pymongo.errors
 from saml2.eptid import Eptid
-from saml2.mdstore import MetaData
+from saml2.mdstore import InMemoryMetaData
 from saml2.s_utils import PolicyError
 
 from saml2.ident import code, IdentDB, Unknown
@@ -377,9 +377,9 @@ def export_mdstore_to_mongo_db(mds, database, collection, sub_collection=""):
         mdb.store(key, **kwargs)
 
 
-class MetadataMDB(MetaData):
+class MetadataMDB(InMemoryMetaData):
     def __init__(self, onts, attrc, database="", collection=""):
-        MetaData.__init__(self, onts, attrc)
+        super(MetadataMDB, self).__init__(onts, attrc)
         self.mdb = MDB(database, collection)
         self.mdb.primary_key = "entity_id"
 
diff --git a/tests/disco_conf.py b/tests/disco_conf.py
@@ -19,7 +19,8 @@
     },
     "debug": 1,
     "xmlsec_binary": xmlsec_path,
-    "metadata": {
-        "local": [full_path("servera.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("servera.xml"), )],
+    }],
 }
diff --git a/tests/idp_all_conf.py b/tests/idp_all_conf.py
@@ -87,10 +87,11 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "xmlsec_path": ["/usr/local/bin", "/opt/local/bin"],
-    "metadata": {
-        "local": [full_path("servera.xml"),
-                  full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("servera.xml"), ),
+                     (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir": full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_conf.py b/tests/idp_conf.py
@@ -45,10 +45,11 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "xmlsec_binary": xmlsec_path,
-    "metadata": {
-        "local": [full_path("metadata_sp_1.xml"),
-                  full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata_sp_1.xml"), ),
+                     (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir": full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_conf_ec.py b/tests/idp_conf_ec.py
@@ -38,10 +38,11 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "xmlsec_binary": xmlsec_path,
-    "metadata": {
-        "local": [full_path("metadata_sp_1.xml"),
-                  full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata_sp_1.xml"), ),
+                  (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir": full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_conf_mdb.py b/tests/idp_conf_mdb.py
@@ -88,10 +88,11 @@
     "cert_file": full_path("test.pem"),
     #"xmlsec_binary": None,
     "xmlsec_path": ["/opt/local/bin", "usr/local/bin"],
-    "metadata": {
-        "local": [full_path("servera.xml"),
-                  full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("servera.xml"), ),
+                  (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir": full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_slo_redirect_conf.py b/tests/idp_slo_redirect_conf.py
@@ -33,9 +33,10 @@
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
     "xmlsec_binary" : None,
-    "metadata": {
-        "local": [full_path("sp_slo_redirect.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("sp_slo_redirect.xml"), )],
+    }],
     "attribute_map_dir" : full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_soap_conf.py b/tests/idp_soap_conf.py
@@ -37,9 +37,10 @@
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
     #"xmlsec_binary" : None,
-    "metadata": {
-        "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir" : full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/idp_sp_conf.py b/tests/idp_sp_conf.py
@@ -50,9 +50,10 @@
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
     "xmlsec_binary" : None,
-    "metadata": {
-        "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "attribute_map_dir" : full_path("attributemaps"),
     "organization": {
         "name": "Exempel AB",
diff --git a/tests/restrictive_idp_conf.py b/tests/restrictive_idp_conf.py
@@ -37,8 +37,9 @@
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
     "xmlsec_binary" : None,
-    "metadata": {
-        "local": [full_path("sp_0.metadata")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("sp_0.metadata"), )],
+    }],
     "attribute_map_dir" : full_path("attributemaps"),
 }
diff --git a/tests/server_conf.py b/tests/server_conf.py
@@ -21,9 +21,10 @@
     "cert_file": full_path("test.pem"),
     "ca_certs": full_path("cacerts.txt"),
     "xmlsec_binary": xmlsec_path,
-    "metadata": {
-        "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("idp.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "virtual_organization": {
         "urn:mace:example.com:it:tek": {
             "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
diff --git a/tests/server_conf_syslog.py b/tests/server_conf_syslog.py
@@ -22,9 +22,10 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     # "xmlsec_binary" : None,
-    "metadata": {
-        "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("idp.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "virtual_organization": {
         "urn:mace:example.com:it:tek": {
             "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
diff --git a/tests/servera_conf.py b/tests/servera_conf.py
@@ -51,9 +51,10 @@
     "cert_file": full_path("test.pem"),
     "ca_certs": full_path("cacerts.txt"),
     "xmlsec_binary": xmlsec_path,
-    "metadata": {
-        "local": [full_path("idp_all.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("idp_all.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "virtual_organization": {
         "urn:mace:example.com:it:tek": {
             "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
diff --git a/tests/sp_1_conf.py b/tests/sp_1_conf.py
@@ -20,9 +20,10 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "xmlsec_binary": None,
-    "metadata": {
-        "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("idp.xml"), ), (full_path("vo_metadata.xml"), )],
+    }],
     "virtual_organization": {
         "urn:mace:example.com:it:tek": {
             "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
diff --git a/tests/sp_slo_redirect_conf.py b/tests/sp_slo_redirect_conf.py
@@ -27,9 +27,10 @@
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "xmlsec_binary": None,
-    "metadata": {
-        "local": [full_path("idp_slo_redirect.xml")],
-    },
+    "metadata": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("idp_slo_redirect.xml"), )],
+    }],
     "virtual_organization": {
         "urn:mace:example.com:it:tek": {
             "nameid_format": "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
diff --git a/tests/test_30_mdstore.py b/tests/test_30_mdstore.py
@@ -49,34 +49,44 @@
 ATTRCONV = ac_factory(full_path("attributemaps"))
 
 METADATACONF = {
-    "1": {
-        "local": [full_path("swamid-1.0.xml")]
-    },
-    "2": {
-        "local": [full_path("InCommon-metadata.xml")]
-    },
-    "3": {
-        "local": [full_path("extended.xml")]
-    },
-    "7": {
-        "local": [full_path("metadata_sp_1.xml"),
-                  full_path("InCommon-metadata.xml")],
-        "remote": [
-            {"url": "https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2",
-             "cert": full_path("kalmar2.pem")}]
-    },
-    "4": {
-        "local": [full_path("metadata_example.xml")]
-    },
-    "5": {
-        "local": [full_path("metadata.aaitest.xml")]
-    },
-    "8": {
-        "mdfile": [full_path("swamid.md")]
-    },
-    "9": {
-        "local": [full_path("metadata")]
-    }
+    "1": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("swamid-1.0.xml"), )],
+    }],
+    "2": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("InCommon-metadata.xml"), )],
+    }],
+    "3": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("extended.xml"), )],
+    }],
+    "7": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata_sp_1.xml"), ),
+                     (full_path("InCommon-metadata.xml"), )], },
+          {
+        "class": "saml2.mdstore.MetaDataExtern",
+        "metadata": [
+            ("https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2",
+             full_path("kalmar2.pem")), ],
+    }],
+    "4": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata_example.xml"), )],
+    }],
+    "5": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata.aaitest.xml"), )],
+    }],
+    "8": [{
+        "class": "saml2.mdstore.MetaDataMD",
+        "metadata": [(full_path("swamid.md"), )],
+    }],
+    "9": [{
+        "class": "saml2.mdstore.MetaDataFile",
+        "metadata": [(full_path("metadata"), )]
+    }]
 }
 
 
@@ -117,13 +127,13 @@ def test_swami_1():
     lnamn = [d_to_local_name(mds.attrc, attr) for attr in wants["optional"]]
     assert _eq(lnamn, ['eduPersonPrincipalName', 'mail', 'givenName', 'sn',
                        'eduPersonScopedAffiliation'])
-                
+
     wants = mds.attribute_requirement('https://beta.lobber.se/shibboleth')
     assert wants["required"] == []
     lnamn = [d_to_local_name(mds.attrc, attr) for attr in wants["optional"]]
     assert _eq(lnamn, ['eduPersonPrincipalName', 'mail', 'givenName', 'sn',
                        'eduPersonScopedAffiliation', 'eduPersonEntitlement'])
-                
+
 
 def test_incommon_1():
     mds = MetadataStore(ONTS.values(), ATTRCONV, sec_config,
diff --git a/tests/test_30_mdstore_old.py b/tests/test_30_mdstore_old.py
diff --git a/tests/test_31_config.py b/tests/test_31_config.py
diff --git a/tests/test_37_entity_categories.py b/tests/test_37_entity_categories.py
diff --git a/tests/test_76_metadata_in_mdb.py b/tests/test_76_metadata_in_mdb.py
