|
|
|
@@ -294,7 +294,8 @@ func (s *Store) SaveSettings(ctx context.Context, actor string, input SettingsIn
|
|
|
|
|
}
|
|
|
|
|
var current int64
|
|
|
|
|
var sealed []byte
|
|
|
|
|
err = tx.QueryRow(ctx, `SELECT revision,smtp_password_sealed FROM qa_weekly_email_settings WHERE tenant_key=$1 FOR UPDATE`, s.tenant).Scan(¤t, &sealed)
|
|
|
|
|
var passwordRevision int64
|
|
|
|
|
err = tx.QueryRow(ctx, `SELECT revision,smtp_password_sealed,password_revision FROM qa_weekly_email_settings WHERE tenant_key=$1 FOR UPDATE`, s.tenant).Scan(¤t, &sealed, &passwordRevision)
|
|
|
|
|
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
|
|
|
|
return Settings{}, ErrUnavailable
|
|
|
|
|
}
|
|
|
|
@@ -304,16 +305,17 @@ func (s *Store) SaveSettings(ctx context.Context, actor string, input SettingsIn
|
|
|
|
|
next := current + 1
|
|
|
|
|
switch {
|
|
|
|
|
case normalized.ClearPassword:
|
|
|
|
|
sealed = nil
|
|
|
|
|
sealed, passwordRevision = nil, 0
|
|
|
|
|
case strings.TrimSpace(normalized.Password) != "":
|
|
|
|
|
if sealed, err = s.seal(normalized.Password, next); err != nil {
|
|
|
|
|
return Settings{}, err
|
|
|
|
|
}
|
|
|
|
|
passwordRevision = next
|
|
|
|
|
}
|
|
|
|
|
if _, err = tx.Exec(ctx, `INSERT INTO qa_weekly_email_settings(tenant_key,smtp_host,smtp_port,smtp_username,smtp_password_sealed,from_address,recipients,cc_recipients,review_address,send_weekday,send_hour,enabled,revision,updated_by,updated_at)
|
|
|
|
|
VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,now())
|
|
|
|
|
ON CONFLICT (tenant_key) DO UPDATE SET smtp_host=excluded.smtp_host,smtp_port=excluded.smtp_port,smtp_username=excluded.smtp_username,smtp_password_sealed=excluded.smtp_password_sealed,from_address=excluded.from_address,recipients=excluded.recipients,cc_recipients=excluded.cc_recipients,review_address=excluded.review_address,send_weekday=excluded.send_weekday,send_hour=excluded.send_hour,enabled=excluded.enabled,revision=excluded.revision,updated_by=excluded.updated_by,updated_at=now()`,
|
|
|
|
|
s.tenant, normalized.Host, normalized.Port, normalized.Username, sealed, normalized.From, normalized.Recipients, normalized.Cc, normalized.Review, normalized.Weekday, normalized.Hour, normalized.Enabled, next, actor); err != nil {
|
|
|
|
|
if _, err = tx.Exec(ctx, `INSERT INTO qa_weekly_email_settings(tenant_key,smtp_host,smtp_port,smtp_username,smtp_password_sealed,from_address,recipients,cc_recipients,review_address,send_weekday,send_hour,enabled,revision,updated_by,updated_at,password_revision)
|
|
|
|
|
VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,now(),$15)
|
|
|
|
|
ON CONFLICT (tenant_key) DO UPDATE SET smtp_host=excluded.smtp_host,smtp_port=excluded.smtp_port,smtp_username=excluded.smtp_username,smtp_password_sealed=excluded.smtp_password_sealed,from_address=excluded.from_address,recipients=excluded.recipients,cc_recipients=excluded.cc_recipients,review_address=excluded.review_address,send_weekday=excluded.send_weekday,send_hour=excluded.send_hour,enabled=excluded.enabled,revision=excluded.revision,updated_by=excluded.updated_by,updated_at=now(),password_revision=excluded.password_revision`,
|
|
|
|
|
s.tenant, normalized.Host, normalized.Port, normalized.Username, sealed, normalized.From, normalized.Recipients, normalized.Cc, normalized.Review, normalized.Weekday, normalized.Hour, normalized.Enabled, next, actor, passwordRevision); err != nil {
|
|
|
|
|
return Settings{}, ErrUnavailable
|
|
|
|
|
}
|
|
|
|
|
if err = tx.Commit(ctx); err != nil {
|
|
|
|
@@ -637,10 +639,14 @@ func (s *Store) inlineImages(ctx context.Context, week string, html *string) ([]
|
|
|
|
|
|
|
|
|
|
func (s *Store) password(ctx context.Context, revision int64) (string, error) {
|
|
|
|
|
var sealed []byte
|
|
|
|
|
if err := s.pool.QueryRow(ctx, `SELECT smtp_password_sealed FROM qa_weekly_email_settings WHERE tenant_key=$1`, s.tenant).Scan(&sealed); err != nil {
|
|
|
|
|
var sealedAt int64
|
|
|
|
|
if err := s.pool.QueryRow(ctx, `SELECT smtp_password_sealed,password_revision FROM qa_weekly_email_settings WHERE tenant_key=$1`, s.tenant).Scan(&sealed, &sealedAt); err != nil {
|
|
|
|
|
return "", ErrUnavailable
|
|
|
|
|
}
|
|
|
|
|
return s.unseal(sealed, revision)
|
|
|
|
|
if sealedAt <= 0 {
|
|
|
|
|
sealedAt = revision
|
|
|
|
|
}
|
|
|
|
|
return s.unseal(sealed, sealedAt)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func renderReport(markdown string) (string, string) {
|
|
|
|
|