PEP-8

Author: Roland Hedberg

src/s2repoze/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-#  Created by Roland Hedberg 
+#  Created by Roland Hedberg

src/s2repoze/plugins/challenge_decider.py

@@ -6,7 +6,7 @@
 from paste.httpheaders import CONTENT_TYPE
 from paste.httpheaders import USER_AGENT
 
-import re 
+import re
 
 _DAV_METHODS = (
     'OPTIONS',
@@ -74,9 +74,9 @@ def __call__(self, environ, status, _headers):
                     environ['samlsp.logout'] = True
                     return True
 
-            # If the user is already authent, whatever happens(except logout), 
+            # If the user is already authent, whatever happens(except logout),
             #   don't make a challenge
-            if environ.has_key('repoze.who.identity'): 
+            if environ.has_key('repoze.who.identity'):
                 return False
 
             # require a challenge for login

src/s2repoze/plugins/entitlement.py

@@ -7,18 +7,18 @@
 from repoze.who.interfaces import IMetadataProvider
 
 class EntitlementMetadataProvider(object):
-    
+
     implements(IMetadataProvider)
-    
+
     def __init__(self, filename, key_attribute):
         # Means I have to do explicit syncs on writes, but also
         # that it's faster on reads since it will cache data
         self._store = shelve.open(filename, writeback=True)
         self.key_attribute = key_attribute
-        
+
     def keys(self):
         return self._store.keys()
-        
+
     def get(self, user, attribute):
         return self._store[user][attribute]
 
@@ -28,19 +28,19 @@ def set(self, user, attribute, value):
 
         self._store[user][attribute] = value
         self._store.sync()
-        
+
     def part_of(self, user, virtualorg):
         if virtualorg in self._store[user]["entitlement"]:
             return True
         else:
             return False
-            
+
     def get_entitlement(self, user, virtualorg):
         try:
             return self._store[user]["entitlement"][virtualorg]
         except KeyError:
             return []
-            
+
     def store_entitlement(self, user, virtualorg, entitlement=None):
         if user not in self._store:
             self._store[user] = {"entitlement":{}}
@@ -51,14 +51,14 @@ def store_entitlement(self, user, virtualorg, entitlement=None):
             entitlement = []
         self._store[user]["entitlement"][virtualorg] = entitlement
         self._store.sync()
-            
+
     def add_metadata(self, environ, identity):
         #logger = environ.get('repoze.who.logger','')
         try:
             user = self._store[identity.get('repoze.who.userid')]
         except KeyError:
             return
-            
+
         try:
             vorg = environ["myapp.vo"]
             try:
@@ -72,6 +72,6 @@ def add_metadata(self, environ, identity):
             for vorg, ents in user["entitlement"].items():
                 res.extend(["%s:%s" % (vorg, e) for e in ents])
             identity["user"] = res
-        
+
 def make_plugin(filename, key_attribute=""):
     return EntitlementMetadataProvider(filename, key_attribute)

src/s2repoze/plugins/formswithhidden.py

@@ -40,7 +40,7 @@
 class FormHiddenPlugin(FormPlugin):
 
     implements(IChallenger, IIdentifier)
-    
+
     # IIdentifier
     def identify(self, environ):
         logger = environ.get('repoze.who.logger','')
@@ -49,7 +49,7 @@ def identify(self, environ):
         query = parse_dict_querystring(environ)
         # If the extractor finds a special query string on any request,
         # it will attempt to find the values in the input body.
-        if query.get(self.login_form_qs): 
+        if query.get(self.login_form_qs):
             form = parse_formvars(environ)
             from StringIO import StringIO
             # we need to replace wsgi.input because we've read it
@@ -89,7 +89,7 @@ def challenge(self, environ, status, app_headers, forget_headers):
             if location:
                 headers = list(app_headers) + list(forget_headers)
                 return HTTPFound(headers = headers)
-                
+
         query = parse_dict_querystring(environ)
         hidden = []
         for key, val in query.items():
@@ -98,7 +98,7 @@ def challenge(self, environ, status, app_headers, forget_headers):
         logger.info("hidden: %s" % (hidden,))
         form = self.formbody or _DEFAULT_FORM
         form = form % "\n".join(hidden)
-            
+
         if self.formcallable is not None:
             form = self.formcallable(environ)
         def auth_form(environ, start_response):

src/s2repoze/plugins/ini.py

@@ -6,15 +6,15 @@
 from repoze.who.interfaces import IMetadataProvider
 
 class INIMetadataProvider(object):
-    
+
     implements(IMetadataProvider)
-    
+
     def __init__(self, ini_file, key_attribute):
 
         self.users = ConfigParser.ConfigParser()
         self.users.readfp(open(ini_file))
         self.key_attribute = key_attribute
-        
+
     def add_metadata(self, _environ, identity):
         #logger = environ.get('repoze.who.logger','')
 
@@ -30,6 +30,6 @@ def add_metadata(self, _environ, identity):
                 identity["user"] = dict(self.users.items(key))
         except ValueError:
             pass
-        
+
 def make_plugin(ini_file, key_attribute=""):
     return INIMetadataProvider(ini_file, key_attribute)

src/s2repoze/plugins/sp.py

@@ -40,7 +40,7 @@
 from saml2.config import config_factory
 from saml2.profile import paos
 
-#from saml2.population import Population
+# from saml2.population import Population
 #from saml2.attribute_resolver import AttributeResolver
 
 logger = logging.getLogger(__name__)
@@ -58,6 +58,7 @@ def construct_came_from(environ):
         came_from += '?' + qstr
     return came_from
 
+
 def exception_trace(tag, exc, log):
     message = traceback.format_exception(*sys.exc_info())
     log.error("[%s] ExcList: %s" % (tag, "".join(message),))
@@ -79,12 +80,11 @@ def __call__(self, environ, start_response):
 
 
 class SAML2Plugin(object):
-
     implements(IChallenger, IIdentifier, IAuthenticator, IMetadataProvider)
 
     def __init__(self, rememberer_name, config, saml_client, wayf, cache,
                  sid_store=None, discovery="", idp_query_param="",
-                 sid_store_cert=None,):
+                 sid_store_cert=None, ):
         self.rememberer_name = rememberer_name
         self.wayf = wayf
         self.saml_client = saml_client
