Merge ~quantifics/django-saml2-idp/+git/stable:master into ~ubuntuone-pqm-team/django-saml2-idp/+git/stable:master

[John Paraskevopoulos]

Replace six.b with six.ensure_binary

- Replaces six.b with six.ensure_binary because six.b tries to encode to
latin instead of utf-8. So this was causing some failures in SSO in test
cases where we used utf-8 values
- Adds forgotten `ensure_str`

[Wouter van Bommel (woutervb)]

lgtm

review: Approve

diff --git a/idptest/saml2idp/base.py b/idptest/saml2idp/base.py
index 4e2c7c7..5b51191 100644
--- a/idptest/saml2idp/base.py
+++ b/idptest/saml2idp/base.py
@@ -9,7 +9,7 @@ from bs4 import BeautifulSoup
 from django.core.exceptions import ImproperlyConfigured
 # local app imports:
 from saml2idp import codex
-from six import b, ensure_str
+from six import ensure_binary, ensure_str
 from saml2idp import exceptions
 from saml2idp import saml2idp_metadata
 from saml2idp import xml_render
@@ -83,7 +83,11 @@ class Processor(object):
         """
         Decodes _request_xml from _saml_request.
         """
-        self._request_xml = ensure_str(base64.b64decode(b(self._saml_request)))
+        self._request_xml = ensure_str(
+            base64.b64decode(
+                ensure_binary(self._saml_request)
+            )
+        )
 
     def _determine_assertion_id(self):
         """
@@ -118,7 +122,11 @@ class Processor(object):
         """
         Encodes _response_xml to _encoded_xml.
         """
-        self._saml_response = ensure_str(codex.nice64(b(self._response_xml)))
+        self._saml_response = ensure_str(
+            codex.nice64(
+                ensure_binary(self._response_xml)
+            )
+        )
 
     def _extract_saml_request(self):
         """
diff --git a/idptest/saml2idp/codex.py b/idptest/saml2idp/codex.py
index 1fe80f3..effec3d 100644
--- a/idptest/saml2idp/codex.py
+++ b/idptest/saml2idp/codex.py
@@ -4,18 +4,20 @@ from __future__ import absolute_import
 import zlib
 import base64
 import sys
-from six import b, ensure_str
+from six import ensure_binary, ensure_str
 
 
 def decode_base64_and_inflate(b64string):
-    decoded_data = base64.b64decode(b(b64string))
+    decoded_data = base64.b64decode(ensure_binary(b64string))
     return ensure_str(zlib.decompress(decoded_data, -15))
 
+
 def deflate_and_base64_encode(string_val):
-    zlibbed_str = zlib.compress(b(string_val))
+    zlibbed_str = zlib.compress(ensure_binary(string_val))
     compressed_string = zlibbed_str[2:-4]
     return ensure_str(base64.b64encode(compressed_string))
 
+
 def nice64(src):
     """ Returns src base64-encoded and formatted nicely for our XML. """
-    return base64.b64encode(src).replace(b('\n'), b(''))
+    return base64.b64encode(src).replace(ensure_binary('\n'), ensure_binary(''))
diff --git a/idptest/saml2idp/tests/test_salesforce.py b/idptest/saml2idp/tests/test_salesforce.py
index 65c3ebe..199f146 100644
--- a/idptest/saml2idp/tests/test_salesforce.py
+++ b/idptest/saml2idp/tests/test_salesforce.py
@@ -6,14 +6,14 @@ from __future__ import absolute_import
 import base64
 # local imports:
 from saml2idp.tests import base
