diff --git a/Makefile b/Makefile index 31efe284..93e787cb 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,9 @@ PYTEST=pytest COVERAGE=coverage COVERAGE_CONFIG=tests/coverage.rc COVERALLS=coveralls -MAIN_SOURCE=src/onelogin/saml2 +MAIN_SOURCE=src/python3_saml/saml2 DEMOS=demo-django demo-flask demo-tornado demo_pyramid -TESTS=tests/src/OneLogin/saml2_tests +TESTS=tests/src/Python3Saml/saml2_tests SOURCES=$(MAIN_SOURCE) $(DEMOS) $(TESTS) install-req: diff --git a/README.md b/README.md index ff71357f..95b9132b 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ The toolkit is hosted on GitHub. You can download it from: * Latest release: https://github.com/saml-toolkits/python3-saml/releases/latest * Master repo: https://github.com/saml-toolkits/python3-saml/tree/master -Find the core of the library at ``src/onelogin/saml2`` folder. +Find the core of the library at ``src/python3_saml/saml2`` folder. #### Option 2. Download from pypi #### @@ -165,7 +165,7 @@ In order to avoid them, the SP can keep a list of SAML Messages or Assertion IDs to be stored the amount of time of the SAML Message life time, so we don't need to store all processed message/assertion Ids, but the most recent ones. -The OneLogin_Saml2_Auth class contains the [get_last_request_id](https://github.com/onelogin/python3-saml/blob/ab62b0d6f3e5ac2ae8e95ce3ed2f85389252a32d/src/onelogin/saml2/auth.py#L357), [get_last_message_id](https://github.com/onelogin/python3-saml/blob/ab62b0d6f3e5ac2ae8e95ce3ed2f85389252a32d/src/onelogin/saml2/auth.py#L364) and [get_last_assertion_id](https://github.com/onelogin/python3-saml/blob/ab62b0d6f3e5ac2ae8e95ce3ed2f85389252a32d/src/onelogin/saml2/auth.py#L371) methods to retrieve the IDs +The OneLogin_Saml2_Auth class contains the `get_last_request_id`, `get_last_message_id` and `get_last_assertion_id` methods to retrieve the IDs Checking that the ID of the current Message/Assertion does not exists in the list of the ones already processed will prevent replay attacks. @@ -181,7 +181,7 @@ Let's start describing them: #### src #### -This folder contains the heart of the toolkit, **onelogin/saml2** folder contains the new version of +This folder contains the heart of the toolkit, **python3_saml/saml2** folder contains the new version of the classes and methods that are described in a later section. #### demo-django #### @@ -240,12 +240,12 @@ make pytest ``` The previous line will run the tests for the whole toolkit. You can also run the tests for a specific module. To do so for the auth module you would have to execute this: ``` -pytest tests/src/OneLogin/saml2_tests/auth_test.py::OneLogin_Saml2_Auth_Test +pytest tests/src/Python3Saml/saml2_tests/auth_test.py::Python3Saml_Saml2_Auth_Test ``` Or for an specific method: ``` -pytest tests/src/OneLogin/saml2_tests/auth_test.py::OneLogin_Saml2_Auth_Test::testBuildRequestSignature +pytest tests/src/Python3Saml/saml2_tests/auth_test.py::Python3Saml_Saml2_Auth_Test::testBuildRequestSignature ``` @@ -325,7 +325,7 @@ This is the ``settings.json`` file: }, // Specifies the constraints on the name identifier to be used to // represent the requested subject. - // Take a look on src/onelogin/saml2/constants.py to see the NameIdFormat that are supported. + // Take a look on src/python3_saml/saml2/constants.py to see the NameIdFormat that are supported. "NameIDFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", // Usually X.509 cert and privateKey of the SP are provided by files placed at // the certs folder. But we can also provide them with the following parameters @@ -609,9 +609,9 @@ In order to use the toolkit library you need to import the file that contains th on the top of your python file. ``` python -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils ``` #### The Request #### @@ -678,7 +678,7 @@ An explanation of some advanced request parameters: In order to send an ``AuthNRequest`` to the IdP: ```python -from onelogin.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.auth import OneLogin_Saml2_Auth req = prepare_request_for_toolkit(request) auth = OneLogin_Saml2_Auth(req) # Constructor of the SP, loads settings.json diff --git a/changelog.md b/changelog.md index 10a066f0..bfbfd222 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,7 @@ # python3-saml changelog +### 2.0.0 (Oct 29, 2025) +- Move namespace from onelogin to python3_saml to avoid conflicts with onelogin + ### 1.16.0 (Oct 9, 2023) - [#364](https://github.com/SAML-Toolkits/python3-saml/commit/d1bfaeb17a786735827b8252b91deafde29dabd8) Improve get_metadata method from Parser, allowing to set headers - Fix WantAuthnRequestsSigned parser diff --git a/demo-django/demo/views.py b/demo-django/demo/views.py index 82ae55eb..1c4ee015 100644 --- a/demo-django/demo/views.py +++ b/demo-django/demo/views.py @@ -3,9 +3,9 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError from django.shortcuts import render -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils def init_saml_auth(req): diff --git a/demo-flask/index.py b/demo-flask/index.py index a03eeccd..790ff299 100644 --- a/demo-flask/index.py +++ b/demo-flask/index.py @@ -2,8 +2,8 @@ from flask import Flask, request, render_template, redirect, session, make_response -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.utils import OneLogin_Saml2_Utils app = Flask(__name__) diff --git a/demo-tornado/views.py b/demo-tornado/views.py index 677cf3a8..84ee6db6 100644 --- a/demo-tornado/views.py +++ b/demo-tornado/views.py @@ -4,8 +4,8 @@ import tornado.httpserver import tornado.httputil -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.utils import OneLogin_Saml2_Utils # Global session info session = {} diff --git a/demo_pyramid/demo_pyramid/views.py b/demo_pyramid/demo_pyramid/views.py index 98852671..5f79ef02 100644 --- a/demo_pyramid/demo_pyramid/views.py +++ b/demo_pyramid/demo_pyramid/views.py @@ -7,8 +7,8 @@ ) from pyramid.view import view_config -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.utils import OneLogin_Saml2_Utils SAML_PATH = os.path.join(os.path.dirname(__file__), "saml") diff --git a/pyproject.toml b/pyproject.toml index eee84f5b..239218b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ lint = [ package-dir = {"" = "src"} [tool.setuptools.package-data] -"onelogin.saml2.schemas" = ["*.xsd"] +"python3_saml.saml2.schemas" = ["*.xsd"] [tool.pytest.ini_options] minversion = "4.6.11" @@ -99,7 +99,7 @@ branch = true [tool.coverage.paths] source = [ - "src/onelogin/saml2" + "src/python3_saml/saml2" ] [tool.coverage.report] diff --git a/src/onelogin/__init__.py b/src/python3_saml/__init__.py similarity index 100% rename from src/onelogin/__init__.py rename to src/python3_saml/__init__.py diff --git a/src/onelogin/saml2/__init__.py b/src/python3_saml/saml2/__init__.py similarity index 100% rename from src/onelogin/saml2/__init__.py rename to src/python3_saml/saml2/__init__.py diff --git a/src/onelogin/saml2/auth.py b/src/python3_saml/saml2/auth.py similarity index 97% rename from src/onelogin/saml2/auth.py rename to src/python3_saml/saml2/auth.py index a55f7f8e..37155ac2 100644 --- a/src/onelogin/saml2/auth.py +++ b/src/python3_saml/saml2/auth.py @@ -11,15 +11,15 @@ import xmlsec -from onelogin.saml2 import compat -from onelogin.saml2.authn_request import OneLogin_Saml2_Authn_Request -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.logout_request import OneLogin_Saml2_Logout_Request -from onelogin.saml2.logout_response import OneLogin_Saml2_Logout_Response -from onelogin.saml2.response import OneLogin_Saml2_Response -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError -from onelogin.saml2.xmlparser import tostring +from python3_saml.saml2 import compat +from python3_saml.saml2.authn_request import OneLogin_Saml2_Authn_Request +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.logout_request import OneLogin_Saml2_Logout_Request +from python3_saml.saml2.logout_response import OneLogin_Saml2_Logout_Response +from python3_saml.saml2.response import OneLogin_Saml2_Response +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError +from python3_saml.saml2.xmlparser import tostring class OneLogin_Saml2_Auth(object): diff --git a/src/onelogin/saml2/authn_request.py b/src/python3_saml/saml2/authn_request.py similarity index 97% rename from src/onelogin/saml2/authn_request.py rename to src/python3_saml/saml2/authn_request.py index 42585e8b..37caf640 100644 --- a/src/onelogin/saml2/authn_request.py +++ b/src/python3_saml/saml2/authn_request.py @@ -7,9 +7,9 @@ """ -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xml_templates import OneLogin_Saml2_Templates +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xml_templates import OneLogin_Saml2_Templates class OneLogin_Saml2_Authn_Request(object): diff --git a/src/onelogin/saml2/compat.py b/src/python3_saml/saml2/compat.py similarity index 100% rename from src/onelogin/saml2/compat.py rename to src/python3_saml/saml2/compat.py diff --git a/src/onelogin/saml2/constants.py b/src/python3_saml/saml2/constants.py similarity index 100% rename from src/onelogin/saml2/constants.py rename to src/python3_saml/saml2/constants.py diff --git a/src/onelogin/saml2/errors.py b/src/python3_saml/saml2/errors.py similarity index 100% rename from src/onelogin/saml2/errors.py rename to src/python3_saml/saml2/errors.py diff --git a/src/onelogin/saml2/idp_metadata_parser.py b/src/python3_saml/saml2/idp_metadata_parser.py similarity index 98% rename from src/onelogin/saml2/idp_metadata_parser.py rename to src/python3_saml/saml2/idp_metadata_parser.py index b3b3d9be..a0798374 100644 --- a/src/onelogin/saml2/idp_metadata_parser.py +++ b/src/python3_saml/saml2/idp_metadata_parser.py @@ -10,8 +10,8 @@ import ssl -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML class OneLogin_Saml2_IdPMetadataParser(object): diff --git a/src/onelogin/saml2/logout_request.py b/src/python3_saml/saml2/logout_request.py similarity index 97% rename from src/onelogin/saml2/logout_request.py rename to src/python3_saml/saml2/logout_request.py index dea7f806..46d894ad 100644 --- a/src/onelogin/saml2/logout_request.py +++ b/src/python3_saml/saml2/logout_request.py @@ -7,11 +7,11 @@ """ -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError -from onelogin.saml2.xml_templates import OneLogin_Saml2_Templates -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError +from python3_saml.saml2.xml_templates import OneLogin_Saml2_Templates +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML class OneLogin_Saml2_Logout_Request(object): diff --git a/src/onelogin/saml2/logout_response.py b/src/python3_saml/saml2/logout_response.py similarity index 96% rename from src/onelogin/saml2/logout_response.py rename to src/python3_saml/saml2/logout_response.py index 573a4d5d..2af25548 100644 --- a/src/onelogin/saml2/logout_response.py +++ b/src/python3_saml/saml2/logout_response.py @@ -7,11 +7,11 @@ """ -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_ValidationError -from onelogin.saml2.xml_templates import OneLogin_Saml2_Templates -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_ValidationError +from python3_saml.saml2.xml_templates import OneLogin_Saml2_Templates +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML class OneLogin_Saml2_Logout_Response(object): diff --git a/src/onelogin/saml2/metadata.py b/src/python3_saml/saml2/metadata.py similarity index 97% rename from src/onelogin/saml2/metadata.py rename to src/python3_saml/saml2/metadata.py index d6f1d6ae..9bbaaa94 100644 --- a/src/onelogin/saml2/metadata.py +++ b/src/python3_saml/saml2/metadata.py @@ -10,11 +10,11 @@ from time import gmtime, strftime, time from datetime import datetime -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xml_templates import OneLogin_Saml2_Templates -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xml_templates import OneLogin_Saml2_Templates +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML try: basestring diff --git a/src/onelogin/saml2/response.py b/src/python3_saml/saml2/response.py similarity index 99% rename from src/onelogin/saml2/response.py rename to src/python3_saml/saml2/response.py index 5677ad9e..b1a14a14 100644 --- a/src/onelogin/saml2/response.py +++ b/src/python3_saml/saml2/response.py @@ -8,9 +8,9 @@ """ from copy import deepcopy -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError, return_false_on_exception -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError, return_false_on_exception +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML class OneLogin_Saml2_Response(object): diff --git a/src/onelogin/saml2/schemas/saml-schema-assertion-2.0.xsd b/src/python3_saml/saml2/schemas/saml-schema-assertion-2.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/saml-schema-assertion-2.0.xsd rename to src/python3_saml/saml2/schemas/saml-schema-assertion-2.0.xsd diff --git a/src/onelogin/saml2/schemas/saml-schema-authn-context-2.0.xsd b/src/python3_saml/saml2/schemas/saml-schema-authn-context-2.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/saml-schema-authn-context-2.0.xsd rename to src/python3_saml/saml2/schemas/saml-schema-authn-context-2.0.xsd diff --git a/src/onelogin/saml2/schemas/saml-schema-authn-context-types-2.0.xsd b/src/python3_saml/saml2/schemas/saml-schema-authn-context-types-2.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/saml-schema-authn-context-types-2.0.xsd rename to src/python3_saml/saml2/schemas/saml-schema-authn-context-types-2.0.xsd diff --git a/src/onelogin/saml2/schemas/saml-schema-metadata-2.0.xsd b/src/python3_saml/saml2/schemas/saml-schema-metadata-2.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/saml-schema-metadata-2.0.xsd rename to src/python3_saml/saml2/schemas/saml-schema-metadata-2.0.xsd diff --git a/src/onelogin/saml2/schemas/saml-schema-protocol-2.0.xsd b/src/python3_saml/saml2/schemas/saml-schema-protocol-2.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/saml-schema-protocol-2.0.xsd rename to src/python3_saml/saml2/schemas/saml-schema-protocol-2.0.xsd diff --git a/src/onelogin/saml2/schemas/sstc-metadata-attr.xsd b/src/python3_saml/saml2/schemas/sstc-metadata-attr.xsd similarity index 100% rename from src/onelogin/saml2/schemas/sstc-metadata-attr.xsd rename to src/python3_saml/saml2/schemas/sstc-metadata-attr.xsd diff --git a/src/onelogin/saml2/schemas/sstc-saml-attribute-ext.xsd b/src/python3_saml/saml2/schemas/sstc-saml-attribute-ext.xsd similarity index 100% rename from src/onelogin/saml2/schemas/sstc-saml-attribute-ext.xsd rename to src/python3_saml/saml2/schemas/sstc-saml-attribute-ext.xsd diff --git a/src/onelogin/saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd b/src/python3_saml/saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd similarity index 100% rename from src/onelogin/saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd rename to src/python3_saml/saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd diff --git a/src/onelogin/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd b/src/python3_saml/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd similarity index 97% rename from src/onelogin/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd rename to src/python3_saml/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd index de0b754a..a9f718e2 100644 --- a/src/onelogin/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd +++ b/src/python3_saml/saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd @@ -1,89 +1,89 @@ - - - - - - Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0 - Document identifier: sstc-saml-metadata-ui-v1.0.xsd - Location: http://docs.oasis-open.org/security/saml/Post2.0/ - Revision history: - 16 November 2010: - Added Keywords element/type. - 01 November 2010 - Changed filename. - September 2010: - Initial version. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0 + Document identifier: sstc-saml-metadata-ui-v1.0.xsd + Location: http://docs.oasis-open.org/security/saml/Post2.0/ + Revision history: + 16 November 2010: + Added Keywords element/type. + 01 November 2010 + Changed filename. + September 2010: + Initial version. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/onelogin/saml2/schemas/xenc-schema.xsd b/src/python3_saml/saml2/schemas/xenc-schema.xsd similarity index 100% rename from src/onelogin/saml2/schemas/xenc-schema.xsd rename to src/python3_saml/saml2/schemas/xenc-schema.xsd diff --git a/src/onelogin/saml2/schemas/xml.xsd b/src/python3_saml/saml2/schemas/xml.xsd similarity index 100% rename from src/onelogin/saml2/schemas/xml.xsd rename to src/python3_saml/saml2/schemas/xml.xsd diff --git a/src/onelogin/saml2/schemas/xmldsig-core-schema.xsd b/src/python3_saml/saml2/schemas/xmldsig-core-schema.xsd similarity index 100% rename from src/onelogin/saml2/schemas/xmldsig-core-schema.xsd rename to src/python3_saml/saml2/schemas/xmldsig-core-schema.xsd diff --git a/src/onelogin/saml2/settings.py b/src/python3_saml/saml2/settings.py similarity index 98% rename from src/onelogin/saml2/settings.py rename to src/python3_saml/saml2/settings.py index 8a9e46cb..81f746f1 100644 --- a/src/onelogin/saml2/settings.py +++ b/src/python3_saml/saml2/settings.py @@ -12,12 +12,12 @@ import re from os.path import dirname, exists, join, sep -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.errors import OneLogin_Saml2_Error -from onelogin.saml2.metadata import OneLogin_Saml2_Metadata -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.errors import OneLogin_Saml2_Error +from python3_saml.saml2.metadata import OneLogin_Saml2_Metadata +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML try: import ujson as json diff --git a/src/onelogin/saml2/utils.py b/src/python3_saml/saml2/utils.py similarity index 99% rename from src/onelogin/saml2/utils.py rename to src/python3_saml/saml2/utils.py index 40313dd6..567e1a4f 100644 --- a/src/onelogin/saml2/utils.py +++ b/src/python3_saml/saml2/utils.py @@ -21,10 +21,10 @@ import zlib import xmlsec -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.errors import OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.errors import OneLogin_Saml2_Error, OneLogin_Saml2_ValidationError +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML try: diff --git a/src/onelogin/saml2/xml_templates.py b/src/python3_saml/saml2/xml_templates.py similarity index 100% rename from src/onelogin/saml2/xml_templates.py rename to src/python3_saml/saml2/xml_templates.py diff --git a/src/onelogin/saml2/xml_utils.py b/src/python3_saml/saml2/xml_utils.py similarity index 97% rename from src/onelogin/saml2/xml_utils.py rename to src/python3_saml/saml2/xml_utils.py index a3c5dba9..f1fb92d8 100644 --- a/src/onelogin/saml2/xml_utils.py +++ b/src/python3_saml/saml2/xml_utils.py @@ -9,9 +9,9 @@ from os.path import join, dirname from lxml import etree -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.xmlparser import tostring, fromstring +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.xmlparser import tostring, fromstring for prefix, url in OneLogin_Saml2_Constants.NSMAP.items(): diff --git a/src/onelogin/saml2/xmlparser.py b/src/python3_saml/saml2/xmlparser.py similarity index 100% rename from src/onelogin/saml2/xmlparser.py rename to src/python3_saml/saml2/xmlparser.py diff --git a/tests/src/OneLogin/__init__.py b/tests/src/Python3_Saml/__init__.py similarity index 100% rename from tests/src/OneLogin/__init__.py rename to tests/src/Python3_Saml/__init__.py diff --git a/tests/src/OneLogin/saml2_tests/__init__.py b/tests/src/Python3_Saml/saml2_tests/__init__.py similarity index 100% rename from tests/src/OneLogin/saml2_tests/__init__.py rename to tests/src/Python3_Saml/saml2_tests/__init__.py diff --git a/tests/src/OneLogin/saml2_tests/auth_test.py b/tests/src/Python3_Saml/saml2_tests/auth_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/auth_test.py rename to tests/src/Python3_Saml/saml2_tests/auth_test.py index 455b2d28..0a99e7b5 100644 --- a/tests/src/OneLogin/saml2_tests/auth_test.py +++ b/tests/src/Python3_Saml/saml2_tests/auth_test.py @@ -6,12 +6,12 @@ from os.path import dirname, join, exists import unittest -from onelogin.saml2 import compat -from onelogin.saml2.auth import OneLogin_Saml2_Auth -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error -from onelogin.saml2.logout_request import OneLogin_Saml2_Logout_Request +from python3_saml.saml2 import compat +from python3_saml.saml2.auth import OneLogin_Saml2_Auth +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils, OneLogin_Saml2_Error +from python3_saml.saml2.logout_request import OneLogin_Saml2_Logout_Request try: from urllib.parse import urlparse, parse_qs diff --git a/tests/src/OneLogin/saml2_tests/authn_request_test.py b/tests/src/Python3_Saml/saml2_tests/authn_request_test.py similarity index 98% rename from tests/src/OneLogin/saml2_tests/authn_request_test.py rename to tests/src/Python3_Saml/saml2_tests/authn_request_test.py index b3e187a5..0b12ad36 100644 --- a/tests/src/OneLogin/saml2_tests/authn_request_test.py +++ b/tests/src/Python3_Saml/saml2_tests/authn_request_test.py @@ -5,12 +5,12 @@ from os.path import dirname, join, exists import unittest -from onelogin.saml2 import compat -from onelogin.saml2.authn_request import OneLogin_Saml2_Authn_Request -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.authn_request import OneLogin_Saml2_Authn_Request +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML try: diff --git a/tests/src/OneLogin/saml2_tests/error_test.py b/tests/src/Python3_Saml/saml2_tests/error_test.py similarity index 82% rename from tests/src/OneLogin/saml2_tests/error_test.py rename to tests/src/Python3_Saml/saml2_tests/error_test.py index 23ed4931..27c08f21 100644 --- a/tests/src/OneLogin/saml2_tests/error_test.py +++ b/tests/src/Python3_Saml/saml2_tests/error_test.py @@ -2,7 +2,7 @@ import unittest -from onelogin.saml2.errors import OneLogin_Saml2_Error +from python3_saml.saml2.errors import OneLogin_Saml2_Error class OneLogin_Saml2_Error_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py b/tests/src/Python3_Saml/saml2_tests/idp_metadata_parser_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py rename to tests/src/Python3_Saml/saml2_tests/idp_metadata_parser_test.py index 4f352f69..bcc16314 100644 --- a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py +++ b/tests/src/Python3_Saml/saml2_tests/idp_metadata_parser_test.py @@ -9,8 +9,8 @@ from lxml.etree import XMLSyntaxError import unittest -from onelogin.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser -from onelogin.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser +from python3_saml.saml2.constants import OneLogin_Saml2_Constants class OneLogin_Saml2_IdPMetadataParser_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/logout_request_test.py b/tests/src/Python3_Saml/saml2_tests/logout_request_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/logout_request_test.py rename to tests/src/Python3_Saml/saml2_tests/logout_request_test.py index 76994175..4ac0628f 100644 --- a/tests/src/OneLogin/saml2_tests/logout_request_test.py +++ b/tests/src/Python3_Saml/saml2_tests/logout_request_test.py @@ -6,10 +6,10 @@ import unittest from xml.dom.minidom import parseString -from onelogin.saml2 import compat -from onelogin.saml2.logout_request import OneLogin_Saml2_Logout_Request -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2 import compat +from python3_saml.saml2.logout_request import OneLogin_Saml2_Logout_Request +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils try: from urllib.parse import urlparse, parse_qs diff --git a/tests/src/OneLogin/saml2_tests/logout_response_test.py b/tests/src/Python3_Saml/saml2_tests/logout_response_test.py similarity index 98% rename from tests/src/OneLogin/saml2_tests/logout_response_test.py rename to tests/src/Python3_Saml/saml2_tests/logout_response_test.py index 45b8c6ed..417cbccc 100644 --- a/tests/src/OneLogin/saml2_tests/logout_response_test.py +++ b/tests/src/Python3_Saml/saml2_tests/logout_response_test.py @@ -6,12 +6,12 @@ import unittest from xml.dom.minidom import parseString -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.logout_response import OneLogin_Saml2_Logout_Response -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.logout_response import OneLogin_Saml2_Logout_Response +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.utils import OneLogin_Saml2_XML try: from urllib.parse import urlparse, parse_qs diff --git a/tests/src/OneLogin/saml2_tests/metadata_test.py b/tests/src/Python3_Saml/saml2_tests/metadata_test.py similarity index 97% rename from tests/src/OneLogin/saml2_tests/metadata_test.py rename to tests/src/Python3_Saml/saml2_tests/metadata_test.py index 71468542..fa8c7bef 100644 --- a/tests/src/OneLogin/saml2_tests/metadata_test.py +++ b/tests/src/Python3_Saml/saml2_tests/metadata_test.py @@ -7,12 +7,12 @@ from datetime import datetime, timezone import unittest -from onelogin.saml2 import compat -from onelogin.saml2.metadata import OneLogin_Saml2_Metadata -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xml_utils import OneLogin_Saml2_XML +from python3_saml.saml2 import compat +from python3_saml.saml2.metadata import OneLogin_Saml2_Metadata +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xml_utils import OneLogin_Saml2_XML class OneLogin_Saml2_Metadata_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/Python3_Saml/saml2_tests/response_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/response_test.py rename to tests/src/Python3_Saml/saml2_tests/response_test.py index 6249258b..76356bfe 100644 --- a/tests/src/OneLogin/saml2_tests/response_test.py +++ b/tests/src/Python3_Saml/saml2_tests/response_test.py @@ -10,11 +10,11 @@ import unittest from xml.dom.minidom import parseString -from onelogin.saml2 import compat -from onelogin.saml2.errors import OneLogin_Saml2_ValidationError -from onelogin.saml2.response import OneLogin_Saml2_Response -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2 import compat +from python3_saml.saml2.errors import OneLogin_Saml2_ValidationError +from python3_saml.saml2.response import OneLogin_Saml2_Response +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils class OneLogin_Saml2_Response_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/settings_test.py b/tests/src/Python3_Saml/saml2_tests/settings_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/settings_test.py rename to tests/src/Python3_Saml/saml2_tests/settings_test.py index 85386fc3..83332ff3 100644 --- a/tests/src/OneLogin/saml2_tests/settings_test.py +++ b/tests/src/Python3_Saml/saml2_tests/settings_test.py @@ -5,10 +5,10 @@ from os.path import dirname, join, exists, sep import unittest -from onelogin.saml2 import compat -from onelogin.saml2.errors import OneLogin_Saml2_Error -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2 import compat +from python3_saml.saml2.errors import OneLogin_Saml2_Error +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils class OneLogin_Saml2_Settings_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/signed_response_test.py b/tests/src/Python3_Saml/saml2_tests/signed_response_test.py similarity index 90% rename from tests/src/OneLogin/saml2_tests/signed_response_test.py rename to tests/src/Python3_Saml/saml2_tests/signed_response_test.py index 844fc930..fb1410e0 100644 --- a/tests/src/OneLogin/saml2_tests/signed_response_test.py +++ b/tests/src/Python3_Saml/saml2_tests/signed_response_test.py @@ -5,9 +5,9 @@ from os.path import dirname, join, exists import unittest -from onelogin.saml2.response import OneLogin_Saml2_Response -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.response import OneLogin_Saml2_Response +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils class OneLogin_Saml2_SignedResponse_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/utils_test.py b/tests/src/Python3_Saml/saml2_tests/utils_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/utils_test.py rename to tests/src/Python3_Saml/saml2_tests/utils_test.py index 60637e5f..f7341e0c 100644 --- a/tests/src/OneLogin/saml2_tests/utils_test.py +++ b/tests/src/Python3_Saml/saml2_tests/utils_test.py @@ -9,11 +9,11 @@ import sys from xml.dom.minidom import parseString -from onelogin.saml2 import compat -from onelogin.saml2.constants import OneLogin_Saml2_Constants -from onelogin.saml2.settings import OneLogin_Saml2_Settings -from onelogin.saml2.utils import OneLogin_Saml2_Utils -from onelogin.saml2.xmlparser import fromstring +from python3_saml.saml2 import compat +from python3_saml.saml2.constants import OneLogin_Saml2_Constants +from python3_saml.saml2.settings import OneLogin_Saml2_Settings +from python3_saml.saml2.utils import OneLogin_Saml2_Utils +from python3_saml.saml2.xmlparser import fromstring class OneLogin_Saml2_Utils_Test(unittest.TestCase): diff --git a/tests/src/OneLogin/saml2_tests/xml_utils_test.py b/tests/src/Python3_Saml/saml2_tests/xml_utils_test.py similarity index 99% rename from tests/src/OneLogin/saml2_tests/xml_utils_test.py rename to tests/src/Python3_Saml/saml2_tests/xml_utils_test.py index 2135aca3..f0396b37 100644 --- a/tests/src/OneLogin/saml2_tests/xml_utils_test.py +++ b/tests/src/Python3_Saml/saml2_tests/xml_utils_test.py @@ -8,7 +8,7 @@ from base64 import b64decode from lxml import etree from os.path import dirname, join, exists -from onelogin.saml2.utils import OneLogin_Saml2_XML +from python3_saml.saml2.utils import OneLogin_Saml2_XML class TestOneLoginSaml2Xml(unittest.TestCase):