Merge pull request #559 from erakli/replace_mime_paos_literals

Replace string literals with MIME_PAOS

Author: c00kiemon5ter

example/sp-wsgi/sp.py

@@ -9,6 +9,8 @@
 import re
 import sys
 import xml.dom.minidom
+
+from saml2.client_base import MIME_PAOS
 from saml2.sigver import SignatureError
 
 import six
@@ -470,7 +472,7 @@ def _pick_idp(self, came_from):
         logger.debug("[_pick_idp] %s", self.environ)
         if "HTTP_PAOS" in self.environ:
             if self.environ["HTTP_PAOS"] == PAOS_HEADER_INFO:
-                if 'application/vnd.paos+xml' in self.environ["HTTP_ACCEPT"]:
+                if MIME_PAOS in self.environ["HTTP_ACCEPT"]:
                     # Where should I redirect the user to
                     # entityid -> the IdP to use
                     # relay_state -> when back from authentication

src/saml2/ecp.py

@@ -6,7 +6,7 @@
 Contains classes used in the SAML ECP profile
 """
 import logging
-from saml2.client_base import ACTOR
+from saml2.client_base import ACTOR, MIME_PAOS
 from saml2.ecp_client import SERVICE
 
 from saml2 import element_to_extension_element
@@ -30,7 +30,7 @@
 
 
 def ecp_capable(headers):
-    if "application/vnd.paos+xml" in headers["Accept"]:
+    if MIME_PAOS in headers["Accept"]:
         if "PAOS" in headers:
             if 'ver="%s";"%s"' % (paos.NAMESPACE,
                                   SERVICE) in headers["PAOS"]:

src/saml2/s2repoze/plugins/sp.py

@@ -27,7 +27,7 @@
 from paste.request import construct_url
 from saml2.extension.pefim import SPCertEnc
 from saml2.httputil import getpath, SeeOther
-from saml2.client_base import ECP_SERVICE
+from saml2.client_base import ECP_SERVICE, MIME_PAOS
 from zope.interface import implementer
 
 from repoze.who.interfaces import IChallenger, IIdentifier, IAuthenticator
@@ -179,7 +179,7 @@ def _pick_idp(self, environ, came_from):
         logger.info("[_pick_idp] %s", environ)
         if "HTTP_PAOS" in environ:
             if environ["HTTP_PAOS"] == PAOS_HEADER_INFO:
-                if 'application/vnd.paos+xml' in environ["HTTP_ACCEPT"]:
+                if MIME_PAOS in environ["HTTP_ACCEPT"]:
                     # Where should I redirect the user to
                     # entityid -> the IdP to use
                     # relay_state -> when back from authentication