Moved s2repoze, xmkdsig and xmlenc under saml2.

 Fixed bug in mdstore.MetadataStore in handling external metadata using the new config format.

Author: Roland Hedberg

setup.py

@@ -51,22 +51,23 @@ def run_tests(self):
 
 setup(
     name='pysaml2',
-    version='2.4.0',
+    version='2.5.0',
     description='Python implementation of SAML Version 2',
     # long_description = read("README"),
     author='Roland Hedberg',
     author_email='[email protected]',
     license='Apache 2.0',
     url='https://github.com/rohe/pysaml2',
 
-    packages=['saml2', 'xmldsig', 'xmlenc', 's2repoze', 's2repoze.plugins',
-              "saml2/profile", "saml2/schema", "saml2/extension",
-              "saml2/attributemaps", "saml2/authn_context",
+    packages=['saml2', 'saml2/xmldsig', 'saml2/xmlenc', 'saml2/s2repoze',
+              'saml2/s2repoze.plugins', "saml2/profile", "saml2/schema",
+              "saml2/extension", "saml2/attributemaps", "saml2/authn_context",
               "saml2/entity_category", "saml2/userinfo"],
 
     package_dir={'': 'src'},
     package_data={'': ['xml/*.xml']},
-    classifiers=["Development Status :: 4 - Beta",
+    classifiers=[
+        "Development Status :: 4 - Beta",
         "License :: OSI Approved :: Apache Software License",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python :: 2.6",

src/idp_test/__init__.py

@@ -8,15 +8,17 @@
 
 import logging
 import imp
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 from saml2.client import Saml2Client
 from saml2.config import SPConfig
-from saml2.mdstore import MetadataStore, ToOld
+from saml2.mdstore import MetadataStore
 from saml2.mdstore import MetaData
+from saml2.mdstore import ToOld
 
-from saml2test import CheckError, FatalError
+from saml2test import CheckError
+from saml2test import FatalError
 from saml2test import exception_trace
 from saml2test import ContextFilter
 

src/saml2/config.py

@@ -31,8 +31,8 @@
 from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 
 ONTS = {

src/saml2/extension/pefim.py

@@ -2,7 +2,7 @@
 
 import saml2
 from saml2 import SamlBase
-from xmldsig import X509Data
+from saml2.xmldsig import X509Data
 
 NAMESPACE = 'urn:net:eustix:names:tc:PEFIM:0.0:assertion'
 

src/saml2/extension/shibmd.py

@@ -6,8 +6,7 @@
 
 import saml2
 from saml2 import SamlBase
-
-import xmldsig as ds
+from saml2 import xmldsig as ds
 
 NAMESPACE = 'urn:mace:shibboleth:metadata:1.0'
 

src/saml2/md.py

@@ -5,11 +5,10 @@
 #
 
 import saml2
-from saml2 import SamlBase
-
-import xmldsig as ds
-import xmlenc as xenc
 from saml2 import saml
+from saml2 import SamlBase
+from saml2 import xmldsig as ds
+from saml2 import xmlenc as xenc
 
 NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:metadata'
 

src/saml2/mdstore.py

@@ -113,8 +113,8 @@ def repack_cert(cert):
 
 
 class MetaData(object):
-    def __init__(self, onts, attrc, metadata='', node_name=None, check_validity=True,
-                 security=None, **kwargs):
+    def __init__(self, onts, attrc, metadata='', node_name=None,
+                 check_validity=True, security=None, **kwargs):
         self.onts = onts
         self.attrc = attrc
         self.metadata = metadata
@@ -616,7 +616,8 @@ class MetaDataExtern(InMemoryMetaData):
     Accessible but HTTP GET.
     """
 
-    def __init__(self, onts, attrc, url=None, security=None, cert=None, http=None, **kwargs):
+    def __init__(self, onts, attrc, url=None, security=None, cert=None,
+                 http=None, **kwargs):
         """
         :params onts:
         :params attrc:
@@ -827,8 +828,12 @@ def imp(self, spec):
 
                 # Separately handle MDExtern
                 if MDloader == MetaDataExtern:
-                    item['http'] = self.http
-                    item['security'] = self.security
+                    kwargs = {
+                        'http': self.http,
+                        'security': self.security
+                    }
+                else:
+                    kwargs = {}
 
                 for key in item['metadata']:
                     # Separately handle MetaDataFile and directory
@@ -840,7 +845,11 @@ def imp(self, spec):
                             _md.load()
                             self.metadata[_fil] = _md
                         return
-                    _md = MDloader(self.onts, self.attrc, *key)
+
+                    if len(key) == 2:
+                        kwargs["cert"] = key[1]
+
+                    _md = MDloader(self.onts, self.attrc, key[0], **kwargs)
                     _md.load()
                     self.metadata[key[0]] = _md
 

src/saml2/metadata.py

@@ -19,7 +19,7 @@
 from saml2 import samlp
 from saml2 import class_name
 
-import xmldsig as ds
+from saml2 import xmldsig as ds
 
 from saml2.sigver import pre_signature_part
 

src/saml2/mongo_store.py

@@ -19,8 +19,8 @@
 from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 
 ONTS = {

src/saml2/response.py

@@ -26,8 +26,8 @@
 from saml2.samlp import STATUS_UNSUPPORTED_BINDING
 from saml2.samlp import STATUS_RESPONDER
 
-import xmldsig as ds
-import xmlenc as xenc
+from saml2 import xmldsig as ds
+from saml2 import xmlenc as xenc
 
 from saml2 import samlp
 from saml2 import class_name