Skip to content

Release 2.2.1 - #50

Merged
ce5rpy merged 1 commit into
masterfrom
develop
Jul 1, 2026
Merged

Release 2.2.1#50
ce5rpy merged 1 commit into
masterfrom
develop

Conversation

@ce5rpy

@ce5rpy ce5rpy commented Jul 1, 2026

Copy link
Copy Markdown
Owner

Summary

…49)

TRUSTED_PROXY_IPS was never copied from MONITOR_APP into CONF["APP"],
so login-by-ip always used the compile-time defaults (127.0.0.1/::1).
Under Docker, Traefik connects from a dynamic container IP (172.x),
which is not in the defaults — X-Forwarded-For was ignored and the
dashboard returned 401 for every auto-login attempt.

- config_loader: copy TRUSTED_PROXY_IPS to CONF["APP"]
- client_ip: TrustedProxySet precompiles CIDR networks via ipaddress
  so ranges like 172.16.0.0/12 match without listing every container IP
- 13 tests covering literals, CIDR IPv4/IPv6, mixed, and edge cases
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Release PR — merge method

Commits listed on this PR: 1 (file diff may be smaller — that is normal when squash releases stacked up).

Required

Merge with Create a merge commit. Do not use Squash and merge.

Why

  • Squash on master creates new commit SHAs; develop keeps the original squash commits from feature PRs.
  • The next release PR then lists old fixes again even though master already has them.
  • Merge commit keeps the same SHAs on both branches; CI fast-forwards develop to master after chore(release) — no force-push, local git pull on develop still works.

One-time cleanup

If this PR lists commits from earlier releases (2.0.4, 2.0.5, …), merge once with merge commit; post-release sync realigns develop with master automatically.

@ce5rpy
ce5rpy merged commit 099c2a2 into master Jul 1, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant