Commit graph

140 commits

Author SHA1 Message Date
5a2e612faa Replace env.sample with a shorter .env.example
It opens with the five required variables, then what production
usually sets (proxy header, PostgreSQL, mail relay, OTP), then every
optional setting commented out at its default. It lists exactly the 51
variables the code reads.
2026-11-11 21:36:51 +03:00
f9dda8bca4 Make the OTP integration optional
Without OTPSERVER, new accounts get no OTP seed, the seed page says OTP
is not configured, and the seed API returns 503. Everything else works
as before. If OTPSERVER is set, ADMIN_SEED, ADMIN_NAME, ADMIN_REALM
and USER_REALM are required and startup fails without them.
2026-11-11 21:35:14 +03:00
921956b84d Default the LDAP layout and site host to production's values
Fewer variables are required to deploy. The directory layout now derives
from ENTIRE_SEARCH_BASE (default dc=ungleich,dc=ch): LDAP_CUSTOMER_DN
defaults to ou=customer under it and LDAPSEARCH to ou=customer plus
ou=users. A different tree, such as the test server, only sets
ENTIRE_SEARCH_BASE. LDAP_CUSTOMER_GROUP_ID (10004) and
LDAP_DEFAULT_START_UID (10000) default to production's values, and
ALLOWED_HOSTS to account.ungleich.ch.

CSRF_TRUSTED_ORIGINS defaults to https:// plus each allowed host, which
is what a site behind an HTTPS ingress needs. LDAPSERVER deliberately
has no default, so a test deployment cannot reach production by
accident.
2026-11-11 21:35:01 +03:00
1a1036e60b Let the tests run against any LDAP tree
The test helpers hardcoded dc=ungleich,dc=ch. They now build DNs from
ENTIRE_SEARCH_BASE, so the suite can run against ungleich's test server
(dc=my-domain,dc=com) by overriding settings through the environment.
The TLS tests depend on the local dev LDAP and its CA, so they skip
themselves when LDAPSERVER points elsewhere.
2026-11-11 21:12:49 +03:00
2407c1eb7f Make the objectClasses of new accounts configurable
New customer entries always got ldapPublicKey, which needs the
openssh-lpk schema. Production has it; ungleich's test server only
loads core, cosine, inetorgperson and nis, so registration failed
there. LDAP_USER_OBJECT_CLASSES (space separated) defaults to the
production set, inetOrgPerson posixAccount ldapPublicKey, and can drop
ldapPublicKey for servers without that schema.
2026-11-11 21:12:12 +03:00
24fe2122b4 Match the production LDAP layout from ungleich's sample entries
Sample entries from production show:
- customers live in ou=customer (singular), not ou=customers
- customers have gidNumber 10004 and staff 10002; uidNumbers are in
  the 10000s
- staff entries list organizationalPerson and person explicitly
- the servers serve ldaps:// on port 636

The app reads all of these from settings, so its behaviour is
unchanged; the customer entry it creates already matches production
attribute for attribute. The defaults and test setups were wrong:
env.sample, the Kubernetes ConfigMap (now ldaps:// without StartTLS,
gid 10004, start uid 10000), dev/env.dev and the dev LDAP seed now
mirror production. The made-up ou=groups is gone. The tests take the
customer DN and gidNumber from settings instead of hardcoding them.
2026-11-11 20:52:49 +03:00
3e630b53d8 Verify LDAP server certificates
ldap3 does not verify TLS certificates by default, and the app never
configured it to. ldaps:// and StartTLS were encrypted but accepted any
certificate, so anyone able to intercept LDAP traffic could pose as the
server and collect the admin password and every password used to log in.

