Merge pull request SAML-Toolkits#66 from open-craft/edx1-sls-optional

Fix creation of metadata with no SLS, when using settings.get_sp_metadata()
threatstream · May 8, 2015 · b753ea7 · b753ea7
2 parents c44971e + b1234fd
commit b753ea7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/onelogin/saml2/metadata.py b/src/onelogin/saml2/metadata.py
@@ -74,7 +74,7 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
             organization = {}
 
         sls = ''
-        if 'singleLogoutService' in sp:
+        if 'singleLogoutService' in sp and 'url' in sp['singleLogoutService']:
             sls = """        <md:SingleLogoutService Binding="%(binding)s"
                                 Location="%(location)s" />\n""" % \
                 {

diff --git a/tests/src/OneLogin/saml2_tests/metadata_test.py b/tests/src/OneLogin/saml2_tests/metadata_test.py
@@ -64,7 +64,7 @@ def testBuilder(self):
 
         security['authnRequestsSigned'] = True
         security['wantAssertionsSigned'] = True
-        del sp_data['singleLogoutService']
+        del sp_data['singleLogoutService']['url']
 
         metadata2 = OneLogin_Saml2_Metadata.builder(
             sp_data, security['authnRequestsSigned'],