Skip to content

Commit 5c0604c

Browse files
author
Roland Hedberg
committed
PEP-8
1 parent a1a875f commit 5c0604c

File tree

1 file changed

+44
-37
lines changed

1 file changed

+44
-37
lines changed

example/idp2/idp.py

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ def _expiration(timeout, tformat="%a, %d-%b-%Y %H:%M:%S GMT"):
8080
def dict2list_of_tuples(d):
8181
return [(k, v) for k, v in d.items()]
8282

83+
8384
# -----------------------------------------------------------------------------
8485

8586

@@ -96,22 +97,22 @@ def unpack_redirect(self):
9697
return dict([(k, v[0]) for k, v in parse_qs(_qs).items()])
9798
else:
9899
return None
99-
100+
100101
def unpack_post(self):
101102
_dict = parse_qs(get_post(self.environ))
102103
logger.debug("unpack_post:: %s" % _dict)
103104
try:
104105
return dict([(k, v[0]) for k, v in _dict.items()])
105106
except Exception:
106107
return None
107-
108+
108109
def unpack_soap(self):
109110
try:
110111
query = get_post(self.environ)
111112
return {"SAMLRequest": query, "RelayState": ""}
112113
except Exception:
113114
return None
114-
115+
115116
def unpack_either(self):
116117
if self.environ["REQUEST_METHOD"] == "GET":
117118
_dict = self.unpack_redirect()
@@ -124,7 +125,7 @@ def unpack_either(self):
124125

125126
def operation(self, saml_msg, binding):
126127
logger.debug("_operation: %s" % saml_msg)
127-
if not saml_msg or not 'SAMLRequest' in saml_msg:
128+
if not (saml_msg and 'SAMLRequest' in saml_msg):
128129
resp = BadRequest('Error parsing request or no request')
129130
return resp(self.environ, self.start_response)
130131
else:
@@ -136,7 +137,8 @@ def operation(self, saml_msg, binding):
136137
encrypt_cert=_encrypt_cert)
137138
except KeyError:
138139
# Can live with no relay state # TODO or can we, for inacademia?
139-
return self.do(saml_msg["SAMLRequest"], binding, saml_msg["RelayState"])
140+
return self.do(saml_msg["SAMLRequest"], binding,
141+
saml_msg["RelayState"])
140142

141143
def artifact_operation(self, saml_msg):
142144
if not saml_msg:
@@ -302,7 +304,7 @@ def do(self, query, binding_in, relay_state="", encrypt_cert=None):
302304

303305
if not _resp:
304306
identity = USERS[self.user].copy()
305-
#identity["eduPersonTargetedID"] = get_eptid(IDP, query, session)
307+
# identity["eduPersonTargetedID"] = get_eptid(IDP, query, session)
306308
logger.info("Identity: %s" % (identity,))
307309

308310
if REPOZE_ID_EQUIVALENT:
@@ -367,7 +369,8 @@ def redirect(self):
367369

368370
_req = self.req_info.message
369371

370-
if "SigAlg" in saml_msg and "Signature" in saml_msg: # Signed request
372+
if "SigAlg" in saml_msg and "Signature" in saml_msg: # Signed
373+
# request
371374
issuer = _req.issuer.text
372375
_certs = IDP.metadata.certs(issuer, "any", "signing")
373376
verified_ok = False
@@ -381,7 +384,7 @@ def redirect(self):
381384

382385
if self.user:
383386
if _req.force_authn is not None and \
384-
_req.force_authn.lower() == 'true':
387+
_req.force_authn.lower() == 'true':
385388
saml_msg["req_info"] = self.req_info
386389
key = self._store_request(saml_msg)
387390
return self.not_authn(key, _req.requested_authn_context)
@@ -425,7 +428,7 @@ def post(self):
425428
return self.operation(saml_msg, BINDING_HTTP_POST)
426429

427430
# def artifact(self):
428-
# # Can be either by HTTP_Redirect or HTTP_POST
431+
# # Can be either by HTTP_Redirect or HTTP_POST
429432
# _req = self._store_request(self.unpack_either())
430433
# if isinstance(_req, basestring):
431434
# return self.not_authn(_req)
@@ -448,7 +451,7 @@ def ecp(self):
448451
self.user = user
449452
self.environ[
450453
"idp.authn"] = AUTHN_BROKER.get_authn_by_accr(
451-
PASSWORD)
454+
PASSWORD)
452455
except ValueError:
453456
resp = Unauthorized()
454457
else:
@@ -465,6 +468,7 @@ def ecp(self):
465468
self.op_type = "ecp"
466469
return self.operation(_dict, BINDING_SOAP)
467470

471+
468472
# -----------------------------------------------------------------------------
469473
# === Authentication ====
470474
# -----------------------------------------------------------------------------
@@ -490,11 +494,11 @@ def do_authentication(environ, start_response, authn_context, key,
490494
# -----------------------------------------------------------------------------
491495

492496
PASSWD = {
493-
"daev0001": "qwerty",
494-
"haho0032": "qwerty",
495-
"roland": "dianakra",
496-
"babs": "howes",
497-
"upper": "crust"}
497+
"daev0001": "qwerty",
498+
"haho0032": "qwerty",
499+
"roland": "dianakra",
500+
"babs": "howes",
501+
"upper": "crust"}
498502

499503