All LDAP servers now use VerifiedTls, which leaves verification to
Python's ssl module: certificate chain and hostname, IP literals
included (ldap3's own matcher cannot handle IPv6 literals). It also
sends SNI and requires TLS 1.2 or newer. LDAP_CA_FILE adds a CA bundle
for a private CA. LDAP_TLS_VERIFY=False turns verification off, with a
logged warning. A failed StartTLS now always raises instead of
continuing in plaintext.

New tests against the dev LDAP cover ldaps, StartTLS and ldaps over an
IPv6 literal with the CA (and check the socket is encrypted), plain LDAP
over IPv6, rejection of an untrusted certificate (ldaps and StartTLS),
rejection of a hostname mismatch, and the opt-out.
2026-11-10 14:56:12 +03:00
a461e93212 Remove the unused _navbar_user.html template
No template includes it, and it loads a custom_tags library that does
not exist, so rendering it would fail.
2026-11-06 15:54:18 +03:00
c459f4eb78 Don't report a failed signup when only the OTP seed failed
Activation created the LDAP account and then requested an OTP seed in
the same try block. If the OTP server was unreachable, the user got an
error page although their account existed, and their next attempt
failed with "username taken". OTP errors are now logged, as non-201
responses already were, and activation still succeeds.
2026-11-06 15:52:21 +03:00
167dc7445a Add migrate_locked to run migrations safely from several pods
Each pod runs migrations in its init container, and Kubernetes can start
several at once. Django does not guard against concurrent migrate runs.
migrate_locked holds a PostgreSQL advisory lock while migrating; on
SQLite it is plain migrate. With three runs started at once on an empty
database, one applied all migrations and the other two waited, then had
nothing to do.
2026-11-06 15:36:37 +03:00
de3655ba0b Serve static files with WhiteNoise
The container runs only gunicorn, with no web server in front of it
inside the pod. WhiteNoise serves the collectstatic output
(STATIC_ROOT, configurable) with gzip compression. It uses the
non-hashed storage because the vendor CSS references source maps that
are not shipped. All 20 static files on the landing page are served.

Adds gunicorn and whitenoise to the requirements.
2026-11-06 15:35:33 +03:00
4449a31d3d Add /healthz and /readyz endpoints for Kubernetes probes
They are served by the first middleware, so probes, which use the pod
IP as Host, are not rejected by ALLOWED_HOSTS or redirected to HTTPS.
/healthz only shows the process is serving, so an LDAP outage never
restarts pods. /readyz returns 503 unless the database answers and an
LDAP server accepts the admin bind.
2026-11-06 15:31:38 +03:00
5ac62ec2db Support PostgreSQL configured from the environment
Sessions, password reset tokens and pending registrations live in the
database, so running more than one replica needs a shared one. With
DATABASE_HOST set the app uses PostgreSQL (psycopg 3 binary wheels, no
system libraries) with persistent, health-checked connections.
Otherwise SQLite is used, at a path configurable with SQLITE_PATH so a
single replica can keep it on a volume.

docker-compose.dev.yml gains a PostgreSQL 18 service on
localhost:5433. The full test suite passes on SQLite and PostgreSQL.
2026-11-06 15:31:01 +03:00
d433708f86 Add production HTTPS and proxy settings
- Session and CSRF cookies are secure-only unless DEBUG is on.
- TRUST_X_FORWARDED_PROTO honours X-Forwarded-Proto from a TLS
  terminating ingress. Without it, Django 4+ fails the CSRF origin
  check on every form POST.
- CSRF_TRUSTED_ORIGINS, SECURE_SSL_REDIRECT and SECURE_HSTS_SECONDS are
  configurable and off by default. HSTS for subdomains and preload are
  left to ungleich, since they affect all of *.ungleich.ch.
2026-11-06 15:27:27 +03:00
122bc387d8 Time out requests to the OTP server
None of the calls to the OTP server set a timeout, so a hanging OTP
server blocked a web worker indefinitely. Each call now times out after
OTP_TIMEOUT seconds (default 10).
2026-11-06 15:26:48 +03:00
f8567b2a41 Read all configuration in settings and document it in env.sample
The OTP server variables were read straight from the environment in
views.py. They are now OTP_* settings next to everything else, under
the same environment variable names, so existing deployments are
unaffected.

Remove LDAP_SERVER and LDAP_USERS_DN, which nothing used.
env.sample moves to the repository root (where .env is read from) and
lists every variable settings.py reads, including defaults and which
values are secrets.
2026-11-06 15:26:26 +03:00
38eec4d5c7 Log to stdout instead of rotating files
Containers should log to stdout. The RotatingFileHandler wrote to
logs/debug.log, which is lost with the pod and crashed startup when
the directory was missing.

All logging now goes to a console handler. LOG_LEVEL sets the root
level (default INFO), DJANGO_LOG_LEVEL sets django.* (default INFO),
and LDAP3_LOG=1 turns on ldap3 protocol logging. ENABLE_DEBUG_LOG and
MODULES_TO_LOG are gone.
2026-11-06 15:25:21 +03:00
db10408c08 Remove the unused nameko RPC service
nameko-func.py is the 2019 RPC backend that the views replaced with
direct ldap3 calls. Nothing imports it, and the nameko.conf it reads
does not exist.
2026-11-06 15:24:18 +03:00
30703f9fa5 Configure email through Django 6.1 MAILERS
EMAIL_HOST, EMAIL_PORT and EMAIL_USE_TLS are deprecated in 6.1 in favour
of the MAILERS setting. The same environment variables now feed the
default SMTP mailer, so existing deployments keep working. Also adds
optional EMAIL_HOST_USER, EMAIL_HOST_PASSWORD and EMAIL_TIMEOUT
(default 10s; previously no timeout).
2026-11-06 15:23:52 +03:00
187dd8d6cc Support multiple LDAP servers with failover
LDAPSERVER was documented as a space separated list, but the whole
string went into a single ldap3.Server. Logins worked (python-ldap
accepts lists), while registration and every write would have failed
with more than one URI.

settings.LDAP_SERVERS is now the split list, used through one ldap3
ServerPool per process: requests go to the first reachable server, a
server that is down is skipped for 60s, connections time out after 5s,
and with all servers down the pool gives up after two passes instead
of retrying forever.
2026-11-06 15:21:45 +03:00
ab45535f38 Replace django-auth-ldap and python-ldap with an ldap3 backend
python-ldap is a C extension that needs the OpenLDAP headers to build
(and needed a workaround in the Dockerfile). ldap3, which the app
already used for all writes, is pure Python.

dal.backends.LdapBackend keeps the django-auth-ldap behaviour: search
the uid in every LDAPSEARCH base as the admin DN, require exactly one
match, log in with the user's DN, and mirror givenName, sn and mail into
the local Django user. Empty passwords are rejected (LDAP treats them
as anonymous logins, which succeed).

LDAP_USE_TLS now applies StartTLS to every connection, including the
admin connection used for writes, not just logins.
2026-11-06 15:15:03 +03:00
cab4b1d709 Replace deprecated datetime.utcnow() with time.time()
utcnow() is deprecated since Python 3.12. Calling .timestamp() on its
naive result also read it as local time, so token ages were off by the
host's UTC offset everywhere except on UTC hosts. Unix time from
time.time() is what the code meant.
2026-11-06 15:11:01 +03:00
bf7c6bf239 Remove APIs that Django 5.0 and 5.1 drop
Remove USE_L10N; localized formatting is always on from 5.0. Replace
User.objects.make_random_password() (removed in 5.1) with a
secrets-based generator for the create API's initial password, using
the same unambiguous alphabet and 16 characters instead of 10.
2026-11-06 15:10:43 +03:00
09cf05d158 Upgrade to Django 4.2 LTS on Python 3.12
Step 2 of the upgrade. Dependencies are bumped to their newest versions
compatible with Django 4.2.

Django 4.0 rejects cache_control applied directly to a view method, so
Index.get now wraps it in method_decorator. Without this the landing
page returns 500. A test now checks the no-store header.
2026-11-06 15:10:07 +03:00
a7664fd6d8 Remove APIs that Django 4.0 drops
ugettext_lazy becomes gettext_lazy. The unused django.conf.urls.url
import would fail to import on 4.0.
2026-11-06 15:08:02 +03:00
3ceff001bb Upgrade to Django 3.2 LTS
Step 1 of the upgrade (Python 3.9). Dependencies are bumped to their
newest versions compatible with Django 3.2.

DEFAULT_AUTO_FIELD is set to AutoField, which matches the existing
tables, so no migration is needed and the W042 warnings go away.
2026-11-06 15:07:37 +03:00
4f00971f84 Use {% load static %} in templates
{% load staticfiles %} is deprecated in Django 2.2 and removed in 3.0.
2026-11-06 15:06:00 +03:00
15af9f8d9c Stop writing passwords and reset links to logs
SeedRetrieveCreate printed every submitted password to stdout, so it
ended up in container and server logs. The reset view logged complete
reset URLs at debug level, and those work as credentials until used.
2026-11-06 15:04:23 +03:00
0cb0344ac8 Compute the next uidNumber from LDAP instead of a local file
The highest uidNumber was cached in dal/ldap_max_uid_file. That breaks
with more than one replica and is lost on every container restart. The
uniqueness check behind it searched base '' (the root DSE), which
OpenLDAP never matches, so nothing caught a stale file. The error path
also referenced a setting that does not exist.

Now a paged search over ENTIRE_SEARCH_BASE finds the highest uidNumber
on each activation. Numbering is unchanged: the next number is above
both LDAP_DEFAULT_START_UID and every existing uidNumber.
LDAP_MAX_UID_FILE_PATH is no longer used.
2026-11-06 15:03:57 +03:00
f675ce9e31 Reject usernames that exist anywhere in the directory
Registration only collided inside ou=customers, so a staff username
from ou=users could be registered again as a customer, creating two
accounts with the same uid. Check the whole tree (ENTIRE_SEARCH_BASE)
on the register form, in the create API, and again at activation in
case the name was taken in between.
2026-11-06 15:03:14 +03:00
dad66040ed Keep passwords out of activation links
The activation link carried base64-encoded username, password, names
and email, so plaintext passwords ended up in mail archives, browser
history and proxy logs.

Registration now hashes the password to {SSHA} immediately and stores
it in a new PendingRegistration table (migration 0002). The emailed
link is /activate/<token>/ with a random token only, and activation
writes the stored hash into LDAP. Pending entries expire after 24h,
like reset tokens. This also drops the PseudoUser/token-generator
workaround.

Links in emails sent before deployment stop working; those users must
register again.
2026-11-06 15:02:41 +03:00
23ddf33d41 Require a verified reset link to set a new password
ResetRequest.post took the username from a hidden form field and
changed that user's password without checking any token, so anyone
could take over any account with a single POST to /reset/.

Opening a valid reset link now stores the verified username in the
session (valid for one hour, cleared after use). The POST only acts on
that user and ignores the form field. Reset tokens now come from
secrets.token_urlsafe, and malformed links return 404 instead of 500.
2026-11-06 15:01:47 +03:00
b44e2ffcf4 Escape user input in LDAP filters and DNs
The uid was formatted straight into search filters, so a password
reset for user '*' matched and changed the first entry in the tree
(staff accounts included). Escape filter values with
escape_filter_chars and DN values with escape_rdn.

Also fix the username pattern: [a-z|0-9|\-|_] allowed '|'.
2026-11-06 15:01:06 +03:00
13b1d9c23a Add end-to-end tests and pin production baseline dependencies
Restore root requirements.txt pinned to what production runs
(Django 2.2, last patch 2.2.28) so the upgrade starts from a
reproducible baseline. Restore logs/.keep; the logging config fails
on a fresh clone without the directory.

The tests drive every view over HTTP against the real test LDAP:
login, registration and activation, data and password changes,
password reset, account deletion, the create API and OTP seeds.
Known bugs are recorded as expected failures:
- password reset POST changes any user's password without a token
- LDAP filter injection in reset (user='*' hits the first entry)
- activation link carries the base64-encoded password
- a username from ou=users can be registered again under ou=customers
2026-11-06 14:46:24 +03:00
Nico Schottelius
e88cd4bc59 Register add 2021-12-12 20:39:32 +01:00
Timothee Floure
a7b9d70b9d Merge upstream repository and code running on production... 2020-05-24 08:04:25 +02:00
26916f7def Validate username format in what seem to be WIP API? 2020-05-01 11:11:24 +02:00
4cf0161d7c Ask for username instead of email for login, validate username on
registration
2020-05-01 11:08:13 +02:00
7cbdf62b96 Populate README, refresh configuration template 2020-05-01 11:07:29 +02:00
8a8cc5d20e better response messsage 2019-05-30 05:17:20 -04:00
e1b4aac222 fix typho response -> Response 2019-05-30 05:07:06 -04:00
f6b723b76a fix typho in creation link 2019-05-30 05:04:11 -04:00
ce5f88b134 fix hardwritten test 2019-05-26 16:59:52 -04:00
36d10deaab Added buttons for back to index and show seeds 2019-05-26 16:50:56 -04:00
d37144c541 seed listing view and template 2019-05-26 16:15:07 -04:00
321d8548da url for seed list 2019-05-26 16:13:58 -04:00
9576ae9064 Same messages in creation/deletion preventing scape chars errors in password 2019-05-06 11:42:58 -04:00
9711dc1ecc fix show message error when not valid credentials 2019-05-05 18:12:43 -04:00
54aa8f474e added rest framework conf 2019-05-05 17:16:14 -04:00
200699486a rest interface for retrieve-create users seed 2019-05-05 16:44:02 -04:00