@@ -130,17 +130,20 @@ def _get_post(self, environ):
         :param environ: A dictionary with environment variables
         """
 
-        body= ''
+        body = ''
         try:
-            length= int(environ.get('CONTENT_LENGTH', '0'))
+            length = int(environ.get('CONTENT_LENGTH', '0'))
         except ValueError:
-            length= 0
-        if length!=0:
+            length = 0
+        if length != 0:
             body = environ['wsgi.input'].read(length)  # get the POST variables
-            environ['s2repoze.body'] = body            # store the request body for later use by pysaml2
-            environ['wsgi.input'] = StringIO(body)     # restore the request body as a stream so that everything seems untouched
+            environ[
+                's2repoze.body'] = body  # store the request body for later
+                # use by pysaml2
+            environ['wsgi.input'] = StringIO(body)  # restore the request body
+                # as a stream so that everything seems untouched
 
-        post = parse_qs(body)                          # parse the POST fields into a dict
+        post = parse_qs(body)  # parse the POST fields into a dict
 
         logger.debug('identify post: %s' % (post,))
 
@@ -161,10 +164,11 @@ def _pick_idp(self, environ, came_from):
         """
 
         # check headers to see if it's an ECP request
-#        headers = {
-#                    'Accept' : 'text/html; application/vnd.paos+xml',
-#                    'PAOS'   : 'ver="%s";"%s"' % (paos.NAMESPACE, SERVICE)
-#                    }
+        #        headers = {
+        #                    'Accept' : 'text/html; application/vnd.paos+xml',
+        #                    'PAOS'   : 'ver="%s";"%s"' % (paos.NAMESPACE,
+        # SERVICE)
+        #                    }
 
         _cli = self.saml_client
 
@@ -262,7 +266,6 @@ def challenge(self, environ, _status, _app_headers, _forget_headers):
 
         _cli = self.saml_client
 
-
         if 'REMOTE_USER' in environ:
             name_id = decode(environ["REMOTE_USER"])
 
@@ -360,7 +363,7 @@ def challenge(self, environ, _status, _app_headers, _forget_headers):
 
             try:
                 ret = _cli.config.getattr(
-                    "endpoints","sp")["discovery_response"][0][0]
+                    "endpoints", "sp")["discovery_response"][0][0]
                 if (environ["PATH_INFO"]) in ret and ret.split(
                         environ["PATH_INFO"])[1] == "":
                     query = parse_qs(environ["QUERY_STRING"])
@@ -439,8 +442,10 @@ def identify(self, environ):
         #logger = environ.get('repoze.who.logger', '')
 
         query = parse_dict_querystring(environ)
-        if ("CONTENT_LENGTH" not in environ or not environ["CONTENT_LENGTH"]) and \
-                        "SAMLResponse" not in query and "SAMLRequest" not in query:
+        if ("CONTENT_LENGTH" not in environ or not environ[
+            "CONTENT_LENGTH"]) and \
+                        "SAMLResponse" not in query and "SAMLRequest" not in \
+                query:
             logger.debug('[identify] get or empty post')
             return None
 
@@ -483,6 +488,7 @@ def identify(self, environ):
                     return {}
                 except:
                     import traceback
+
                     traceback.print_exc()
             elif "SAMLResponse" not in post:
                 logger.info("[sp.identify] --- NOT SAMLResponse ---")
@@ -498,7 +504,8 @@ def identify(self, environ):
                 #if self.debug:
                 try:
                     if logout:
-                        response = self.saml_client.parse_logout_request_response(
+                        response = \
+                            self.saml_client.parse_logout_request_response(
                             post["SAMLResponse"][0], binding)
                         if response:
                             action = self.saml_client.handle_logout_response(
@@ -548,7 +555,8 @@ def add_metadata(self, environ, identity):
         name_id = identity['repoze.who.userid']
         if isinstance(name_id, basestring):
             try:
-                # Make sure that userids authenticated by another plugin don't cause problems here.
+                # Make sure that userids authenticated by another plugin
+                # don't cause problems here.
                 name_id = decode(name_id)
             except:
                 pass
@@ -602,7 +610,9 @@ def _service_url(environ, qstr=None):
     #noinspection PyUnusedLocal
     def authenticate(self, environ, identity=None):
         if identity:
-            if identity.get('user') and environ.get('s2repoze.sessioninfo') and identity.get('user') == environ.get('s2repoze.sessioninfo').get('ava'):
+            if identity.get('user') and environ.get(
+                    's2repoze.sessioninfo') and identity.get(
+                    'user') == environ.get('s2repoze.sessioninfo').get('ava'):
                 return identity.get('login')
             tktuser = identity.get('repoze.who.plugins.auth_tkt.userid', None)
             if tktuser and self.saml_client.is_logged_in(decode(tktuser)):
@@ -634,8 +644,7 @@ def make_plugin(remember_name=None,  # plugin for remember
                 identity_cache="",
                 discovery="",
                 idp_query_param=""
-                ):
-
+):
     if saml_conf is "":
         raise ValueError(
             'must include saml_conf in configuration')