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
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
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; \
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`.
- ./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
[ -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
-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
"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"
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."
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."
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 <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
"Language-Team: \n"
"Language: pl\n"
"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"
#, python-format
msgid "You can also <a href=\"%(login_url)s\">login again</a>"
msgstr "Możesz też <a href=\"%(login_url)s\">zalogować się ponownie</a>."
+
+#: 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 <strong>%(login)s</strong> set to: <input disabled "
+"value=\"%(password)s\">."
+msgstr ""
+"Hasło dla <strong>%(login)s</strong> ustawione na: <input disabled "
+"value=\"%(password)s\">."
'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',
+++ /dev/null
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-
-<div class="enclose">
- <form class="enclosed" id="login-form" action='{% url "cas_login" %}' method='post'>
- {% csrf_token %}
- <h1>{% trans "Login" %}</h1>
-
- {% if errors %}
- <ul class="errorlist">
- {% for error in errors %}
- <li>{{ error }}</li>
- {% endfor %}
- </ul>
- {% endif %}
-
- {{ form.as_p }}
- <input type="submit" value="{% trans 'Log me in' %}" tabindex="10" />
-
- <div style="text-align: right">
- <a href="{% url 'password_reset' %}">{% trans "Forgot password?" %}</a>
- </div>
-
- </form>
-</div>
-
-{% endblock %}
<p>{% blocktrans %}You can return to service you came from: <a href="{{ url }}">{{ url }}</a>{% endblocktrans %}</p>
{% endif %}
- {% url 'cas_login' as login_url %}
+ {% url 'login' as login_url %}
<p>{% blocktrans %}You can also <a href="{{ login_url }}">login again</a>{% endblocktrans %}</p>
</div></div>
--- /dev/null
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="enclose">
+ <div class="enclosed">
+ <h1>{% trans "Logged out" %}</h1>
+ <p>{% trans "You've been logged out." %}</p>
+ <p><a href="{% url 'login' %}">{% trans "Log in again" %}</a></p>
+ </div>
+</div>
+{% endblock %}
--- /dev/null
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="enclose">
+ <div class="enclosed">
+ <h1>{% trans "Not logged out" %}</h1>
+ <p>{% trans "You're still logged in. You can close this window." %}</p>
+ <p><a href="{% url 'accounts_profile' %}">{% trans "Go to your account" %}</a></p>
+ </div>
+</div>
+{% endblock %}
--- /dev/null
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="enclose">
+ <form class="enclosed" method="post" action="{{ end_session_prompt_url }}">
+ {% csrf_token %}
+ <h1>{% trans "Log out" %}</h1>
+ <p>
+ {% 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 %}
+ </p>
+ <input type="submit" name="allow" value="{% trans 'Log out' %}" />
+ <input type="submit" value="{% trans 'Cancel' %}" />
+ </form>
+</div>
+{% endblock %}
--- /dev/null
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<div class="enclose">
+ <form class="enclosed" id="login-form" action='' method='post'>
+ {% csrf_token %}
+ <h1>{% trans "Login" %}</h1>
+
+ {{ form.as_p }}
+ <input type="hidden" name="next" value="{{ next }}" />
+ <input type="submit" value="{% trans 'Log me in' %}" tabindex="10" />
+
+ <div style="text-align: right">
+ <a href="{% url 'password_reset' %}">{% trans "Forgot password?" %}</a>
+ </div>
+
+ </form>
+</div>
+
+{% endblock %}
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
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'