Fix flake8 warnings

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/saml2/__init__.py

@@ -636,8 +636,8 @@ def set_prefixes(self, elem, prefix_map):
 
         # fixup all elements in the tree
         memo = {}
-        for elem in elem.iter():
-            self.fixup_element_prefixes(elem, uri_map, memo)
+        for element in elem.iter():
+            self.fixup_element_prefixes(element, uri_map, memo)
 
     def fixup_element_prefixes(self, elem, uri_map, memo):
         def fixup(name):
@@ -739,18 +739,15 @@ def set_text(self, val, base64encode=False):
 
         # print("set_text: %s" % (val,))
         if isinstance(val, bool):
-            if val:
-                setattr(self, "text", "true")
-            else:
-                setattr(self, "text", "false")
+            self.text = "true" if val else "false"
         elif isinstance(val, int):
-            setattr(self, "text", "%d" % val)
+            self.text = str(val)
         elif isinstance(val, six.string_types):
-            setattr(self, "text", val)
+            self.text = val
         elif val is None:
             pass
         else:
-            raise ValueError("Type shouldn't be '%s'" % (val,))
+            raise ValueError("Type shouldn't be '%s'" % val)
 
         return self
 

src/saml2/authn_context/__init__.py

@@ -1,13 +1,14 @@
+from saml2 import extension_elements_to_elements
+from saml2.authn_context import ippword
+from saml2.authn_context import mobiletwofactor
+from saml2.authn_context import ppt
+from saml2.authn_context import pword
+from saml2.authn_context import sslcert
 from saml2.saml import AuthnContext
 from saml2.saml import AuthnContextClassRef
 from saml2.samlp import RequestedAuthnContext
 
 
-__author__ = "rolandh"
-
-from saml2 import extension_elements_to_elements
-
-
 UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified"
 
 INTERNETPROTOCOLPASSWORD = "urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword"
@@ -22,13 +23,6 @@
 AL3 = "http://idmanagement.gov/icam/2009/12/saml_2.0_profile/assurancelevel3"
 AL4 = "http://idmanagement.gov/icam/2009/12/saml_2.0_profile/assurancelevel4"
 
-from saml2.authn_context import ippword
-from saml2.authn_context import mobiletwofactor
-from saml2.authn_context import ppt
-from saml2.authn_context import pword
-from saml2.authn_context import sslcert
-
-
 CMP_TYPE = ["exact", "minimum", "maximum", "better"]
 
 

src/saml2/cert.py

