Updated to use pyjwkest 0.2.0

Fixed a lot of PEP-8 errors

Author: Roland Hedberg

LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright 2013 Roland Hedberg. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY ROLAND HEDBERG ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ROLAND HEDBERG OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

idp.py

@@ -129,9 +129,9 @@ def application(environ, start_response):
         return idp_srv.logo(environ, start_response, SERVER_ENV)
     elif path == "/logout":
         return idp_srv.logout(environ, start_response, sid, SERVER_ENV)
-    elif generateMetadata is not None and generateMetadata.verifyHandleRequest(
+    elif generateMetadata is not None and generateMetadata.verify_handle_request(
             path):
-        return generateMetadata.handleRequest(environ, start_response, path)
+        return generateMetadata.handle_request(environ, start_response, path)
     else:
         environ['idpproxy.url_args'] = ""
         return idp_srv.auth_choice(path, environ, start_response, sid,
@@ -263,16 +263,17 @@ def usage():
         _key = None
     idp_conf = import_module(args.config)
     metadata = idp_conf.CONFIG["metadata"]
+
+    #noinspection PyUnboundLocalVariable
+    _idp = setup_server_env(idp_proxy_conf, args.config, key)
+
     if _key:
         generateMetadata = MetadataGeneration(
             logger, idp_proxy_conf.SERVICE, publicKey=_key, privateKey=key,
-            metadataList=[metadata])
+            metadataList=[metadata], idp_conf=_idp.config)
     else:
         generateMetadata = None
 
-    #noinspection PyUnboundLocalVariable
-    _idp = setup_server_env(idp_proxy_conf, args.config, key)
-
     print SERVER_ENV["base_url"]
     SRV = wsgiserver.CherryPyWSGIServer(('0.0.0.0', SERVER_ENV["PORT"]),
                                         application)

run.sh

@@ -1 +1 @@
-./idp.py -r 'keys/idptest.key' idp_conf
+./idp.py -r 'pki/mykey.pem' idp_conf

src/idpproxy/__init__.py

@@ -162,8 +162,7 @@ def authn_response(server_env, req_info, userid, identity,
 # -----------------------------------------------------------------------------
 
 
-#noinspection PyUnusedLocal
-def get_eptid(server_env, req_info, identity, session):
+def get_eptid(server_env, req_info, session):
     return server_env["eptid"].get(server_env["idp"].config.entityid,
                                    req_info.sender(), session["permanent_id"],
                                    session["authn_auth"])
@@ -181,7 +180,7 @@ def do_req_response(server_env, req_info, response, environ, source,
         userid = identity["uid"]
         if "eduPersonTargetedID" not in identity:
             identity["eduPersonTargetedID"] = get_eptid(server_env, req_info,
-                                                        identity, session)
+                                                        session)
     else:
         userid = "anonymous"
 

src/idpproxy/idp_srv.py

@@ -18,10 +18,12 @@
 AUTH_CHOICE = BASE + "AuthChoice"
 POLICY = "policy.html"
 
+
 def not_found(environ, start_response, text):
     resp = NotFound(text)
     return resp(environ, start_response)
 
+
 def match(path, service):
     """
 
@@ -41,6 +43,7 @@ def match(path, service):
 
     return pp[0] == service
 
+
 def local_path(path):
     # First non-'' part is the service name
 
@@ -102,7 +105,7 @@ def auth_choice(path, environ, start_response, sid, server_env):
 
     environ['idpproxy.url_args'] = local_path(path)
     _cache = server_env["CACHE"]
-    if func_name == "callback": # Callback from the Social service
+    if func_name == "callback":  # Callback from the Social service
         try:
             query = parse_qs(environ["QUERY_STRING"])
         except KeyError:
@@ -114,7 +117,7 @@ def auth_choice(path, environ, start_response, sid, server_env):
         except KeyError:
             exception_log()
             return bad_request(environ, start_response, "Unknown session")
-    else: # This is the SAML endpoint
+    else:  # This is the SAML endpoint
         # Should I support mote then HTTP redirect
         _dict = unpack_redirect(environ)
         if _dict is None:
@@ -129,8 +132,8 @@ def auth_choice(path, environ, start_response, sid, server_env):
             logger.debug("Query: %s" % query)
 
             try:
-                req_info = server_env["idp"].parse_authn_request(query,
-                                                                 BINDING_HTTP_REDIRECT)
+                req_info = server_env["idp"].parse_authn_request(
+                    query, BINDING_HTTP_REDIRECT)
             except KeyError:
                 exception_log()
                 return bad_request(environ, start_response,
@@ -145,18 +148,17 @@ def auth_choice(path, environ, start_response, sid, server_env):
             except KeyError:
                 pass
 
-            logger.debug("type req_info: %s message: %s" % (type(req_info),
-                                                            type(req_info.message)))
+            logger.debug("type req_info: %s message: %s" % (
+                type(req_info), type(req_info.message)))
 
             entity_id = req_info.sender()
             _cache.set(sid, {"req_info": req_info, "entity_id": entity_id})
         else:
             return not_found(environ, start_response, "No query")
 
     logger.debug("SID: %s" % sid)
-    cookie = server_env["CACHE"].create_cookie(sid,
-                                        path="/%s" % _dic["social_endpoint"],
-                                        expire=60)
+    cookie = server_env["CACHE"].create_cookie(
+        sid, path="/%s" % _dic["social_endpoint"], expire=60)
 
     logger.debug("NEW COOKIE: %s" % (cookie,))
     #logger.debug("_dic: %s" % (_dic,))
@@ -186,6 +188,7 @@ def logo(environ, start_response, serv_env):
 
 # ----------------------------------------------------------------------------
 
+
 def logout(environ, start_response, sid, server_env):
     msg = ""
     resp = Response(msg)