500504
def username_password_authn(environ, start_response, reference, key,
@@ -568,7 +572,7 @@ def not_found(environ, start_response):
568572
# === Single log out ===
569573
# -----------------------------------------------------------------------------
570574

571-
#def _subject_sp_info(req_info):
575+
# def _subject_sp_info(req_info):
572576
# # look for the subject
573577
# subject = req_info.subject_id()
574578
# subject = subject.text.strip()
@@ -615,13 +619,13 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
615619
response = True
616620

617621
try:
618-
hinfo = IDP.apply_binding(binding, "%s" % resp, destination, relay_state,
619-
response=response)
622+
hinfo = IDP.apply_binding(binding, "%s" % resp, destination,
623+
relay_state, response=response)
620624
except Exception as exc:
621625
logger.error("ServiceError: %s" % exc)
622626
resp = ServiceError("%s" % exc)
623627
return resp(self.environ, self.start_response)
624-
628+
625629
#_tlh = dict2list_of_tuples(hinfo["headers"])
626630
delco = delete_cookie(self.environ, "idpauthn")
627631
if delco:
@@ -639,35 +643,36 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
639643
else:
640644
resp = Response(hinfo["data"], headers=hinfo["headers"])
641645
return resp(self.environ, self.start_response)
642-
646+
647+
643648
# ----------------------------------------------------------------------------
644649
# Manage Name ID service
645650
# ----------------------------------------------------------------------------
646651

647652

648653
class NMI(Service):
649-
650654
def do(self, query, binding, relay_state="", encrypt_cert=None):
651655
logger.info("--- Manage Name ID Service ---")
652656
req = IDP.parse_manage_name_id_request(query, binding)
653657
request = req.message
654-
658+
655659
# Do the necessary stuff
656660
name_id = IDP.ident.handle_manage_name_id_request(
657661
request.name_id, request.new_id, request.new_encrypted_id,
658662
request.terminate)
659-
663+
660664
logger.debug("New NameID: %s" % name_id)
661-
665+
662666
_resp = IDP.create_manage_name_id_response(request)
663-
667+
664668
# It's using SOAP binding
665669
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "",
666670
relay_state, response=True)
667-
671+
668672
resp = Response(hinfo["data"], headers=hinfo["headers"])
669673
return resp(self.environ, self.start_response)
670-
674+
675+
671676
# ----------------------------------------------------------------------------
672677
# === Assertion ID request ===
673678
# ----------------------------------------------------------------------------
@@ -683,9 +688,9 @@ def do(self, aid, binding, relay_state="", encrypt_cert=None):
683688
except Unknown:
684689
resp = NotFound(aid)
685690
return resp(self.environ, self.start_response)
686-
691+
687692
hinfo = IDP.apply_binding(BINDING_URI, "%s" % assertion, response=True)
688-
693+
689694
logger.debug("HINFO: %s" % hinfo)
690695
resp = Response(hinfo["data"], headers=hinfo["headers"])
691696
return resp(self.environ, self.start_response)
@@ -715,6 +720,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
715720
resp = Response(hinfo["data"], headers=hinfo["headers"])
716721
return resp(self.environ, self.start_response)
717722

723+
718724
# ----------------------------------------------------------------------------
719725
# === Authn query service ===
720726
# ----------------------------------------------------------------------------
@@ -769,6 +775,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None):
769775
resp = Response(hinfo["data"], headers=hinfo["headers"])
770776
return resp(self.environ, self.start_response)
771777

778+
772779
# ----------------------------------------------------------------------------
773780
# Name ID Mapping service
774781
# When an entity that shares an identifier for a principal with an identity
@@ -792,17 +799,17 @@ def do(self, query, binding, relay_state="", encrypt_cert=None):
792799
except PolicyError:
793800
resp = BadRequest("Unknown entity")
794801
return resp(self.environ, self.start_response)
795-
802+
796803
info = IDP.response_args(request)
797804
_resp = IDP.create_name_id_mapping_response(name_id, **info)
798-
805+
799806
# Only SOAP
800807
hinfo = IDP.apply_binding(BINDING_SOAP, "%s" % _resp, "", "",
801808
response=True)
802-
809+
803810
resp = Response(hinfo["data"], headers=hinfo["headers"])
804811
return resp(self.environ, self.start_response)
805-
812+
806813

807814
# ----------------------------------------------------------------------------
808815
# Cookie handling
@@ -897,10 +904,10 @@ def metadata(environ, start_response):
897904
try:
898905
path = args.path
899906
if path is None or len(path) == 0:
900-
path = os.path.dirname(os.path.abspath( __file__ ))
907+
path = os.path.dirname(os.path.abspath(__file__))
901908
if path[-1] != "/":
902909
path += "/"
903-
metadata = create_metadata_string(path+args.config, IDP.config,
910+
metadata = create_metadata_string(path + args.config, IDP.config,
904911
args.valid, args.cert, args.keyfile,
905912
args.id, args.name, args.sign)
906913
start_response('200 OK', [('Content-Type', "text/xml")])
@@ -961,7 +968,6 @@ def application(environ, start_response):
961968
except KeyError:
962969
user = None
963970

964-
965971
url_patterns = AUTHN_URLS
966972
if not user:
967973
logger.info("-- No USER --")
@@ -995,7 +1001,8 @@ def application(environ, start_response):
9951001
parser = argparse.ArgumentParser()
9961002
parser.add_argument('-p', dest='path', help='Path to configuration file.')
9971003
parser.add_argument('-v', dest='valid',
998-
help="How long, in days, the metadata is valid from the time of creation")
1004+
help="How long, in days, the metadata is valid from "
1005+
"the time of creation")
9991006
parser.add_argument('-c', dest='cert', help='certificate')
10001007
parser.add_argument('-i', dest='id',
10011008
help="The ID of the entities descriptor")

0 commit comments

Comments
 (0)