mirror of
https://github.com/profullstack/agentbbs.git
synced 2026-08-13 14:27:27 +00:00
fix(passwd): also reset The Lounge web-login password (#61)
passwd@ reset the IRC SASL credential (Ergo store + The Lounge saslPassword) but NOT The Lounge's own web-login password (the bcrypt field used to sign in to chat.<domain> itself). So a member who reset their password could connect to IRC but got "auth failed" at chat.profullstack.com/sign-in. set-irc-password.sh now sets all THREE chat credentials to the new password: Ergo SASL, the Lounge saslPassword, and the Lounge web-login password via `thelounge reset <member>` (AGENTBBS_LOUNGE_RESET_CMD, default targets the dockerized The Lounge). The password is piped on stdin to `thelounge reset`, so it never lands on a command line. Best-effort: a Lounge web-reset failure warns but doesn't fail the run (Ergo SASL stays the primary IRC secret). Bumped ircpass SetPassword's context timeout 20s→60s since the helper now also runs a `docker exec thelounge ...` step. Verified live on bbs.profullstack.com: the modified helper sets all three for an existing member (web bcrypt match + saslPassword + Ergo store), and the affected member's web login was reconciled. Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
54ede811f9
commit
105ff0ed8a
3 changed files with 72 additions and 11 deletions
|
|
@ -45,17 +45,32 @@ password across every service that has its own credential**:
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| **git** (Forgejo) | admin API — ensure the account, then `SetPassword` (clears `must_change_password`) | git **push** uses the SSH key, not this password; this is for the web UI |
|
| **git** (Forgejo) | admin API — ensure the account, then `SetPassword` (clears `must_change_password`) | git **push** uses the SSH key, not this password; this is for the web UI |
|
||||||
| **mail** (Mailu webmail) | admin API — ensure the mailbox, then `mailu.SetPassword` | the mailbox/IMAP/webmail login |
|
| **mail** (Mailu webmail) | admin API — ensure the mailbox, then `mailu.SetPassword` | the mailbox/IMAP/webmail login |
|
||||||
| **chat** (IRC + The Lounge) | the privileged helper `set-irc-password.sh` via a narrow `sudo` rule | SASL password for native IRC clients **and** the web client; see [`irc.md`](irc.md) |
|
| **chat** (IRC + The Lounge) | the privileged helper `set-irc-password.sh` via a narrow `sudo` rule | sets all THREE chat credentials to the new password (see below); see [`irc.md`](irc.md) |
|
||||||
|
|
||||||
BBS/SSH login itself is unaffected — that's always the member's key.
|
BBS/SSH login itself is unaffected — that's always the member's key.
|
||||||
|
|
||||||
|
**Chat has three credentials, all set to the new password.** "Chat" spans Ergo
|
||||||
|
(the IRC server) and The Lounge (the web client at `chat.<domain>`), which between
|
||||||
|
them keep *three* secrets — `set-irc-password.sh` sets all three so one password
|
||||||
|
works everywhere:
|
||||||
|
|
||||||
|
1. **Ergo SASL** — the pbkdf2 hash in `/var/lib/ergo/irc-passwd` that native IRC
|
||||||
|
clients (irssi/HexChat) authenticate with.
|
||||||
|
2. **The Lounge `saslPassword`** — how the *web* client logs in to Ergo on the
|
||||||
|
member's behalf (in the user's JSON `networks[]`).
|
||||||
|
3. **The Lounge web-login password** — the bcrypt field used to sign in to
|
||||||
|
`chat.<domain>` *itself*, set via `thelounge reset <member>`
|
||||||
|
(`AGENTBBS_LOUNGE_RESET_CMD`). Missing this was the "I reset my password but
|
||||||
|
chat.profullstack.com says auth failed" bug: a member could reach IRC but not
|
||||||
|
the web client.
|
||||||
|
|
||||||
**Why chat needs a helper.** The BBS process runs as the unprivileged `agentbbs`
|
**Why chat needs a helper.** The BBS process runs as the unprivileged `agentbbs`
|
||||||
service user, but the Ergo password store (`/var/lib/ergo/irc-passwd`, `ergo:ergo
|
service user, but the Ergo password store (`ergo:ergo 0600`) and The Lounge user
|
||||||
0600`) and The Lounge user files are root-owned. `setup.sh` installs
|
files are root-owned. `setup.sh` installs `scripts/set-irc-password.sh` to
|
||||||
`scripts/set-irc-password.sh` to `/usr/local/sbin/agentbbs-set-irc-password` and a
|
`/usr/local/sbin/agentbbs-set-irc-password` and a `/etc/sudoers.d/agentbbs-ircpass`
|
||||||
`/etc/sudoers.d/agentbbs-ircpass` rule letting **only** that one command run as
|
rule letting **only** that one command run as root. The new password travels on
|
||||||
root. The new password travels on **stdin** (the `set-irc-password.sh <member> -`
|
**stdin** (the `set-irc-password.sh <member> -` form, and likewise piped to
|
||||||
form), so it never appears in the process table or sudo's command log. Each leg is
|
`thelounge reset`), so it never appears in the process table or sudo's command log. Each leg is
|
||||||
independent: if one service is unconfigured or fails, the others still apply and
|
independent: if one service is unconfigured or fails, the others still apply and
|
||||||
the member sees a per-service ✓/✗ summary. A confirmation email (which never
|
the member sees a per-service ✓/✗ summary. A confirmation email (which never
|
||||||
contains the password) is sent on success.
|
contains the password) is sent on success.
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,9 @@ func (c Config) SetPassword(member, password string) error {
|
||||||
args = []string{"-n", c.Script, member, "-"}
|
args = []string{"-n", c.Script, member, "-"}
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
// Generous: the helper also resets The Lounge web-login password via a
|
||||||
|
// `docker exec thelounge ...` which can take a few seconds on a busy box.
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
cmd := exec.CommandContext(ctx, name, args...)
|
cmd := exec.CommandContext(ctx, name, args...)
|
||||||
// Never let the helper inherit the BBS environment wholesale; pass only the
|
// Never let the helper inherit the BBS environment wholesale; pass only the
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,13 @@
|
||||||
#
|
#
|
||||||
# Writes a pbkdf2-sha256 hash to the Ergo password store
|
# Writes a pbkdf2-sha256 hash to the Ergo password store
|
||||||
# (/var/lib/ergo/irc-passwd, ergo:ergo 0600) that ergo-auth-member verifies on
|
# (/var/lib/ergo/irc-passwd, ergo:ergo 0600) that ergo-auth-member verifies on
|
||||||
# SASL login, and (if a The Lounge user file exists for the member) updates that
|
# SASL login. When a The Lounge user file exists for the member it ALSO sets two
|
||||||
# user's saslPassword so the web client keeps working without member action.
|
# distinct Lounge credentials to the same password:
|
||||||
|
# - the IRC network saslPassword (so the web client authenticates to Ergo), and
|
||||||
|
# - the Lounge WEB LOGIN password (the bcrypt field used to sign in to
|
||||||
|
# chat.<domain> itself), via `thelounge reset` (AGENTBBS_LOUNGE_RESET_CMD).
|
||||||
|
# Without the web-login sync a member who reset via passwd@ could connect to IRC
|
||||||
|
# but not log into the web client — the bug this guards against.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# set-irc-password.sh <member> [password] # password generated if omitted
|
# set-irc-password.sh <member> [password] # password generated if omitted
|
||||||
|
|
@ -16,10 +21,19 @@
|
||||||
#
|
#
|
||||||
# Run as root on the BBS box. The member must already be a BBS member; this only
|
# Run as root on the BBS box. The member must already be a BBS member; this only
|
||||||
# sets the secret — membership itself is still gated by /irc-auth.
|
# sets the secret — membership itself is still gated by /irc-auth.
|
||||||
import sys, os, json, glob, secrets, hashlib, pwd, grp
|
import sys, os, json, glob, secrets, hashlib, pwd, grp, subprocess
|
||||||
|
|
||||||
PASSWD_FILE = os.environ.get("ERGO_IRC_PASSWD", "/var/lib/ergo/irc-passwd")
|
PASSWD_FILE = os.environ.get("ERGO_IRC_PASSWD", "/var/lib/ergo/irc-passwd")
|
||||||
LOUNGE_USERS = os.environ.get("AGENTBBS_LOUNGE_USERS", "/var/lib/thelounge/users")
|
LOUNGE_USERS = os.environ.get("AGENTBBS_LOUNGE_USERS", "/var/lib/thelounge/users")
|
||||||
|
# Command that resets a member's The Lounge *web login* password — distinct from
|
||||||
|
# the IRC saslPassword. We feed the new password to it on STDIN (so it never
|
||||||
|
# lands on a command line) and append the member name. Default targets the
|
||||||
|
# dockerized The Lounge (`thelounge reset <member>` reads the password from
|
||||||
|
# stdin). Set AGENTBBS_LOUNGE_RESET_CMD="" to skip the web-login sync (e.g. when
|
||||||
|
# The Lounge isn't deployed), or override it for a native/other install.
|
||||||
|
LOUNGE_RESET_CMD = os.environ.get(
|
||||||
|
"AGENTBBS_LOUNGE_RESET_CMD", "docker exec -i thelounge thelounge reset"
|
||||||
|
)
|
||||||
ITERS = 200_000
|
ITERS = 200_000
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -55,10 +69,40 @@ def write_store(store):
|
||||||
os.replace(tmp, PASSWD_FILE)
|
os.replace(tmp, PASSWD_FILE)
|
||||||
|
|
||||||
|
|
||||||
|
def set_lounge_web_password(member, pw):
|
||||||
|
"""Set The Lounge WEB LOGIN password (its own bcrypt field), distinct from the
|
||||||
|
IRC saslPassword. Pipes the new password to `thelounge reset <member>` on
|
||||||
|
stdin so it never appears on a command line. Best-effort: warns but never
|
||||||
|
fails the run (the Ergo SASL credential is the primary IRC secret)."""
|
||||||
|
cmd = LOUNGE_RESET_CMD.strip()
|
||||||
|
if not cmd:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
r = subprocess.run(
|
||||||
|
cmd.split() + [member],
|
||||||
|
input=(pw + "\n").encode(),
|
||||||
|
capture_output=True,
|
||||||
|
timeout=30,
|
||||||
|
)
|
||||||
|
if r.returncode != 0:
|
||||||
|
print(
|
||||||
|
f"WARN: Lounge web-login reset for {member} failed (rc={r.returncode}): "
|
||||||
|
f"{r.stderr.decode(errors='replace').strip()[:200]}",
|
||||||
|
file=sys.stderr,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
print(f" (updated The Lounge web-login password for {member})")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"WARN: Lounge web-login reset for {member}: {e}", file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def sync_lounge(member, pw):
|
def sync_lounge(member, pw):
|
||||||
p = os.path.join(LOUNGE_USERS, member + ".json")
|
p = os.path.join(LOUNGE_USERS, member + ".json")
|
||||||
if not os.path.exists(p):
|
if not os.path.exists(p):
|
||||||
return
|
return
|
||||||
|
# Web login password first (rewrites the user file via the Lounge CLI), then
|
||||||
|
# the saslPassword edit below reads that fresh file and preserves it.
|
||||||
|
set_lounge_web_password(member, pw)
|
||||||
try:
|
try:
|
||||||
d = json.load(open(p))
|
d = json.load(open(p))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue