From: Radek Czajka Date: Sat, 21 Nov 2026 00:39:32 +0000 (+0100) Subject: Fixes for CAS + OIDC X-Git-Url: https://git.mdrn.pl/cas.git/commitdiff_plain/a98197a1a1dd5fb58e727cb334bfc2357501d366?ds=inline;hp=173b54164d936c83eb9a28a26b46bb3b19955b82 Fixes for CAS + OIDC --- diff --git a/Dockerfile b/Dockerfile index 39b00f1..205cede 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM python:3.10-alpine AS base RUN apk update && apk add --no-cache \ openssh-keygen COPY requirements.txt requirements.txt -RUN pip install --no-cache-dir -r requirements.txt +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install --no-cache-dir -r requirements.txt WORKDIR /app/src @@ -11,11 +12,13 @@ WORKDIR /app/src FROM base AS dev RUN apk add --no-cache gettext -RUN pip install --no-cache-dir coverage +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install --no-cache-dir coverage FROM base AS prod -RUN pip install --no-cache-dir gunicorn psycopg2-binary +RUN --mount=type=cache,target=/root/.cache/pip \ + pip install --no-cache-dir gunicorn psycopg2-binary COPY src /app/src diff --git a/Makefile b/Makefile index 9c0f292..5ceb654 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ deploy: src/cas/localsettings.py test: rm -r htmlcov & - docker-compose run --rm dev sh -c '\ + docker compose run --rm dev sh -c '\ coverage run --branch --source='.' --data-file ../.coverage ./manage.py test; \ coverage html --data-file ../.coverage -d htmlcov; \ coverage report --data-file ../.coverage; \ diff --git a/README.md b/README.md index d191361..7ce5880 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,19 @@ Instalacja i uruchomienie 6. Przy wdrożeniu utwórz plik `localsettings.py` i wpisz tam ustawienia używanej bazy danych. Do przygotowania wersji do wdrożenia możesz użyć komendy `make deploy`. + +OpenID Connect +-------------- + +Aplikacja działa też jako dostawca OIDC (`django-oidc-provider`), +pod adresem `/openid/` (konfiguracja: `/openid/.well-known/openid-configuration`). + +Przy wdrożeniu: + +* ustaw zmienną środowiskową `SITE_URL` (np. `https://cas.example.org`); + issuer będzie wtedy `https://cas.example.org/openid`, +* jednorazowo wygeneruj klucz podpisujący: `./manage.py creatersakey`, +* klientów (usługi) dodaje się w panelu admina: OpenID Connect Provider → Clients. + +Udostępniane claimy (`emails/oidc.py`): `sub` (id użytkownika), `preferred_username` +(login), `name`, `given_name`, `family_name`, `email`, `email_verified`. diff --git a/docker-compose.yml b/docker-compose.yml index c6021cf..bed2098 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,4 @@ services: - ./media:/app/media ports: - "8050:8000" - command: ./manage.py runserver 0.0.0.0:8000 + command: python -Wall ./manage.py runserver 0.0.0.0:8000 diff --git a/manage b/manage index c27ba11..4f78361 100755 --- a/manage +++ b/manage @@ -6,7 +6,7 @@ then [ -z "$PORT" ] && PORT=8000 EXPOSED=127.0.0.1:"$PORT" echo "expose as: $EXPOSED" - exec docker-compose run -p "$EXPOSED":"$PORT" dev python $PYARGS manage.py runserver 0.0.0.0:"$PORT" + exec docker compose run -p "$EXPOSED":"$PORT" dev python $PYARGS manage.py runserver 0.0.0.0:"$PORT" else - exec docker-compose run dev python $PYARGS manage.py "$@" + exec docker compose run dev python $PYARGS manage.py "$@" fi diff --git a/requirements.txt b/requirements.txt index 90c2e03..00ce8b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -i https://py.mdrn.pl/simple/ -Django==4.2.16 -django-gravatar2==1.4.4 -django-oidc-provider2==0.9.1 -django-cas-provider==24.6 +Django==4.2.30 +django-gravatar2==1.4.5 +django-oidc-provider==0.9.0 +django-cas-provider==26.11 -bcrypt==4.1.3 +bcrypt==5.0.0 ipython diff --git a/src/accounts/locale/pl/LC_MESSAGES/django.po b/src/accounts/locale/pl/LC_MESSAGES/django.po index 828ce47..e2087b4 100644 --- a/src/accounts/locale/pl/LC_MESSAGES/django.po +++ b/src/accounts/locale/pl/LC_MESSAGES/django.po @@ -16,10 +16,72 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.4.1\n" +#: accounts/admin.py:43 +msgid "No onboarding email template configured." +msgstr "Brak skonfigurowanego szablonu maila onboardingowego." + +#: accounts/admin.py:64 +#, python-format +msgid "Onboarding email sent to %(email)s. Password has been reset." +msgstr "Mail onboardingowy wysłany na %(email)s. Hasło zostało zresetowane." + +#: accounts/admin.py:74 +#: accounts/templates/admin/accounts/user/change_form.html:8 +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:10 +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:21 +msgid "Send onboarding email" +msgstr "Wyślij mail onboardingowy" + #: accounts/apps.py:7 msgid "Accounts" msgstr "Konta" +#: accounts/forms.py:14 +msgid "First name" +msgstr "Imię" + +#: accounts/forms.py:15 +msgid "Last name" +msgstr "Nazwisko" + +#: accounts/forms.py:16 +msgid "External email" +msgstr "Zewnętrzny email" + +#: accounts/forms.py:18 +msgid "Username" +msgstr "Login" + +#: accounts/forms.py:20 +msgid "Auto-generated from first and last name" +msgstr "Generowany automatycznie z imienia i nazwiska" + +#: accounts/forms.py:26 +msgid "User with this username already exists." +msgstr "Użytkownik o tym loginie już istnieje." + +#: accounts/models.py:7 +msgid "subject" +msgstr "temat" + +#: accounts/models.py:9 +msgid "body" +msgstr "treść" + +#: accounts/models.py:10 +#, python-brace-format +msgid "" +"Available placeholders: {username}, {password}, {first_name}, {last_name}" +msgstr "Dostępne zmienne: {username}, {password}, {first_name}, {last_name}" + +#: accounts/models.py:14 +msgid "onboarding email template" +msgstr "szablon maila onboardingowego" + +#: accounts/models.py:15 +msgid "onboarding email templates" +msgstr "szablony maili onboardingowych" + #: accounts/templates/account/base.html:10 msgid "Change at Gravatar.com" msgstr "Zmień na Gravatar.com" @@ -47,18 +109,63 @@ msgstr "E-mail" msgid "SSH keys" msgstr "Klucze SSH" -#: accounts/templates/account/base.html:26 +#: accounts/templates/account/base.html:24 +msgid "Onboarding" +msgstr "Onboarding" + +#: accounts/templates/account/base.html:28 msgid "Administration" msgstr "Administracja" -#: accounts/templates/account/base.html:28 +#: accounts/templates/account/base.html:30 msgid "Logout" msgstr "Wyloguj" +#: accounts/templates/account/onboarding.html:5 +#: accounts/templates/account/onboarding.html:16 +msgid "User onboarding" +msgstr "Onboarding użytkownika" + +#: accounts/templates/account/onboarding.html:45 +msgid "Create user" +msgstr "Utwórz użytkownika" + #: accounts/templates/account/profile.html:20 msgid "Change profile" msgstr "Zmień profil" +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:6 +msgid "Home" +msgstr "Strona główna" + +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:7 +msgid "Authentication and Authorization" +msgstr "Uwierzytelnianie i autoryzacja" + +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:8 +msgid "Users" +msgstr "Użytkownicy" + +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:15 +#, python-format +msgid "" +"Are you sure you want to send an onboarding email to user \"%(username)s\" " +"(%(email)s)?" +msgstr "" +"Czy na pewno chcesz wysłać mail onboardingowy do użytkownika " +"\"%(username)s\" (%(email)s)?" + +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:16 +msgid "" +"This will generate a new password and send it to the user's email address." +msgstr "" +"Spowoduje to wygenerowanie nowego hasła i wysłanie go na adres email " +"użytkownika." + +#: accounts/templates/admin/accounts/user/send_onboarding_email.html:22 +msgid "Cancel" +msgstr "Anuluj" + #: accounts/templates/registration/password_change_done.html:15 msgid "Your password was changed." msgstr "Twoje hasło zostało zmienione." @@ -152,107 +259,19 @@ msgstr "" msgid "Reset my password" msgstr "Resetowanie hasła" -#: accounts/views.py:18 +#: accounts/views.py:22 msgid "Profile has been changed." msgstr "Profil został zmieniony." -#: accounts/models.py -msgid "subject" -msgstr "temat" - -#: accounts/models.py -msgid "body" -msgstr "treść" - -#: accounts/models.py -msgid "Available placeholders: {username}, {password}, {first_name}, {last_name}" -msgstr "Dostępne zmienne: {username}, {password}, {first_name}, {last_name}" - -#: accounts/models.py -msgid "onboarding email template" -msgstr "szablon maila onboardingowego" - -#: accounts/models.py -msgid "onboarding email templates" -msgstr "szablony maili onboardingowych" - -#: accounts/forms.py -msgid "First name" -msgstr "Imię" - -#: accounts/forms.py -msgid "Last name" -msgstr "Nazwisko" - -#: accounts/forms.py -msgid "External email" -msgstr "Zewnętrzny email" - -#: accounts/forms.py -msgid "Username" -msgstr "Login" - -#: accounts/forms.py -msgid "Auto-generated from first and last name" -msgstr "Generowany automatycznie z imienia i nazwiska" - -#: accounts/forms.py -msgid "User with this username already exists." -msgstr "Użytkownik o tym loginie już istnieje." - -#: accounts/views.py +#: accounts/views.py:62 +#, python-format msgid "User %(username)s has been created and email sent to %(email)s." msgstr "Użytkownik %(username)s został utworzony i wysłano email na %(email)s." -#: accounts/views.py -msgid "User %(username)s has been created, but no email template is configured." -msgstr "Użytkownik %(username)s został utworzony, ale brak skonfigurowanego szablonu maila." - -#: accounts/templates/account/onboarding.html -msgid "User onboarding" -msgstr "Onboarding użytkownika" - -#: accounts/templates/account/onboarding.html -msgid "Create user" -msgstr "Utwórz użytkownika" - -#: accounts/templates/account/base.html -msgid "Onboarding" -msgstr "Onboarding" - -#: accounts/admin.py -msgid "No onboarding email template configured." -msgstr "Brak skonfigurowanego szablonu maila onboardingowego." - -#: accounts/admin.py -msgid "Onboarding email sent to %(email)s. Password has been reset." -msgstr "Mail onboardingowy wysłany na %(email)s. Hasło zostało zresetowane." - -#: accounts/admin.py -msgid "Send onboarding email" -msgstr "Wyślij mail onboardingowy" - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html -msgid "Home" -msgstr "Strona główna" - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html -msgid "Authentication and Authorization" -msgstr "Uwierzytelnianie i autoryzacja" - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html -msgid "Users" -msgstr "Użytkownicy" - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html +#: accounts/views.py:70 #, python-format -msgid "Are you sure you want to send an onboarding email to user \"%(username)s\" (%(email)s)?" -msgstr "Czy na pewno chcesz wysłać mail onboardingowy do użytkownika \"%(username)s\" (%(email)s)?" - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html -msgid "This will generate a new password and send it to the user's email address." -msgstr "Spowoduje to wygenerowanie nowego hasła i wysłanie go na adres email użytkownika." - -#: accounts/templates/admin/accounts/user/send_onboarding_email.html -msgid "Cancel" -msgstr "Anuluj" +msgid "" +"User %(username)s has been created, but no email template is configured." +msgstr "" +"Użytkownik %(username)s został utworzony, ale brak skonfigurowanego szablonu " +"maila." diff --git a/src/cas/locale/pl/LC_MESSAGES/django.mo b/src/cas/locale/pl/LC_MESSAGES/django.mo index deae1a4..2000e7c 100644 Binary files a/src/cas/locale/pl/LC_MESSAGES/django.mo and b/src/cas/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/cas/locale/pl/LC_MESSAGES/django.po b/src/cas/locale/pl/LC_MESSAGES/django.po index c2dc501..4cc4a0f 100644 --- a/src/cas/locale/pl/LC_MESSAGES/django.po +++ b/src/cas/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2019-03-29 14:16+0100\n" +"PO-Revision-Date: 2026-11-21 01:32+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: \n" "Language: pl\n" @@ -16,21 +16,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.0.6\n" - -#: cas/templates/cas/login.html:9 -msgid "Login" -msgstr "Zaloguj" - -#: cas/templates/cas/login.html:20 -msgid "Log me in" -msgstr "Zaloguj mnie" - -#: cas/templates/cas/login.html:23 -msgid "Forgot password?" -msgstr "Nie pamiętasz hasła?" +"X-Generator: Poedit 3.6\n" #: cas/templates/cas/logout.html:5 cas/templates/cas/logout.html:12 +#: cas/templates/oidc_provider/end_session_completed.html:7 msgid "Logged out" msgstr "Wylogowano" @@ -52,3 +41,62 @@ msgstr "Możesz wrócić do serwisu: %(url)s." #, python-format msgid "You can also login again" msgstr "Możesz też zalogować się ponownie." + +#: cas/templates/oidc_provider/end_session_completed.html:8 +msgid "You've been logged out." +msgstr "Wylogowano Cię." + +#: cas/templates/oidc_provider/end_session_completed.html:9 +msgid "Log in again" +msgstr "Zaloguj się ponownie" + +#: cas/templates/oidc_provider/end_session_failed.html:7 +msgid "Not logged out" +msgstr "Nie wylogowano" + +#: cas/templates/oidc_provider/end_session_failed.html:8 +msgid "You're still logged in. You can close this window." +msgstr "Nadal jesteś zalogowany/-a. Możesz zamknąć to okno." + +#: cas/templates/oidc_provider/end_session_failed.html:9 +msgid "Go to your account" +msgstr "Przejdź do swojego konta" + +#: cas/templates/oidc_provider/end_session_prompt.html:8 +#: cas/templates/oidc_provider/end_session_prompt.html:16 +msgid "Log out" +msgstr "Wyloguj" + +#: cas/templates/oidc_provider/end_session_prompt.html:11 +#, python-format +msgid "Do you want to log out (you've been using %(name)s)?" +msgstr "Czy chcesz się wylogować (po używaniu %(name)s)?" + +#: cas/templates/oidc_provider/end_session_prompt.html:13 +msgid "Do you want to log out?" +msgstr "Czy chcesz się wylogować?" + +#: cas/templates/oidc_provider/end_session_prompt.html:17 +msgid "Cancel" +msgstr "Anuluj" + +#: cas/templates/registration/login.html:9 +msgid "Login" +msgstr "Zaloguj" + +#: cas/templates/registration/login.html:13 +msgid "Log me in" +msgstr "Zaloguj mnie" + +#: cas/templates/registration/login.html:16 +msgid "Forgot password?" +msgstr "Nie pamiętasz hasła?" + +#: ftp/admin.py:19 +#, python-format +msgid "" +"Password for %(login)s set to: ." +msgstr "" +"Hasło dla %(login)s ustawione na: ." diff --git a/src/cas/settings.py b/src/cas/settings.py index 7abd90a..24f4c98 100644 --- a/src/cas/settings.py +++ b/src/cas/settings.py @@ -164,20 +164,19 @@ MIDDLEWARE = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -# django-cas-provider settings -LOGIN_URL = '/cas/login' -LOGOUT_URL = '/cas/logout' +LOGIN_URL = 'login' LOGIN_REDIRECT_URL = '/accounts/' + CAS_CUSTOM_ATTRIBUTES_CALLBACK = 'cas.utils.custom_attributes_callback' OIDC_USERINFO = 'emails.oidc.userinfo' # Include user claims in ID token, so clients don't need to call userinfo. OIDC_IDTOKEN_INCLUDE_CLAIMS = True -# Fixed issuer base URL, e.g. https://cas.example.org -# (the issuer will be ISSUER_URL + '/openid'). -# Without it, the issuer is derived from the request. -ISSUER_URL = os.environ.get('ISSUER_URL') or None +# Fixed base URL, e.g. https://cas.example.org +# (the OIDC issuer will be SITE_URL + '/openid'). +# Without it, it's derived from the request. +SITE_URL = os.environ.get('SITE_URL') or None PASSWORD_HASHERS = ( 'cas.hashers.FNPBCryptPasswordHasher', diff --git a/src/cas/templates/cas/login.html b/src/cas/templates/cas/login.html deleted file mode 100644 index 3ff374f..0000000 --- a/src/cas/templates/cas/login.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -
-
- {% csrf_token %} -

