diff options
| -rw-r--r-- | src/saml2/ident.py | 18 | ||||
| -rw-r--r-- | src/saml2/mongo_store.py | 11 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/saml2/ident.py b/src/saml2/ident.py index 95835239..d6a6620a 100644 --- a/src/saml2/ident.py +++ b/src/saml2/ident.py @@ -156,11 +156,13 @@ class IdentDB(object): def get_nameid(self, userid, nformat, sp_name_qualifier, name_qualifier): if nformat == NAMEID_FORMAT_PERSISTENT: - nameid = self.match_local_id(userid, sp_name_qualifier, - name_qualifier) + nameid = self.match_local_id(userid, sp_name_qualifier, name_qualifier) if nameid: - logger.debug("Found existing persistent NameId %s " - "for user %s" % (nameid, userid)) + logger.debug( + "Found existing persistent NameId {nid} for user {uid}".format( + nid=nameid, uid=userid + ) + ) return nameid _id = self.create_id(nformat, name_qualifier, sp_name_qualifier) @@ -171,8 +173,12 @@ class IdentDB(object): _id = "%s@%s" % (_id, self.domain) - nameid = NameID(format=nformat, sp_name_qualifier=sp_name_qualifier, - name_qualifier=name_qualifier, text=_id) + nameid = NameID( + format=nformat, + sp_name_qualifier=sp_name_qualifier, + name_qualifier=name_qualifier, + text=_id, + ) self.store(userid, nameid) return nameid diff --git a/src/saml2/mongo_store.py b/src/saml2/mongo_store.py index 6bbaaf52..4120e9e0 100644 --- a/src/saml2/mongo_store.py +++ b/src/saml2/mongo_store.py @@ -167,13 +167,16 @@ class IdentMDB(IdentDB): def match_local_id(self, userid, sp_name_qualifier, name_qualifier): """ + Match a local persistent identifier. + Look for an existing persistent NameID matching userid, sp_name_qualifier and name_qualifier. """ - filter = {"name_id.sp_name_qualifier": sp_name_qualifier, - "name_id.name_qualifier": name_qualifier, - "name_id.format": NAMEID_FORMAT_PERSISTENT, - } + filter = { + "name_id.sp_name_qualifier": sp_name_qualifier, + "name_id.name_qualifier": name_qualifier, + "name_id.format": NAMEID_FORMAT_PERSISTENT, + } res = self.mdb.get(value=userid, **filter) if not res: return None |