@@ -122,11 +122,11 @@ def create_certificate(
             key_file = "%s.key" % cn
             try:
                 remove(cert_file)
-            except:
+            except Exception:
                 pass
             try:
                 remove(key_file)
-            except:
+            except Exception:
                 pass
             c_f = join(cert_dir, cert_file)
             k_f = join(cert_dir, key_file)
@@ -146,7 +146,7 @@ def create_certificate(
         cert.get_subject().C = cert_info["country_code"]
         cert.get_subject().ST = cert_info["state"]
         cert.get_subject().L = cert_info["city"]
-        cert.get_subject().O = cert_info["organization"]
+        cert.get_subject().O = cert_info["organization"]  # noqa: E741
         cert.get_subject().OU = cert_info["organization_unit"]
         cert.get_subject().CN = cn
         if not request:
@@ -333,7 +333,7 @@ def verify(self, signing_cert_str, cert_str):
                 crypto.verify(ca_cert, cert_crypto.signature, cert_crypto.tbs_certificate_bytes, cert_algorithm)
                 return True, "Signed certificate is valid and correctly signed by CA certificate."
             except crypto.Error as e:
-                return False, "Certificate is incorrectly signed."
+                return False, "Certificate is incorrectly signed: %s" % str(e)
         except Exception as e:
             return False, "Certificate is not valid for an unknown reason. %s" % str(e)
 

src/saml2/client_base.py

@@ -54,8 +54,6 @@
 from saml2.samlp import NameIDMappingRequest
 from saml2.samlp import RequestedAuthnContext
 from saml2.soap import make_soap_enveloped_saml_thingy
-from saml2.xmldsig import DIGEST_ALLOWED_ALG
-from saml2.xmldsig import SIG_ALLOWED_ALG
 
 
 logger = logging.getLogger(__name__)
@@ -445,7 +443,7 @@ def create_authn_request(
             args.update(_args)
         args.pop("id", None)
 
-        client_crt = kwargs.get("client_crt")
+        # client_crt = kwargs.get("client_crt")
         nsprefix = kwargs.get("nsprefix")
 
         msg = self._message(
@@ -797,12 +795,12 @@ def parse_authn_request_response(self, xmlstr, binding, outstanding=None, outsta
         try:
             resp = self._parse_response(xmlstr, AuthnResponse, "assertion_consumer_service", binding, **kwargs)
         except StatusError as err:
-            logger.error("SAML status error: %s", err)
+            logger.error("SAML status error: %s", str(err))
             raise
         except UnravelError:
             return None
         except Exception as err:
-            logger.error("XML parse error: %s", err)
+            logger.error("XML parse error: %s", str(err))
             raise
 
         if not isinstance(resp, AuthnResponse):

src/saml2/cryptography/asymmetric.py

@@ -26,7 +26,7 @@ def key_verify(rsakey, signature, message, digest):
 
     try:
         rsakey.verify(signature, message, padding, digest)
-    except Exception as e:
+    except Exception:
         return False
     else:
         return True

src/saml2/ecp.py

@@ -200,4 +200,4 @@ def ecp_response(self):
 
         soap_envelope = soapenv.Envelope(header=header, body=body)
 
-        return "%s" % soap_envelope
+        return str(soap_envelope)

src/saml2/ecp_client.py

@@ -298,7 +298,7 @@ def operation(self, url, idp_entity_id, op, **opargs):
 
         opargs["headers"] = self.add_paos_headers(opargs["headers"])
         response = self.send(sp_url, op, **opargs)
-        logger.debug("[Op] SP response: %s" % response)
+        logger.debug("[Op] SP response", extra={"response": response})
         print(response.text)
 
         if response.status_code != 200:

src/saml2/entity.py

@@ -215,7 +215,7 @@ def reload_metadata(self, metadata_conf):
         try:
             self.metadata.reload(metadata_conf)
         except Exception as ex:
-            logger.error("Loading metadata failed", exc_info=ex)
+            logger.error("Loading metadata failed; reason: %s" % str(ex))
             return False
 
         self.sourceid = self.metadata.construct_source_id()
@@ -884,7 +884,7 @@ def _response(
                 if encrypt_assertion_self_contained:
                     try:
                         assertion_tag = response.assertion._to_element_tree().tag
-                    except:
+                    except Exception:
                         assertion_tag = response.assertion[0]._to_element_tree().tag
                     response = pre_encrypt_assertion(response)
                     response = response.get_xml_string_with_self_contained_assertion_within_encrypted_assertion(
@@ -995,7 +995,7 @@ def _parse_request(
         :return: A request instance
         """
 
-        _log_info = logger.info
+        # _log_info = logger.info
         _log_debug = logger.debug
 
         # The addresses I should receive messages like this on
@@ -1430,7 +1430,7 @@ def _parse_response(
         try:
             response = response_cls(self.sec, **kwargs)
         except Exception as exc:
-            logger.info("%s", exc)
+            logger.info(str(exc))
             raise
 
         xmlstr = self.unravel(xmlstr, binding, response_cls.msgtype)
@@ -1449,7 +1449,7 @@ def _parse_response(
             response = response.loads(xmlstr, False, origxml=xmlstr)
         except SigverError as err:
             if require_response_signature:
-                logger.error("Signature Error: %s", err)
+                logger.error("Signature Error: %s", str(err))
                 raise
             else:
                 # The response is not signed but a signature is not required
@@ -1501,7 +1501,7 @@ def _parse_response(
             response.verify(keys)
         except SignatureError as err:
             if require_signature:
-                logger.error("Signature Error: %s", err)
+                logger.error("Signature Error: %s", str(err))
                 raise
             else:
                 response.require_signature = require_signature

src/saml2/httpbase.py

@@ -5,15 +5,13 @@
 import time
 
 import requests
-import six
 from six.moves import http_cookiejar
 from six.moves.http_cookies import SimpleCookie
 from six.moves.urllib.parse import urlencode
 from six.moves.urllib.parse import urlparse
 
 from saml2 import SAMLError
 from saml2 import class_name
-from saml2.pack import http_post_message
 from saml2.pack import make_soap_enveloped_saml_thingy
 from saml2.time_util import utc_now
 
@@ -321,7 +319,7 @@ def send_using_soap(self, request, destination, headers=None, sign=False):
             args["headers"] = dict(args["headers"])
             response = self.send(**args)
         except Exception as exc:
-            logger.info("HTTPClient exception: %s", exc)
+            logger.info("HTTPClient exception: %s", str(exc))
             raise
 
         if response.status_code == 200:

src/saml2/httputil.py

@@ -167,6 +167,7 @@ class HttpParameters(object):
     signature = None
     sigalg = None
     # Relaystate and SAML message are stored elsewhere
+
     def __init__(self, dict):
         try:
             self.signature = dict["Signature"][0]

src/saml2/ident.py

@@ -68,7 +68,7 @@ def decode(txt):
             i, val = part.split("=")
             try:
                 setattr(_nid, ATTR[int(i)], unquote(val))
-            except:
+            except Exception:
                 pass
     return _nid
 
@@ -160,7 +160,7 @@ def get_nameid(self, userid, nformat, sp_name_qualifier, name_qualifier):
         if nformat == NAMEID_FORMAT_PERSISTENT:
             nameid = self.match_local_id(userid, sp_name_qualifier, name_qualifier)
             if nameid:
-                logger.debug("Found existing persistent NameId {nid} for user {uid}".format(nid=nameid, uid=userid))
+                logger.debug("Found existing persistent NameId %s for user %s" % (nameid, userid))
                 return nameid
 
         _id = self.create_id(nformat, name_qualifier, sp_name_qualifier)

src/saml2/mdstore.py

@@ -738,7 +738,7 @@ def parse_and_check_signature(self, txt):
         def try_verify_signature(node_name):
             try:
                 self.security.verify_signature(txt, node_name=node_name, cert_file=self.cert)
-            except SignatureError as e:
+            except SignatureError:
                 return False
             else:
                 return True
@@ -798,7 +798,7 @@ def __init__(self, attrc, loader_callable, cert=None, security=None, **kwargs):
 
     @staticmethod
     def get_metadata_loader(func):
-        if hasattr(func, "__call__"):
+        if callable(func):
             return func
 
         i = func.rfind(".")
@@ -813,7 +813,7 @@ def get_metadata_loader(func):
         except AttributeError:
             raise RuntimeError('Module "%s" does not define a "%s" metadata loader' % (module, attr))
 
-        if not hasattr(metadata_loader, "__call__"):
+        if not callable(metadata_loader):
             raise RuntimeError("Metadata loader %s.%s must be callable" % (module, attr))
 
         return metadata_loader
@@ -957,7 +957,7 @@ def _fetch_metadata(self, item):
 
         _txt = response.content
         if not self.parse_and_check_signature(_txt):
-            error_msg = "Fething {item}: invalid signature".format(item=item, status=response.status_code)
+            error_msg = "Fething {item}: invalid signature".format(item=item)
             logger.info(error_msg)
             raise KeyError(error_msg)
 
@@ -974,7 +974,7 @@ def __getitem__(self, item):
         elif not self._is_metadata_fresh(item):
             msg = "Metadata for {} have expired; refreshing metadata".format(item)
             logger.info(msg)
-            old_entity = self.entity.pop(item)
+            _ = self.entity.pop(item)
             entity = self._fetch_metadata(item)
         else:
             entity = self.entity[item]

src/saml2/metadata.py

@@ -373,7 +373,7 @@ def _do_nameid_format(cls, conf, typ):
         name_id_format = [name_id_format]
 
     formats = [md.NameIDFormat(text=format) for format in name_id_format]
-    setattr(cls, "name_id_format", formats)
+    cls.name_id_format = formats
 
 
 def do_endpoints(conf, endpoints):

src/saml2/mongo_store.py

@@ -267,7 +267,7 @@ def _mdb_get_database(uri, **kwargs):
     :params database: name as string or (uri, name)
     :returns: pymongo database object
     """
-    if not "tz_aware" in kwargs:
+    if "tz_aware" not in kwargs:
         # default, but not forced
         kwargs["tz_aware"] = True
 

src/saml2/pack.py

@@ -12,7 +12,7 @@
 
 try:
     import html
-except:
+except Exception:
     import cgi as html
 
 import logging