{% trans "Login" %}

- - {% if errors %} -
    - {% for error in errors %} -
  • {{ error }}
  • - {% endfor %} -
- {% endif %} - - {{ form.as_p }} - - -
- {% trans "Forgot password?" %} -
- -
-
- -{% endblock %} diff --git a/src/cas/templates/cas/logout.html b/src/cas/templates/cas/logout.html index d390660..591b14f 100644 --- a/src/cas/templates/cas/logout.html +++ b/src/cas/templates/cas/logout.html @@ -17,7 +17,7 @@

{% blocktrans %}You can return to service you came from: {{ url }}{% endblocktrans %}

{% endif %} - {% url 'cas_login' as login_url %} + {% url 'login' as login_url %}

{% blocktrans %}You can also login again{% endblocktrans %}

diff --git a/src/cas/templates/oidc_provider/end_session_completed.html b/src/cas/templates/oidc_provider/end_session_completed.html new file mode 100644 index 0000000..66c2e68 --- /dev/null +++ b/src/cas/templates/oidc_provider/end_session_completed.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
+

{% trans "Logged out" %}

+

{% trans "You've been logged out." %}

+

{% trans "Log in again" %}

+
+
+{% endblock %} diff --git a/src/cas/templates/oidc_provider/end_session_failed.html b/src/cas/templates/oidc_provider/end_session_failed.html new file mode 100644 index 0000000..1aad16b --- /dev/null +++ b/src/cas/templates/oidc_provider/end_session_failed.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
+

