diff --git a/idptest/scripts/c14n.py b/idptest/scripts/c14n.py index 9d8a765..3584899 100755 --- a/idptest/scripts/c14n.py +++ b/idptest/scripts/c14n.py @@ -1,7 +1,8 @@ #!/usr/bin/python from __future__ import absolute_import, division, print_function, unicode_literals +from io import StringIO + -from django.utils.six import StringIO from lxml import etree diff --git a/idptest/tests/test_signing.py b/idptest/tests/test_signing.py index e10676c..575f8cf 100644 --- a/idptest/tests/test_signing.py +++ b/idptest/tests/test_signing.py @@ -5,7 +5,7 @@ import string import unittest -from django.utils.six import text_type + from saml2idp import xml_render from saml2idp import xml_signing from saml2idp import saml2idp_metadata as smd @@ -149,10 +149,10 @@ def test_loading_private_key(): filename = os.path.join(os.getcwd(), 'keys/sample/sample-private-key.pem') config = {smd.PRIVATE_KEY_FILENAME: filename} - assert type(filename) is text_type + assert type(filename) is str xml_signing.load_private_key(config) - filename = text_type(filename) + filename = str(filename) config = {smd.PRIVATE_KEY_FILENAME: filename} xml_signing.load_private_key(config) @@ -172,10 +172,10 @@ def test_loading_certificate_from_file(): filename = os.path.join(os.getcwd(), 'keys/sample/sample-certificate.pem') config = {smd.CERTIFICATE_FILENAME: filename} - assert type(filename) is text_type + assert type(filename) is str xml_signing.load_certificate(config) - filename = text_type(filename) + filename = str(filename) config = {smd.CERTIFICATE_FILENAME: filename} certificate = xml_signing.load_certificate(config) diff --git a/saml2idp/base.py b/saml2idp/base.py index e8f7cfd..412044c 100644 --- a/saml2idp/base.py +++ b/saml2idp/base.py @@ -8,11 +8,11 @@ from bs4 import BeautifulSoup from django.core.exceptions import ImproperlyConfigured -from . import codex -from . import exceptions -from . import saml2idp_metadata -from . import xml_render -from .logging import get_saml_logger +from saml2idp import codex +from saml2idp import exceptions +from saml2idp import saml2idp_metadata +from saml2idp import xml_render +from saml2idp.logging import get_saml_logger MINUTES = 60 HOURS = 60 * MINUTES diff --git a/saml2idp/demo.py b/saml2idp/demo.py index 9320ce3..3e07c8c 100644 --- a/saml2idp/demo.py +++ b/saml2idp/demo.py @@ -1,8 +1,8 @@ from __future__ import absolute_import, division, print_function, unicode_literals -from . import base -from . import exceptions -from . import xml_render +from saml2idp import base +from saml2idp import exceptions +from saml2idp import xml_render class Processor(base.Processor): """ diff --git a/saml2idp/google_apps.py b/saml2idp/google_apps.py index d907a0a..a15cd09 100644 --- a/saml2idp/google_apps.py +++ b/saml2idp/google_apps.py @@ -1,9 +1,11 @@ from __future__ import absolute_import, division, print_function, unicode_literals -from . import base -from . import codex -from . import exceptions -from . import xml_render + +from saml2idp import base +from saml2idp import codex +from saml2idp import exceptions +from saml2idp import xml_render + class Processor(base.Processor): """ diff --git a/saml2idp/metadata.py b/saml2idp/metadata.py index 3074401..4c73b3c 100644 --- a/saml2idp/metadata.py +++ b/saml2idp/metadata.py @@ -3,10 +3,14 @@ """ from __future__ import absolute_import, division, print_function, unicode_literals + # Django imports from django.core.exceptions import ImproperlyConfigured + + # Local imports -from .saml2idp_metadata import SAML2IDP_CONFIG, SAML2IDP_REMOTES +from saml2idp.saml2idp_metadata import SAML2IDP_CONFIG, SAML2IDP_REMOTES + def get_config_for_acs(acs_url): """ diff --git a/saml2idp/registry.py b/saml2idp/registry.py index e5ebb0d..18da37e 100644 --- a/saml2idp/registry.py +++ b/saml2idp/registry.py @@ -10,9 +10,9 @@ from django.core.exceptions import ImproperlyConfigured -from . import exceptions -from . import saml2idp_metadata -from .logging import get_saml_logger +from saml2idp import exceptions +from saml2idp import saml2idp_metadata +from saml2idp.logging import get_saml_logger logger = get_saml_logger() diff --git a/saml2idp/salesforce.py b/saml2idp/salesforce.py index 62819f2..3ed8462 100644 --- a/saml2idp/salesforce.py +++ b/saml2idp/salesforce.py @@ -1,8 +1,10 @@ from __future__ import absolute_import, division, print_function, unicode_literals -from . import base -from . import exceptions -from . import xml_render + +from saml2idp import base +from saml2idp import exceptions +from saml2idp import xml_render + class Processor(base.Processor): """ diff --git a/saml2idp/saml2idp_metadata.py b/saml2idp/saml2idp_metadata.py index d47faf7..ca7bac2 100644 --- a/saml2idp/saml2idp_metadata.py +++ b/saml2idp/saml2idp_metadata.py @@ -5,9 +5,11 @@ """ from __future__ import absolute_import, division, print_function, unicode_literals + from django.conf import settings from django.core.exceptions import ImproperlyConfigured + CERTIFICATE_DATA = 'certificate_data' CERTIFICATE_FILENAME = 'certificate_file' PRIVATE_KEY_DATA = 'private_key_data' diff --git a/saml2idp/shib.py b/saml2idp/shib.py index 1369056..3dad8b3 100644 --- a/saml2idp/shib.py +++ b/saml2idp/shib.py @@ -1,11 +1,12 @@ from __future__ import absolute_import, division, print_function, unicode_literals - -from . import base -from . import xml_render import zlib import base64 +from saml2idp import base +from saml2idp import xml_render + + class Processor(base.Processor): """ Shib-specific Processor diff --git a/saml2idp/urls.py b/saml2idp/urls.py index e6bd6d4..7791557 100644 --- a/saml2idp/urls.py +++ b/saml2idp/urls.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, division, print_function, unicode_literals from django.conf.urls import url -from .views import descriptor, login_begin, login_init, login_process, logout -from .metadata import get_deeplink_resources +from saml2idp.views import descriptor, login_begin, login_init, login_process, logout +from saml2idp.metadata import get_deeplink_resources + def deeplink_url_patterns( url_base_pattern=r'^init/%s/$', diff --git a/saml2idp/views.py b/saml2idp/views.py index e2a9b76..d68715d 100644 --- a/saml2idp/views.py +++ b/saml2idp/views.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, division, print_function, unicode_literals - import os + from django.contrib import auth from django.core.validators import URLValidator from django.contrib.auth.decorators import login_required @@ -16,12 +16,14 @@ from django.http import HttpResponseBadRequest, HttpResponseRedirect from django.views.decorators.csrf import csrf_exempt -from . import saml2idp_metadata -from . import exceptions -from . import metadata -from . import registry -from . import xml_signing -from .logging import get_saml_logger + +from saml2idp import saml2idp_metadata +from saml2idp import exceptions +from saml2idp import metadata +from saml2idp import registry +from saml2idp import xml_signing +from saml2idp.logging import get_saml_logger + logger = get_saml_logger() diff --git a/saml2idp/xml_render.py b/saml2idp/xml_render.py index 6503a7e..f42ec2f 100644 --- a/saml2idp/xml_render.py +++ b/saml2idp/xml_render.py @@ -4,17 +4,19 @@ """ from __future__ import absolute_import, division, print_function, unicode_literals + import string -from .xml_signing import get_signature_xml -from .xml_templates import (ATTRIBUTE, + +from saml2idp.xml_signing import get_signature_xml +from saml2idp.xml_templates import (ATTRIBUTE, ATTRIBUTE_STATEMENT, ASSERTION_GOOGLE_APPS, ASSERTION_SALESFORCE, RESPONSE, SUBJECT) -from .logging import get_saml_logger +from saml2idp.logging import get_saml_logger logger = get_saml_logger() diff --git a/saml2idp/xml_signing.py b/saml2idp/xml_signing.py index 2e23dd7..46262a1 100644 --- a/saml2idp/xml_signing.py +++ b/saml2idp/xml_signing.py @@ -10,10 +10,10 @@ import OpenSSL.crypto -from . import saml2idp_metadata as smd -from .codex import nice64 -from .xml_templates import SIGNED_INFO, SIGNATURE -from .logging import get_saml_logger +from saml2idp import saml2idp_metadata as smd +from saml2idp.codex import nice64 +from saml2idp.xml_templates import SIGNED_INFO, SIGNATURE +from saml2idp.logging import get_saml_logger logger = get_saml_logger() @@ -71,7 +71,7 @@ def get_signature_xml(subject, reference_uri): logger.debug('Subject: %s' % (subject,)) # Hash the subject. - if isinstance(subject, six.text_type): + if isinstance(subject, str): subject = subject.encode() subject_hash = hashlib.sha1() diff --git a/saml2idp/xml_templates.py b/saml2idp/xml_templates.py index 2548103..df18afc 100644 --- a/saml2idp/xml_templates.py +++ b/saml2idp/xml_templates.py @@ -18,6 +18,7 @@ """ from __future__ import absolute_import, division, print_function, unicode_literals + SIGNED_INFO = ( '' ''