Merge branch 'master' into test_new_encrypt

Author: Hans Hörberg

.gitignore

@@ -2,6 +2,8 @@
 *.~
 \#*
 .*~
+.eggs
+*.egg
 *.egg-info
 example/*/*.log
 example/*.db
@@ -192,3 +194,4 @@ example/sp-repoze/sp_conf_2.Pygmalion
 example/sp-repoze/sp_conf_2.py
 
 sp.xml
+tests/pki/qwerty.*

doc/conf.py

@@ -12,6 +12,7 @@
 # serve to show the default.
 
 import sys, os
+import alabaster
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -22,6 +23,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -91,6 +93,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme_path = [alabaster.get_path()]
 html_theme = 'alabaster'
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 

example/idp2/idp.py

@@ -297,7 +297,8 @@ def verify_request(self, query, binding):
 
         return resp_args, _resp
 
-    def do(self, query, binding_in, relay_state="", encrypt_cert=None):
+    def do(self, query, binding_in, relay_state="", encrypt_cert=None,
+           **kwargs):
         """
 
         :param query: The request
@@ -604,7 +605,7 @@ def not_found(environ, start_response):
 #    return subject, sp_entity_id
 
 class SLO(Service):
-    def do(self, request, binding, relay_state="", encrypt_cert=None):
+    def do(self, request, binding, relay_state="", encrypt_cert=None, **kwargs):
 
         logger.info("--- Single Log Out Service ---")
         try:
@@ -1064,5 +1065,5 @@ def application(environ, start_response):
     PORT = CONFIG.PORT
 
     SRV = make_server(HOST, PORT, application)
-    print "IdP listening on %s:%s" % (HOST, PORT)
+    print("IdP listening on %s:%s" % (HOST, PORT))
     SRV.serve_forever()

example/idp2/idp_uwsgi.py

@@ -1019,7 +1019,7 @@ def application(environ, start_response):
     PORT = CONFIG.PORT
 
     SRV = make_server(HOST, PORT, application)
-    print "IdP listening on %s:%s" % (HOST, PORT)
+    print("IdP listening on %s:%s" % (HOST, PORT))
     SRV.serve_forever()
 else:
     _rot = args.mako_root

example/idp2_repoze/idp.py

@@ -269,10 +269,10 @@ def verify_request(self, query, binding):
         try:
             resp_args = IDP.response_args(_authn_req)
             _resp = None
-        except UnknownPrincipal, excp:
+        except UnknownPrincipal as excp:
             _resp = IDP.create_error_response(_authn_req.id,
                                               self.destination, excp)
-        except UnsupportedBinding, excp:
+        except UnsupportedBinding as excp:
             _resp = IDP.create_error_response(_authn_req.id,
                                               self.destination, excp)
 
@@ -281,11 +281,11 @@ def verify_request(self, query, binding):
     def do(self, query, binding_in, relay_state=""):
         try:
             resp_args, _resp = self.verify_request(query, binding_in)
-        except UnknownPrincipal, excp:
+        except UnknownPrincipal as excp:
             logger.error("UnknownPrincipal: %s" % (excp,))
             resp = ServiceError("UnknownPrincipal: %s" % (excp,))
             return resp(self.environ, self.start_response)
-        except UnsupportedBinding, excp:
+        except UnsupportedBinding as excp:
             logger.error("UnsupportedBinding: %s" % (excp,))
             resp = ServiceError("UnsupportedBinding: %s" % (excp,))
             return resp(self.environ, self.start_response)
@@ -305,7 +305,7 @@ def do(self, query, binding_in, relay_state=""):
                     identity, userid=self.user,
                     authn=AUTHN_BROKER[self.environ["idp.authn_ref"]], sign_assertion=sign_assertion,
                     sign_response=False, **resp_args)
-            except Exception, excp:
+            except Exception as excp:
                 logging.error(exception_trace(excp))
                 resp = ServiceError("Exception: %s" % (excp,))
                 return resp(self.environ, self.start_response)
@@ -548,7 +548,7 @@ def do(self, request, binding, relay_state=""):
             _, body = request.split("\n")
             logger.debug("req: '%s'" % body)
             req_info = IDP.parse_logout_request(body, binding)
-        except Exception, exc:
+        except Exception as exc:
             logger.error("Bad request: %s" % exc)
             resp = BadRequest("%s" % exc)
             return resp(self.environ, self.start_response)
@@ -565,7 +565,7 @@ def do(self, request, binding, relay_state=""):
             # remove the authentication
             try:
                 IDP.session_db.remove_authn_statements(msg.name_id)
-            except KeyError, exc:
+            except KeyError as exc:
                 logger.error("ServiceError: %s" % exc)
                 resp = ServiceError("%s" % exc)
                 return resp(self.environ, self.start_response)
@@ -574,7 +574,7 @@ def do(self, request, binding, relay_state=""):
 
         try:
             hinfo = IDP.apply_binding(binding, "%s" % resp, "", relay_state)
-        except Exception, exc:
+        except Exception as exc:
             logger.error("ServiceError: %s" % exc)
             resp = ServiceError("%s" % exc)
             return resp(self.environ, self.start_response)
@@ -986,7 +986,7 @@ def application(environ, start_response):
     PORT = 8088
 
     SRV = make_server(HOST, PORT, application)
-    print "IdP listening on %s:%s" % (HOST, PORT)
+    print("IdP listening on %s:%s" % (HOST, PORT))
     SRV.serve_forever()
 else:
     _rot = args.mako_root

example/sp-repoze/sp.py

@@ -293,5 +293,5 @@ def application(environ, start_response):
 
     from wsgiref.simple_server import make_server
     srv = make_server(HOST, PORT, app_with_auth)
-    print "SP listening on %s:%s" % (HOST, PORT)
+    print("SP listening on %s:%s" % (HOST, PORT))
     srv.serve_forever()

example/sp-wsgi/sp.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import logging
 import re
 import argparse
@@ -353,18 +354,18 @@ def do(self, response, binding, relay_state="", mtype="response"):
         try:
             self.response = self.sp.parse_authn_request_response(
                 response, binding, self.outstanding_queries, self.cache.outstanding_certs)
-        except UnknownPrincipal, excp:
+        except UnknownPrincipal as excp:
             logger.error("UnknownPrincipal: %s" % (excp,))
             resp = ServiceError("UnknownPrincipal: %s" % (excp,))
             return resp(self.environ, self.start_response)
-        except UnsupportedBinding, excp:
+        except UnsupportedBinding as excp:
             logger.error("UnsupportedBinding: %s" % (excp,))
             resp = ServiceError("UnsupportedBinding: %s" % (excp,))
             return resp(self.environ, self.start_response)
-        except VerificationError, err:
+        except VerificationError as err:
             resp = ServiceError("Verification error: %s" % (err,))
             return resp(self.environ, self.start_response)
-        except Exception, err:
+        except Exception as err:
             resp = ServiceError("Other error: %s" % (err,))
             return resp(self.environ, self.start_response)
 
@@ -580,7 +581,7 @@ def redirect_to_auth(self, _cli, entity_id, came_from):
             if cert is not None:
                 self.cache.outstanding_certs[_sid] = cert
 
-        except Exception, exc:
+        except Exception as exc:
             logger.exception(exc)
             resp = ServiceError(
                 "Failed to construct the AuthnRequest: %s" % exc)
@@ -784,14 +785,14 @@ def application(environ, start_response):
         if re.match(".*static/.*", path):
             return handle_static(environ, start_response, path)
         return not_found(environ, start_response)
-    except StatusError, err:
+    except StatusError as err:
         logging.error("StatusError: %s" % err)
         resp = BadRequest("%s" % err)
         return resp(environ, start_response)
-    except Exception, err:
+    except Exception as err:
         #_err = exception_trace("RUN", err)
         #logging.error(exception_trace("RUN", _err))
-        print >> sys.stderr, err
+        print(err, file=sys.stderr)
         resp = ServiceError("%s" % err)
         return resp(environ, start_response)
 
@@ -850,7 +851,7 @@ def application(environ, start_response):
                                                          SERVER_KEY, CERT_CHAIN)
         _https = " using SSL/TLS"
     logger.info("Server starting")
-    print "SP listening on %s:%s%s" % (HOST, PORT, _https)
+    print("SP listening on %s:%s%s" % (HOST, PORT, _https))
     try:
         SRV.start()
     except KeyboardInterrupt:

script/filter_testcase_ids.py

@@ -7,4 +7,4 @@
 import json, sys
 jdata = json.load(sys.stdin)
 for k in jdata:
-    print k["id"]
+    print(k["id"])

script/utility/filter_testcase_ids.py

@@ -7,4 +7,4 @@
 import json, sys
 jdata = json.load(sys.stdin)
 for k in jdata:
-    print k["id"]
+    print(k["id"])

script/utility/run_list_of_tests.py

@@ -5,6 +5,6 @@
 
 for line in fileinput.input():
     cmd = "./run_oper.sh " + line.rstrip()
-    print "executing " + cmd
+    print("executing " + cmd)
     call(cmd, shell=True)