release / go (push) Successful in 1m54s
release / web (push) Failing after 5s
release / integration (push) Failing after 3m44s
release / govulncheck (push) Successful in 20s
release / Attach APK to the Release (tag releases only) (push) Canceled after 0s
release / Build + push container image (push) Canceled after 0s
release / Verify release artifacts (tag releases only) (push) Canceled after 0s
release / Build signed APK (push) Canceled after 19s
release / android (push) Canceled after 2m37s
Minstrel is now a viewer of the library it is pointed at. Finding, downloading and filing music moves out of it. Removed from the server: - the request flow (requests, approval, auto-approve) and the wanted list, follows, release profiles and release blocks; - searching indexers, the download clients, the importer, the album lifecycle and missing-file re-acquisition; - the catalogue's discography, search and art (the MusicBrainz release and track-list cache stays, for the duplicate resolver); - Discover: its suggestions of artists not in the library, snoozes, the candidate-artist tag enrichment and its tuning scope; - writes to acquisition tables from moving the library folder and from merging duplicates, the want-list join on Suspect sources, the sealing of acquisition credentials, and the release-group lookup only re-acquisition used. Settling a wrong-slot duplicate no longer sets the release aside: the copies go and their slots show as missing until a good copy is in the library. Removed from the web: Admin > Acquisition and Requests, /requests, /discover, Follow on the artist page, the auto-approve toggle, and the Collection's wanted-list tabs. The Collection is now the library's health: an overview, Reports, Duplicates, Suspect sources and Missing files. The README and docs no longer describe getting music. The tables stay for now; a later migration drops them. The request notification kinds and the Android screens are still to go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
112 lines
3.5 KiB
Go
112 lines
3.5 KiB
Go
package secret
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgxpool"
|
|
)
|
|
|
|
// Column is one database column that holds a sealed credential.
|
|
//
|
|
// Its Purpose ("table.column") is the key-derivation label every Seal and
|
|
// Open of that column passes. The owner a value is bound to is the row's key
|
|
// as text (KeyColumn::text), or "" for a single-row settings table.
|
|
type Column struct {
|
|
Table string
|
|
Column string
|
|
KeyColumn string
|
|
Singleton bool
|
|
}
|
|
|
|
// Purpose is the label Seal and Open take for this column.
|
|
func (c Column) Purpose() string { return c.Table + "." + c.Column }
|
|
|
|
// The sealed columns, and the purpose strings their callers pass. Every
|
|
// credential Minstrel stores for an outside system, or that must be read back
|
|
// in the clear, is listed here.
|
|
var (
|
|
AcoustIDAPIKey = Column{"acoustid_settings", "api_key", "id", true}
|
|
SMTPPassword = Column{"smtp_config", "password", "id", true}
|
|
ListenBrainzToken = Column{"users", "listenbrainz_token", "id", false}
|
|
SubsonicPassword = Column{"users", "subsonic_password", "id", false}
|
|
CoverArtAPIKey = Column{"cover_art_provider_settings", "api_key", "provider_id", false}
|
|
TagProviderAPIKey = Column{"tag_provider_settings", "api_key", "provider_id", false}
|
|
BackupSecretKey = Column{"backup_settings", "secret_key", "id", true}
|
|
)
|
|
|
|
// Columns is every sealed column, for SealStored and for anything that has to
|
|
// know which columns hold credentials (a backup leaves them out).
|
|
var Columns = []Column{
|
|
AcoustIDAPIKey, SMTPPassword, ListenBrainzToken, SubsonicPassword,
|
|
CoverArtAPIKey, TagProviderAPIKey, BackupSecretKey,
|
|
}
|
|
|
|
// Owner is the owner string for a row whose key is key. A single-row table's
|
|
// rows are owned by "".
|
|
func (c Column) Owner(key string) string {
|
|
if c.Singleton {
|
|
return ""
|
|
}
|
|
return key
|
|
}
|
|
|
|
// SealStored seals every value in Columns that is still stored in the clear,
|
|
// and returns how many it sealed. The server runs it at startup, after
|
|
// migrations and before anything reads a credential, so a database written
|
|
// before sealing existed is brought over in place. Each row is updated only
|
|
// if it still holds the value that was read, so a concurrent write wins.
|
|
func SealStored(ctx context.Context, pool *pgxpool.Pool) (int, error) {
|
|
total := 0
|
|
for _, c := range Columns {
|
|
n, err := sealColumn(ctx, pool, c)
|
|
total += n
|
|
if err != nil {
|
|
return total, fmt.Errorf("seal %s: %w", c.Purpose(), err)
|
|
}
|
|
}
|
|
return total, nil
|
|
}
|
|
|
|
func sealColumn(ctx context.Context, pool *pgxpool.Pool, c Column) (int, error) {
|
|
table := pgx.Identifier{c.Table}.Sanitize()
|
|
col := pgx.Identifier{c.Column}.Sanitize()
|
|
key := pgx.Identifier{c.KeyColumn}.Sanitize()
|
|
|
|
rows, err := pool.Query(ctx, fmt.Sprintf(
|
|
`SELECT %s::text, %s FROM %s WHERE %s IS NOT NULL AND %s <> '' AND %s NOT LIKE 'v1.%%'`,
|
|
key, col, table, col, col, col))
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
type pending struct{ key, plain string }
|
|
var todo []pending
|
|
for rows.Next() {
|
|
var p pending
|
|
if err := rows.Scan(&p.key, &p.plain); err != nil {
|
|
rows.Close()
|
|
return 0, err
|
|
}
|
|
todo = append(todo, p)
|
|
}
|
|
rows.Close()
|
|
if err := rows.Err(); err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
update := fmt.Sprintf(`UPDATE %s SET %s = $1 WHERE %s::text = $2 AND %s = $3`, table, col, key, col)
|
|
sealed := 0
|
|
for _, p := range todo {
|
|
v, err := Seal(c.Purpose(), c.Owner(p.key), p.plain)
|
|
if err != nil {
|
|
return sealed, err
|
|
}
|
|
if _, err := pool.Exec(ctx, update, v, p.key, p.plain); err != nil {
|
|
return sealed, err
|
|
}
|
|
sealed++
|
|
}
|
|
return sealed, nil
|
|
}
|