openstack/deb-python-pysaml2
Code Issues Proposed changes

Added some more log info

Browse Source
This commit is contained in:
Roland Hedberg
2013-05-30 12:31:32 +02:00
parent ef9d9fe6b5
commit ace130e552
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saml2/mdstore.py
View File

@@ -375,7 +375,7 @@ class MetaDataExtern(MetaData):
compliance before it is imported. compliance before it is imported.
""" """
response = self.http.send(self.url) response = self.http.send(self.url)
if response.status == 200: if response.status_code == 200:
node_name="%s:%s" % (md.EntitiesDescriptor.c_namespace, node_name="%s:%s" % (md.EntitiesDescriptor.c_namespace,
md.EntitiesDescriptor.c_tag) md.EntitiesDescriptor.c_tag)
if self.security.verify_signature(response.text, if self.security.verify_signature(response.text,
@@ -463,8 +463,10 @@ class MetadataStore(object):
known_principal = True known_principal = True
if known_principal: if known_principal:
logger.error("Unsupported binding: %s (%s)" % (binding, entity_id))
raise UnsupportedBinding(binding) raise UnsupportedBinding(binding)
else: else:
logger.error("Unknown principal: %s" % entity_id)
raise UnknownPrincipal(entity_id) raise UnknownPrincipal(entity_id)
def _ext_service(self, entity_id, typ, service, binding=None): def _ext_service(self, entity_id, typ, service, binding=None):

6
tools/mdexport.py
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
from saml2.sigver import _get_xmlsec_cryptobackend, SecurityContext
from saml2.httpbase import HTTPBase from saml2.httpbase import HTTPBase
from saml2 import saml from saml2 import saml
@@ -59,9 +60,10 @@ if args.type == "local":
elif args.type == "external": elif args.type == "external":
ATTRCONV = ac_factory(args.attrsmap) ATTRCONV = ac_factory(args.attrsmap)
httpc = HTTPBase() httpc = HTTPBase()
crypto = _get_xmlsec_cryptobackend("/opt/local/bin/xmlsec1")
sc = SecurityContext(crypto)
metad = MetaDataExtern(ONTS.values(), ATTRCONV, args.url, metad = MetaDataExtern(ONTS.values(), ATTRCONV, args.url,
"/opt/local/bin/xmlsec1", sc, cert=args.cert, http=httpc)
args.cert, httpc)
if metad: if metad:
metad.load() metad.load()