mirror of
https://github.com/profullstack/agentbbs.git
synced 2026-08-13 22:37:28 +00:00
Add notify-creds subcommand to (re)email members git + mailbox creds
`agentbbs notify-creds` backfills credential emails to verified members who signed up before the git/mailbox welcome emails existed. - git (all verified): forgejo.EnsureUserReset resets each account to a fresh one-time password (must-change) and emails the web login link, username, and password. New method since the original one-time password is not recoverable for existing accounts. - mailbox (all verified): ensures the forwardemail alias and emails the address + webmail link. - Preview by default; --send executes. --git/--mail/--user filters. Refuses --send without SMTP; warns+skips when Forgejo/forwardemail are unconfigured. Also folds in the welcome-email functions (gitWelcomeEmailBody, mailWelcomeEmailBody, EnsureUser password return, provisionGit/ ensurePremium sends) that this builds on. README ops + forgejo tests. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
6dc94bd784
commit
c967da9f50
5 changed files with 373 additions and 18 deletions
|
|
@ -21,6 +21,8 @@
|
|||
// agentbbs mint-token NAME issue a WebSocket API token for NAME
|
||||
// agentbbs qrypt-invite NAME mint a qrypt.chat anonymous invite for NAME
|
||||
// agentbbs qrypt-issuer-keygen print a fresh qrypt issuer seed + public key
|
||||
// agentbbs notify-creds [flags] (re)email verified members their git +
|
||||
// mailbox creds/links (preview unless --send)
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
@ -146,6 +148,10 @@ func main() {
|
|||
qryptInviteCmd(st, os.Args[2:])
|
||||
return
|
||||
}
|
||||
if len(os.Args) > 1 && os.Args[1] == "notify-creds" {
|
||||
notifyCreds(st, os.Args[2:])
|
||||
return
|
||||
}
|
||||
if len(os.Args) > 1 && os.Args[1] == "qrypt-issuer-keygen" {
|
||||
qryptIssuerKeygen()
|
||||
return
|
||||
|
|
@ -823,15 +829,36 @@ func (a *app) ensurePremium(u *store.User) bool {
|
|||
return false
|
||||
}
|
||||
u.Premium = true
|
||||
// Create their <name>@host alias forwarding to the email they verified.
|
||||
// Create their <name>@host alias forwarding to the email they verified, then
|
||||
// email that address their new mailbox details + webmail link.
|
||||
if a.fe.Configured() && u.Email != "" {
|
||||
if err := a.fe.CreateAlias(u.Name, u.Email); err != nil {
|
||||
log.Error("forwardemail alias", "err", err, "alias", a.fe.Address(u.Name))
|
||||
} else if a.mail.Configured() {
|
||||
if err := a.mail.Send(u.Email, "Your "+a.fe.Domain+" mailbox is ready",
|
||||
mailWelcomeEmailBody(u.Name, a.fe.Address(u.Name), a.fe.WebmailURL())); err != nil {
|
||||
log.Error("mail welcome email", "user", u.Name, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// mailWelcomeEmailBody is the plain-text email sent when a member's @host
|
||||
// mailbox alias is provisioned: their new address and the webmail link.
|
||||
func mailWelcomeEmailBody(name, address, webmail string) string {
|
||||
b := "Hi " + name + ",\n\n" +
|
||||
"Your member mailbox is live:\n\n" +
|
||||
" " + address + "\n\n" +
|
||||
"Mail sent there forwards to this address.\n"
|
||||
if webmail != "" {
|
||||
b += "\nRead and send from the webmail interface here:\n\n" +
|
||||
" " + webmail + "\n"
|
||||
}
|
||||
b += "\nIf you didn't request this, you can ignore this email.\n"
|
||||
return b
|
||||
}
|
||||
|
||||
// showPremiumWelcome prints a premium member's perks: their mailbox, the webmail
|
||||
// URL, the in-hub Mail/Tor entries, and custom domains.
|
||||
func (a *app) showPremiumWelcome(s ssh.Session, u store.User) {
|
||||
|
|
@ -982,14 +1009,39 @@ func (a *app) provisionGit(u *store.User) {
|
|||
if u == nil || !a.forgejo.Configured() || u.Name == "" || u.Email == "" {
|
||||
return
|
||||
}
|
||||
created, err := a.forgejo.EnsureUser(u.Name, u.Email)
|
||||
created, password, err := a.forgejo.EnsureUser(u.Name, u.Email)
|
||||
if err != nil {
|
||||
log.Error("forgejo provision", "user", u.Name, "err", err)
|
||||
return
|
||||
}
|
||||
if created {
|
||||
log.Info("provisioned git account", "user", u.Name, "host", a.forgejo.BaseURL)
|
||||
if !created {
|
||||
return
|
||||
}
|
||||
log.Info("provisioned git account", "user", u.Name, "host", a.forgejo.BaseURL)
|
||||
// Email the verified address their web sign-in link + one-time password so
|
||||
// they can log in to the Forgejo UI and create repositories. Best-effort:
|
||||
// the account already exists, so a mail failure must not block anything.
|
||||
if a.mail.Configured() {
|
||||
if err := a.mail.Send(u.Email, "Your git.profullstack.com account is ready",
|
||||
gitWelcomeEmailBody(u.Name, password, a.forgejo.LoginURL())); err != nil {
|
||||
log.Error("git welcome email", "user", u.Name, "err", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// gitWelcomeEmailBody is the plain-text email sent when a member's AgentGit
|
||||
// (Forgejo) account is created: web login link, username, and the one-time
|
||||
// password they must change on first sign-in.
|
||||
func gitWelcomeEmailBody(name, password, loginURL string) string {
|
||||
return "Hi " + name + ",\n\n" +
|
||||
"Your git account is ready. Sign in to the web interface here:\n\n" +
|
||||
" " + loginURL + "\n\n" +
|
||||
" username: " + name + "\n" +
|
||||
" password: " + password + "\n\n" +
|
||||
"You'll be asked to set a new password the first time you sign in.\n" +
|
||||
"After that, click the \"+\" (top right) → \"New Repository\" to create repos.\n\n" +
|
||||
"Pushing over git uses your registered SSH key — no password needed.\n\n" +
|
||||
"If you didn't request this, you can ignore this email.\n"
|
||||
}
|
||||
|
||||
// verifyPage renders the minimal confirmation result page.
|
||||
|
|
|
|||
155
cmd/agentbbs/notifycreds.go
Normal file
155
cmd/agentbbs/notifycreds.go
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
package main
|
||||
|
||||
// notify-creds re-emails verified members their account credentials and links:
|
||||
// - git: their git.profullstack.com (Forgejo/AgentGit) web login URL, username,
|
||||
// and a freshly reset one-time password (must change on first sign-in).
|
||||
// - mail: their <name>@<mail-domain> mailbox address and the webmail link, after
|
||||
// ensuring the forwardemail alias exists.
|
||||
//
|
||||
// Both features were added after some accounts already existed, so this lets the
|
||||
// operator backfill notifications to everyone who never received them.
|
||||
//
|
||||
// It is a PREVIEW by default — it scans and prints what it would do without
|
||||
// touching Forgejo, forwardemail, or sending any email. Pass --send to execute.
|
||||
// Resetting git passwords clobbers any password a member set themselves, which is
|
||||
// why it only runs under --send.
|
||||
//
|
||||
// agentbbs notify-creds # preview for all verified members
|
||||
// agentbbs notify-creds --send # really send git + mail to everyone
|
||||
// agentbbs notify-creds --git --send # git creds only
|
||||
// agentbbs notify-creds --mail --send # mailbox creds only
|
||||
// agentbbs notify-creds --user alice,bob --send
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/profullstack/agentbbs/internal/forgejo"
|
||||
"github.com/profullstack/agentbbs/internal/forwardemail"
|
||||
"github.com/profullstack/agentbbs/internal/mail"
|
||||
"github.com/profullstack/agentbbs/internal/store"
|
||||
)
|
||||
|
||||
func notifyCreds(st store.Store, args []string) {
|
||||
fs := flag.NewFlagSet("notify-creds", flag.ExitOnError)
|
||||
send := fs.Bool("send", false, "actually reset passwords and send email (default: preview only)")
|
||||
gitFlag := fs.Bool("git", false, "include git account creds/links")
|
||||
mailFlag := fs.Bool("mail", false, "include mailbox creds/links")
|
||||
only := fs.String("user", "", "comma-separated usernames to target (default: all verified)")
|
||||
limit := fs.Int("limit", 100000, "max accounts to scan")
|
||||
fs.Parse(args)
|
||||
|
||||
// Default (neither flag given) is both; either flag alone narrows it.
|
||||
doGit, doMail := *gitFlag, *mailFlag
|
||||
if !doGit && !doMail {
|
||||
doGit, doMail = true, true
|
||||
}
|
||||
|
||||
// Resolve the same configs main() builds for the live server.
|
||||
smtp := mail.ConfigFromEnv()
|
||||
fe := forwardemail.ConfigFromEnv()
|
||||
if fe.Domain == "" {
|
||||
fe.Domain = env("AGENTBBS_MAIL_DOMAIN", "mail.profullstack.com")
|
||||
}
|
||||
fj := forgejo.ConfigFromEnv()
|
||||
|
||||
// Optional username allow-list.
|
||||
var want map[string]bool
|
||||
if strings.TrimSpace(*only) != "" {
|
||||
want = map[string]bool{}
|
||||
for _, n := range strings.Split(*only, ",") {
|
||||
if n = strings.ToLower(strings.TrimSpace(n)); n != "" {
|
||||
want[n] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
users, err := st.ListUsers(*limit)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "list users:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if !*send {
|
||||
fmt.Println("PREVIEW (no email sent, no passwords reset) — re-run with --send to execute")
|
||||
}
|
||||
if doGit && !fj.Configured() {
|
||||
fmt.Fprintln(os.Stderr, "warning: Forgejo not configured (AGENTBBS_FORGEJO_URL/_ADMIN_TOKEN) — skipping git")
|
||||
doGit = false
|
||||
}
|
||||
if doMail && !fe.Configured() {
|
||||
fmt.Fprintln(os.Stderr, "warning: forwardemail not configured (AGENTBBS_FORWARDEMAIL_API_KEY/_DOMAIN) — skipping mail")
|
||||
doMail = false
|
||||
}
|
||||
if *send && !smtp.Configured() {
|
||||
fmt.Fprintln(os.Stderr, "error: SMTP not configured (AGENTBBS_SMTP_HOST/_FROM) — cannot send email")
|
||||
os.Exit(1)
|
||||
}
|
||||
if !doGit && !doMail {
|
||||
fmt.Fprintln(os.Stderr, "nothing to do")
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
var targeted, gitOK, gitErr, mailOK, mailErr int
|
||||
for _, u := range users {
|
||||
if want != nil && !want[strings.ToLower(u.Name)] {
|
||||
continue
|
||||
}
|
||||
if !u.EmailVerified || u.Email == "" || u.Banned {
|
||||
continue
|
||||
}
|
||||
targeted++
|
||||
|
||||
if doGit {
|
||||
if !*send {
|
||||
fmt.Printf(" [git] %-20s -> %s (reset password + email %s)\n", u.Name, fj.LoginURL(), u.Email)
|
||||
} else {
|
||||
created, pw, err := fj.EnsureUserReset(u.Name, u.Email)
|
||||
if err != nil {
|
||||
gitErr++
|
||||
fmt.Fprintf(os.Stderr, " [git] %s: %v\n", u.Name, err)
|
||||
} else if err := smtp.Send(u.Email, "Your git.profullstack.com account is ready",
|
||||
gitWelcomeEmailBody(u.Name, pw, fj.LoginURL())); err != nil {
|
||||
gitErr++
|
||||
fmt.Fprintf(os.Stderr, " [git] %s: send: %v\n", u.Name, err)
|
||||
} else {
|
||||
gitOK++
|
||||
verb := "reset+emailed"
|
||||
if created {
|
||||
verb = "created+emailed"
|
||||
}
|
||||
fmt.Printf(" [git] %-20s %s -> %s\n", u.Name, verb, u.Email)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if doMail {
|
||||
addr := fe.Address(u.Name)
|
||||
if !*send {
|
||||
fmt.Printf(" [mail] %-20s -> %s (ensure alias + email %s)\n", u.Name, addr, u.Email)
|
||||
} else {
|
||||
if err := fe.CreateAlias(u.Name, u.Email); err != nil {
|
||||
mailErr++
|
||||
fmt.Fprintf(os.Stderr, " [mail] %s: alias: %v\n", u.Name, err)
|
||||
} else if err := smtp.Send(u.Email, "Your "+fe.Domain+" mailbox is ready",
|
||||
mailWelcomeEmailBody(u.Name, addr, fe.WebmailURL())); err != nil {
|
||||
mailErr++
|
||||
fmt.Fprintf(os.Stderr, " [mail] %s: send: %v\n", u.Name, err)
|
||||
} else {
|
||||
mailOK++
|
||||
fmt.Printf(" [mail] %-20s ensured+emailed -> %s\n", u.Name, addr)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Printf("\n%d verified account(s) targeted.\n", targeted)
|
||||
if *send {
|
||||
fmt.Printf("git: %d sent, %d failed\nmail: %d sent, %d failed\n", gitOK, gitErr, mailOK, mailErr)
|
||||
if gitErr > 0 || mailErr > 0 {
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue