cleanup

UniversitaDellaCalabria · Nov 21, 2023 · c7f63a1 · c7f63a1
1 parent 24e3ea0
commit c7f63a1
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 1,000 deletions.
diff --git a/.github/workflows/docker-publish-iam.yml b/.github/workflows/docker-publish-iam.yml
@@ -9,9 +9,9 @@ env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   REPO_NAME: ${{ github.repository }}
-  IMAGE_NAME: xdrplus-iam
-  FULL_IMAGE_NAME: 4securitas/xdrplus-iam
-  VENDOR_NAME: xdrplus
+  IMAGE_NAME: uniauth
+  FULL_IMAGE_NAME: unical/uniauth
+  VENDOR_NAME: unical
   CONTEXT: .
 
 jobs:

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -37,7 +37,6 @@ jobs:
           - '3.10'
         django-version:
           - '4.2'
-          - '3.2'
 
     steps:
     - uses: actions/checkout@v2
@@ -68,7 +67,7 @@ jobs:
       run: |
         bandit -r -x uniauth_saml2_idp/test* uniauth_saml2_idp/*
     - name: Test with Django tests
-      working-directory: ./xdrplus-iam
+      working-directory: ./example
       run: |
         coverage erase
         coverage run manage.py test

diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ COPY ./uniauth_saml2_idp ./uniauth_saml2_idp
 COPY ./setup.py .
 COPY ./README.md .
 
-COPY xdrplus-iam/ /opt/uniauth/
+COPY example/ /opt/uniauth/
 
 RUN echo $PWD
 RUN ls
@@ -38,18 +38,3 @@ RUN pip3 install -e .
 RUN pip3 install uwsgi
 RUN pip3 install psycopg2
 RUN pip3 list
-
-# DB setup - just as a note
-# ARG USER=that-user
-# ARG PASS=that-password
-# ARG HOST=%
-# ARG DB=uniauth
-# ENV USER=$USER
-# ENV PASS=$PASS
-# ENV HOST=$HOST
-# ENV DB=$DB
-# RUN service mysql restart \
-# && mysql -u root -e "\
-# CREATE USER IF NOT EXISTS ${USER}@${HOST} IDENTIFIED BY ;\
-# CREATE DATABASE IF NOT EXISTS ${DB} CHARACTER SET = utf8 COLLATE = utf8_general_ci;\
-# GRANT ALL PRIVILEGES ON ${DB}.* TO ${USER}@${HOST};"
diff --git a/README.ADFS.md b/README.ADFS.md
@@ -17,7 +17,7 @@ server = Server('10.5.3.19', get_info=ALL)
 
 conn = Connection(
     server, 
-    user="example.local\\xdrplus-user", 
+    user="example.local\\user", 
     password="that-pass", 
     authentication=NTLM, 
     auto_bind=True

diff --git a/example/custom_template/templates/404.html b/example/custom_template/templates/404.html
@@ -12,11 +12,11 @@
 		<!-- Page details -->
 		<title>
 
-			ACSIA XDR Plus
+			uniAuth IDP
 
 		</title>
 		<meta
-		name="description" content="ACSIA XDR Plus - IDP">
+		name="description" content="uniAuth IDP">
 		<!-- CSS -->
 		<link
 		rel="stylesheet" href="/static/css/bootstrap-italia.min.css">

diff --git a/example/custom_template/templates/500.html b/example/custom_template/templates/500.html
@@ -12,11 +12,11 @@
 		<!-- Page details -->
 		<title>
 
-			ACSIA XDR Plus
+			uniAuth IDP
 
 		</title>
 		<meta
-		name="description" content="ACSIA XDR Plus - IDP">
+		name="description" content="uniAuth IDP">
 		<!-- CSS -->
 		<link
 		rel="stylesheet" href="/static/css/bootstrap-italia.min.css">

diff --git a/example/django_idp/settingslocal.py b/example/django_idp/settingslocal.py
@@ -231,7 +231,7 @@
 )
 EMAIL_FROM = os.getenv(
     "EMAIL_FROM",
-    "no-reply@xdrplus-iam.acsia.org"
+    "no-reply@example.org"
 )
 EMAIL_SUBJECT_PASSWD_RESET = os.getenv(
     "EMAIL_SUBJECT_PASSWD_RESET",

diff --git a/example/django_idp/settingslocal_ldap.py b/example/django_idp/settingslocal_ldap.py
@@ -20,13 +20,13 @@
 ldap3.set_config_parameter('RESTARTABLE_SLEEPTIME', 2)
 
 
-XDR_DEMO = dict(server =
+DEFAULT = dict(server =
                    dict(host = 'ldap://10.5.3.19:389',
                         connect_timeout = 5,
                         get_info=ALL
                         ),
                connection =
-                   dict(user="example.local\\xdrplus-user",
+                   dict(user="example.local\\user",
                         password="That-password", 
                         read_only = True,
                         version = 3,
@@ -75,6 +75,6 @@
 
 # put multiple connections here
 LDAP_CONNECTIONS = {
-    'DEFAULT' : XDR_DEMO,
+    'DEFAULT' : DEFAULT,
 }
 LDAP_CONNECTIONS = [LdapClient(conf) for conf in LDAP_CONNECTIONS.values()]
diff --git a/example/logs/django.log b/example/logs/django.log
diff --git a/example/logs/uniauth.log b/example/logs/uniauth.log
diff --git a/example/password_reset/views.py b/example/password_reset/views.py
@@ -103,7 +103,7 @@ def password_reset(request):
                 _user = None
 
             host = getattr(
-                settings, "ENTITY_BASE_URL", "https://xdrplus-iam.acsia.org"
+                settings, "ENTITY_BASE_URL", "https://example.org"
             )
 
             if _user:

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-django>=3.2.18,<4.2
+django>=4.0.9,<4.2
 djangosaml2>=1.5
 pysaml2>=7.3
 cffi