-from six import ensure_str, b
+from six import ensure_str, ensure_binary
 
 SALESFORCE_ACS = 'https://login.salesforce.com'
 
 
 def get_saml_request(acs_url=SALESFORCE_ACS):
     return ensure_str(base64.b64encode(
-        b(
+        ensure_binary(
             '<?xml version="1.0" encoding="UTF-8"?>'
             '<samlp:AuthnRequest '
             'AssertionConsumerServiceURL="{ACS_URL}" '
diff --git a/idptest/saml2idp/tests/test_signing.py b/idptest/saml2idp/tests/test_signing.py
index 7b9335b..8a3c633 100644
--- a/idptest/saml2idp/tests/test_signing.py
+++ b/idptest/saml2idp/tests/test_signing.py
@@ -19,7 +19,7 @@ from saml2idp.xml_templates import (
     ASSERTION_SALESFORCE,
     RESPONSE,
 )
-from six import b, ensure_str
+from six import ensure_binary, ensure_str
 from django.conf import settings
 
 import sys
@@ -123,9 +123,9 @@ class XmlTest(unittest.TestCase):
         default_cert = settings.SAML2IDP_CONFIG['certificate_file']
         with open(default_cert, "rb") as cert:
             self.default_certificate_flat = ensure_str(cert.read().replace(
-                b("-----BEGIN CERTIFICATE-----"), b("")).replace(
-                b("-----END CERTIFICATE-----"), b("")).replace(
-                b("\n"), b("")))
+                b"-----BEGIN CERTIFICATE-----", b"").replace(
+                b"-----END CERTIFICATE-----", b"").replace(
+                b"\n", b""))
 
     def _test(self, got, exp):
         # TODO: Maybe provide more meaningful output. YAGNI?
diff --git a/idptest/saml2idp/xml_signing.py b/idptest/saml2idp/xml_signing.py
index ba4eb54..bf0821a 100644
--- a/idptest/saml2idp/xml_signing.py
+++ b/idptest/saml2idp/xml_signing.py
@@ -12,14 +12,16 @@ from OpenSSL import crypto
 from cryptography.hazmat.primitives.serialization import Encoding
 # this app:
 from saml2idp import saml2idp_metadata
-from six import b, ensure_str
+from six import ensure_binary, ensure_str
 from saml2idp.codex import nice64
 from saml2idp.xml_templates import SIGNED_INFO, SIGNATURE
 
+
 def load_cert_data(certificate_file):
     """Backward-compatible alias for load_cert_data_from_file."""
     return load_cert_data_from_file(certificate_file)
 
+
 def load_cert_data_from_file(certificate_file):
     """
     Returns the certificate data out of the certificate_file.
@@ -29,15 +31,23 @@ def load_cert_data_from_file(certificate_file):
 
     return cert_data
 
+
 def load_cert_data_from_string(certificate):
     """
     Returns the certificate data out of the certificate string.
     """
-    cert = crypto.load_certificate(crypto.FILETYPE_PEM, certificate).to_cryptography()
-    cert_data = ''.join(ensure_str(cert.public_bytes(Encoding.PEM)).split('\n')[1:-2])
+    cert = crypto.load_certificate(
+        crypto.FILETYPE_PEM, certificate
+    ).to_cryptography()
+    cert_data = ''.join(
+        ensure_str(
+            cert.public_bytes(Encoding.PEM)
+        ).split('\n')[1:-2]
+    )
 
     return cert_data
 
+
 def get_signature_xml(
         subject, reference_uri, certificate=None, signing_algorithm=None):
     """
@@ -59,9 +69,9 @@ def get_signature_xml(
     logging.debug('get_signature_xml - Begin.')
     logging.debug('Using private key file: ' + private_key_file)
     if certificate:
-        logging.debug('Using certificate data: ' + certificate)
+        logging.debug('Using certificate data: ' + ensure_str(certificate))
     else:
-        logging.debug('Using certificate file: ' + certificate_file)
+        logging.debug('Using certificate file: ' + ensure_str(certificate_file))
     logging.debug('Subject: ' + subject)
 
     algorithms = {
@@ -86,7 +96,7 @@ def get_signature_xml(
 
     # Hash the subject.
     subject_hash = hash_method()
-    subject_hash.update(b(subject))
+    subject_hash.update(ensure_binary(subject))
     subject_digest = nice64(subject_hash.digest())
     logging.debug('Subject digest: ' + ensure_str(subject_digest))
 
@@ -103,12 +113,22 @@ def get_signature_xml(
     # RSA-sign the signed_info.
     with open(private_key_file, "r") as prkf:
         if algo_key == "sha1":
-            private_key = crypto.load_privatekey(crypto.FILETYPE_PEM, prkf.read())
+            private_key = crypto.load_privatekey(
+                crypto.FILETYPE_PEM, prkf.read()
+            )
         else:
-            private_key = crypto.load_privatekey(crypto.FILETYPE_PEM, prkf.read(), passphrase_callback)
-
-
-    rsa_signature = nice64(crypto.sign(private_key, signed_info, digest=algo_key))
+            private_key = crypto.load_privatekey(
+                crypto.FILETYPE_PEM, prkf.read(),
+                passphrase_callback
+            )
+
+    rsa_signature = nice64(
+        crypto.sign(
+            private_key,
+            signed_info,
+            digest=algo_key
+        )
+    )
     logging.debug('RSA Signature: ' + ensure_str(rsa_signature))
 
     # Load the certificate.
@@ -117,7 +137,9 @@ def get_signature_xml(
     else:
         cert_data = load_cert_data_from_file(certificate_file)
     # Put the signed_info and rsa_signature into the XML signature.
-    signed_info_short = signed_info.replace(' xmlns:ds="http://www.w3.org/2000/09/xmldsig#"', '')
+    signed_info_short = signed_info.replace(
+        ' xmlns:ds="http://www.w3.org/2000/09/xmldsig#"', ''
+    )
     signature_xml = string.Template(SIGNATURE).substitute({
         'RSA_SIGNATURE': ensure_str(rsa_signature),
         'SIGNED_INFO': signed_info_short,
diff --git a/setup.py b/setup.py
index c879a8c..4dc8719 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name = 'saml2idp',
-    version = '1.1',
+    version = '1.2',
     author = 'John Samuel Anderson',
     author_email = '[e-mail]',
     description = 'SAML 2.0 IdP for Django',