swarm-grafana: grafana requires SSO, so the login form goes unconditionally
`auth.disable_login_form` was gated on `ssoLocal` — `grafana.enable &&
authelia.enable`, i.e. "both of them run on THIS host". With authelia
elsewhere in the swarm that is false, so a deployment that is very much
using SSO still rendered grafana with its local login form enabled, on a
vhost the gateway publishes, for a product that ships an `admin`/`admin`
account.
The reason that matters was already in the module, three lines up
("Grafana ships an `admin`/`admin` account, and this vhost is on the
public gateway") — it was just attached to a conditional. Whether a
password box sits on a public login page is not a per-host question.
Per mara on the docs PR for this: "grafana requires sso - no local
login". The OIDC block below stays gated on locality; making that follow
the same swarm-wide question is a larger change with its own tracking.
The module-eval suite already had the fixture this needed: `grafanaOldPath`
enables grafana and not authelia, which is exactly the shape the login
form stayed enabled in, so the regression case needs no new hive. 90 -> 91
properties.
Closes #4218.
This commit is contained in:
parent
e3864fe787
commit
72635832b7
2 changed files with 21 additions and 4 deletions
|
|
@ -701,10 +701,17 @@ in
|
|||
# whole host fails to build. The unit below generates it.
|
||||
security.secret_key = "$__file{${secretKeyPath}}";
|
||||
|
||||
# No local password path at all when SSO is configured. This
|
||||
# is not tidiness: Grafana ships an `admin`/`admin` account,
|
||||
# and this vhost is on the public gateway.
|
||||
auth.disable_login_form = ssoLocal;
|
||||
# No local password path, ever. This is not tidiness: Grafana
|
||||
# ships an `admin`/`admin` account and this vhost is on the
|
||||
# public gateway, so SSO is the only way in — not merely the
|
||||
# preferred one.
|
||||
#
|
||||
# Deliberately NOT `ssoLocal`: whether a password box sits on a
|
||||
# public login page cannot depend on which host happens to run
|
||||
# authelia. The OIDC block below is still gated on locality;
|
||||
# making that follow the same swarm-wide question is a larger
|
||||
# change tracked on its own.
|
||||
auth.disable_login_form = true;
|
||||
}
|
||||
// lib.optionalAttrs ssoLocal {
|
||||
"auth.generic_oauth" = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue