openstack/deb-python-pysaml2
Code Issues Proposed changes

Started to add code for using MongoDB as backend store.

Browse Source
This commit is contained in:
Roland Hedberg
2013-03-05 09:31:54 +01:00
parent 7c3691c62b
commit ff6d96e990
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/saml2/server.py
View File

@@ -86,17 +86,23 @@ class Server(Entity):
# default database is a shelve database which is OK in some setups # default database is a shelve database which is OK in some setups
dbspec = self.config.getattr("subject_data", "idp") dbspec = self.config.getattr("subject_data", "idp")
idb = None idb = None
if isinstance(dbspec, basestring): if not dbspec:
pass
elif isinstance(dbspec, basestring):
idb = shelve.open(dbspec, writeback=True) idb = shelve.open(dbspec, writeback=True)
else: # database spec is a a 2-tuple (type, address) else: # database spec is a a 2-tuple (type, address)
print >> sys.stderr, "DBSPEC: %s" % dbspec print >> sys.stderr, "DBSPEC: %s" % (dbspec,)
(typ, addr) = dbspec (typ, addr) = dbspec
if typ == "shelve": if typ == "shelve":
idb = shelve.open(addr, writeback=True) idb = shelve.open(addr, writeback=True)
elif typ == "memcached": elif typ == "memcached":
idb = memcache.Client(addr) idb = memcache.Client(addr)
elif typ == "dict": # in-memory dictionary elif typ == "dict": # in-memory dictionary
idb = addr idb = addr
elif typ == "mongodb":
from mongodict import MongoDict
idb = MongoDict(host='localhost', port=27017,
database=addr, collection='store')
if idb is not None: if idb is not None:
self.ident = IdentDB(idb) self.ident = IdentDB(idb)
@@ -150,7 +156,6 @@ class Server(Entity):
return self._parse_request(xml_string, AttributeQuery, return self._parse_request(xml_string, AttributeQuery,
"attribute_service", binding) "attribute_service", binding)
def parse_authz_decision_query(self, xml_string, binding): def parse_authz_decision_query(self, xml_string, binding):
""" Parse an attribute query """ Parse an attribute query
@@ -236,7 +241,8 @@ class Server(Entity):
if statement.session_index != session_index: if statement.session_index != session_index:
continue continue
if requested_context: if requested_context:
if not context_match(requested_context, statement.authn_context): if not context_match(requested_context,
statement.authn_context):
continue continue
result.append(statement) result.append(statement)
@@ -286,7 +292,7 @@ class Server(Entity):
return self.create_error_response(in_response_to, consumer_url, return self.create_error_response(in_response_to, consumer_url,
exc, sign_response) exc, sign_response)
if authn: # expected to be a 2-tuple class+authority if authn: # expected to be a 2-tuple class+authority
(authn_class, authn_authn) = authn (authn_class, authn_authn) = authn
assertion = ast.construct(sp_entity_id, in_response_to, assertion = ast.construct(sp_entity_id, in_response_to,
consumer_url, name_id, consumer_url, name_id,
@@ -387,7 +393,6 @@ class Server(Entity):
# Just the assertion or the response and the assertion ? # Just the assertion or the response and the assertion ?
to_sign = [(class_name(assertion), assertion.id)] to_sign = [(class_name(assertion), assertion.id)]
args["assertion"] = assertion args["assertion"] = assertion
return self._response(in_response_to, destination, status, issuer, return self._response(in_response_to, destination, status, issuer,
@@ -424,7 +429,8 @@ class Server(Entity):
nid_formats = [] nid_formats = []
for _sp in self.metadata[sp_entity_id]["spsso_descriptor"]: for _sp in self.metadata[sp_entity_id]["spsso_descriptor"]:
if "name_id_format" in _sp: if "name_id_format" in _sp:
nid_formats.extend([n["text"] for n in _sp["name_id_format"]]) nid_formats.extend([n["text"] for n in
_sp["name_id_format"]])
name_id = self.ident.construct_nameid(userid, policy, name_id = self.ident.construct_nameid(userid, policy,
sp_entity_id, sp_entity_id,
@@ -438,13 +444,13 @@ class Server(Entity):
return ("%s" % response).split("\n") return ("%s" % response).split("\n")
try: try:
return self._authn_response(in_response_to, # in_response_to return self._authn_response(in_response_to, # in_response_to
destination, # consumer_url destination, # consumer_url
sp_entity_id, # sp_entity_id sp_entity_id, # sp_entity_id
identity, # identity as dictionary identity, # identity as dictionary
name_id, name_id,
authn=authn, # Information about the authn=authn, # Information about the
# authentication # authentication
authn_decl=authn_decl, authn_decl=authn_decl,
issuer=issuer, issuer=issuer,
policy=policy, policy=policy,
@@ -453,7 +459,7 @@ class Server(Entity):
except MissingValue, exc: except MissingValue, exc:
return self.create_error_response(in_response_to, destination, return self.create_error_response(in_response_to, destination,
sp_entity_id, exc, name_id) sp_entity_id, exc, name_id)
def create_assertion_id_request_response(self, assertion_id, sign=False): def create_assertion_id_request_response(self, assertion_id, sign=False):
""" """