{% trans "Not logged out" %}

+

{% trans "You're still logged in. You can close this window." %}

+

{% trans "Go to your account" %}

+
+
+{% endblock %} diff --git a/src/cas/templates/oidc_provider/end_session_prompt.html b/src/cas/templates/oidc_provider/end_session_prompt.html new file mode 100644 index 0000000..060b795 --- /dev/null +++ b/src/cas/templates/oidc_provider/end_session_prompt.html @@ -0,0 +1,20 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} +
+
+ {% csrf_token %} +

{% trans "Log out" %}

+

+ {% if client %} + {% blocktrans with name=client.name %}Do you want to log out (you've been using {{ name }})?{% endblocktrans %} + {% else %} + {% trans "Do you want to log out?" %} + {% endif %} +

+ + +
+
+{% endblock %} diff --git a/src/cas/templates/registration/login.html b/src/cas/templates/registration/login.html new file mode 100644 index 0000000..88ed22b --- /dev/null +++ b/src/cas/templates/registration/login.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block content %} + +
+
+ {% csrf_token %} +

{% trans "Login" %}

+ + {{ form.as_p }} + + + +
+ {% trans "Forgot password?" %} +
+ +
+
+ +{% endblock %} diff --git a/src/ssh_keys/views.py b/src/ssh_keys/views.py index f2cda1b..1596d90 100644 --- a/src/ssh_keys/views.py +++ b/src/ssh_keys/views.py @@ -6,7 +6,7 @@ from django.db import IntegrityError from django.db.models import Q from django import http from django.shortcuts import get_object_or_404 -from django.utils.timezone import now +from django.utils.timezone import make_aware, now from django.utils.translation import gettext as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic import ListView, CreateView, DeleteView @@ -60,7 +60,8 @@ def ssh_keys_seen(request): data = parse_log_line(line) if data is None: continue - dt = data['datetime'] + # Log times are naive; assume they're in the local time zone (TIME_ZONE). + dt = make_aware(data['datetime']) algo = data['algo'] if 'md5' in data: hash_type = 'md5'