mirror of
https://github.com/navidrome/navidrome.git
synced 2026-10-08 10:27:08 +02:00
* refactor(persistence): adopt generic deluan/rest repository API Pin deluan/rest to the refactor branch. REST-facing repository methods take a context and return typed values. Drop DataStore.Resource and ResourceRepository; the native API names typed repositories directly through a per-request adapter that later commits remove. * refactor(persistence): base repository helpers take a context * refactor(persistence): LibraryRepository takes a context per call * refactor(persistence): PropertyRepository takes a context per call * refactor(persistence): UserPropsRepository takes a context per call * refactor(persistence): TranscodingRepository takes a context per call * refactor(persistence): ShareRepository takes a context per call * refactor(persistence): PlayerRepository takes a context per call * refactor(persistence): RadioRepository takes a context per call * refactor(persistence): PlayQueueRepository takes a context per call * refactor(persistence): Tag and Genre repositories take a context per call * refactor(persistence): PluginRepository takes a context per call * refactor(persistence): Scrobble repositories take a context per call * refactor(persistence): FolderRepository takes a context per call * refactor(persistence): Artwork repositories take a context per call * refactor(persistence): UserRepository takes a context per call * refactor(persistence): ArtistRepository takes a context per call ReadAll no longer rewrites the shared sort mappings for the role filter; it works on a per-call copy. * test(persistence): assert artist role sort sanitization in ReadAll * refactor(persistence): AlbumRepository takes a context per call * test(persistence): pass the test context to album repository helpers * refactor(persistence): MediaFileRepository takes a context per call * refactor(persistence): Playlist repositories take a context per call * refactor(persistence): build all repositories once per store * refactor(core): REST repository wrappers are built once * refactor(persistence): repositories are stateless Remove the context field from the base repository and the per-request REST adapter. Enable the containedctx linter so no repository can hold a request context again. * chore(lint): skip containedctx in test files * refactor: share simplifications from the stateless repositories sweep Add deleteOwnedAll on sqlRepository and use it in player/share Delete to remove the duplicated bulk-delete loop; have Share.Repository() return model.ShareRepository so subsonic sharing.go drops its repeated type assertions. * chore(core): assert REST wrappers implement Persistable * chore: reformat imports * perf(persistence): build repositories on first use Each transaction store used to construct all 21 repositories up front, paying for filter and sort mapping setup the block never touched. Fields are now sync.OnceValue thunks, so a store only builds what it uses. * fix(persistence): clean plugin references per deleted user A bulk user delete that fails on a later id had already removed the earlier rows but skipped their plugin cleanup. Cleanup now runs right after each successful delete. * fix(core): unload disabled plugins even when a user delete fails A bulk delete can fail on a later id after earlier users were removed and their plugins auto-disabled. The wrapper returned before unloading, leaving those plugins running until the next successful delete or a restart. * chore(deps): pin deluan/rest to v1.0.1 Replaces the pseudo-version of the refactor branch with the tagged release. REST error messages now name the bare type (Artist, not model.Artist). * test: use the spec context instead of context.Background() Replace the context.Background()/context.TODO() calls this branch added to tests with the spec's ctx, GinkgoT().Context(), or t/b.Context(), so repository calls are bound to the running spec's lifetime. * test: declare the spec context once per Describe Set ctx from GinkgoT().Context() first in each top-level BeforeEach and reuse it, building user contexts on top of it instead of repeating inline calls.
475 lines
12 KiB
Go
475 lines
12 KiB
Go
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"encoding/csv"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/Masterminds/squirrel"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/spf13/cobra"
|
|
"golang.org/x/term"
|
|
)
|
|
|
|
var (
|
|
email string
|
|
libraryIds []int
|
|
name string
|
|
|
|
removeEmail bool
|
|
removeName bool
|
|
setAdmin bool
|
|
setPassword bool
|
|
setRegularUser bool
|
|
)
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(userRoot)
|
|
|
|
userCreateCommand.Flags().StringVarP(&userID, "username", "u", "", "username")
|
|
|
|
userCreateCommand.Flags().StringVarP(&email, "email", "e", "", "New user email")
|
|
userCreateCommand.Flags().IntSliceVarP(&libraryIds, "library-ids", "i", []int{}, "Comma-separated list of library IDs. Set the user's accessible libraries. If empty, the user can access all libraries. This is incompatible with admin, as admin can always access all libraries")
|
|
|
|
userCreateCommand.Flags().BoolVarP(&setAdmin, "admin", "a", false, "If set, make the user an admin. This user will have access to every library")
|
|
userCreateCommand.Flags().StringVar(&name, "name", "", "New user's name (this is separate from username used to log in)")
|
|
|
|
_ = userCreateCommand.MarkFlagRequired("username")
|
|
|
|
userRoot.AddCommand(userCreateCommand)
|
|
|
|
userDeleteCommand.Flags().StringVarP(&userID, "user", "u", "", "username or id")
|
|
_ = userDeleteCommand.MarkFlagRequired("user")
|
|
userRoot.AddCommand(userDeleteCommand)
|
|
|
|
userEditCommand.Flags().StringVarP(&userID, "user", "u", "", "username or id")
|
|
|
|
userEditCommand.Flags().BoolVar(&setAdmin, "set-admin", false, "If set, make the user an admin")
|
|
userEditCommand.Flags().BoolVar(&setRegularUser, "set-regular", false, "If set, make the user a non-admin")
|
|
userEditCommand.MarkFlagsMutuallyExclusive("set-admin", "set-regular")
|
|
|
|
userEditCommand.Flags().BoolVar(&removeEmail, "remove-email", false, "If set, clear the user's email")
|
|
userEditCommand.Flags().StringVarP(&email, "email", "e", "", "New user email")
|
|
userEditCommand.MarkFlagsMutuallyExclusive("email", "remove-email")
|
|
|
|
userEditCommand.Flags().BoolVar(&removeName, "remove-name", false, "If set, clear the user's name")
|
|
userEditCommand.Flags().StringVar(&name, "name", "", "New user name (this is separate from username used to log in)")
|
|
userEditCommand.MarkFlagsMutuallyExclusive("name", "remove-name")
|
|
|
|
userEditCommand.Flags().BoolVar(&setPassword, "set-password", false, "If set, the user's new password will be prompted on the CLI")
|
|
|
|
userEditCommand.Flags().IntSliceVarP(&libraryIds, "library-ids", "i", []int{}, "Comma-separated list of library IDs. Set the user's accessible libraries by id")
|
|
|
|
_ = userEditCommand.MarkFlagRequired("user")
|
|
userRoot.AddCommand(userEditCommand)
|
|
|
|
userListCommand.Flags().StringVarP(&outputFormat, "format", "f", "csv", "output format [supported values: csv, json]")
|
|
userRoot.AddCommand(userListCommand)
|
|
}
|
|
|
|
var (
|
|
userRoot = &cobra.Command{
|
|
Use: "user",
|
|
Short: "Administer users",
|
|
Long: "Create, delete, list, or update users",
|
|
}
|
|
|
|
userCreateCommand = &cobra.Command{
|
|
Use: "create",
|
|
Aliases: []string{"c"},
|
|
Short: "Create a new user",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
runCreateUser(cmd.Context())
|
|
},
|
|
}
|
|
|
|
userDeleteCommand = &cobra.Command{
|
|
Use: "delete",
|
|
Aliases: []string{"d"},
|
|
Short: "Deletes an existing user",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
runDeleteUser(cmd.Context())
|
|
},
|
|
}
|
|
|
|
userEditCommand = &cobra.Command{
|
|
Use: "edit",
|
|
Aliases: []string{"e"},
|
|
Short: "Edit a user",
|
|
Long: "Edit the password, admin status, and/or library access",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
runUserEdit(cmd.Context())
|
|
},
|
|
}
|
|
|
|
userListCommand = &cobra.Command{
|
|
Use: "list",
|
|
Short: "List users",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
runUserList(cmd.Context())
|
|
},
|
|
}
|
|
)
|
|
|
|
func promptPassword() string {
|
|
for {
|
|
fmt.Print("Enter new password (press enter with no password to cancel): ")
|
|
// This cast is necessary for some platforms
|
|
password, err := term.ReadPassword(int(syscall.Stdin)) //nolint:unconvert
|
|
|
|
if err != nil {
|
|
log.Fatal("Error getting password", err)
|
|
}
|
|
|
|
fmt.Print("\nConfirm new password (press enter with no password to cancel): ")
|
|
confirmation, err := term.ReadPassword(int(syscall.Stdin)) //nolint:unconvert
|
|
|
|
if err != nil {
|
|
log.Fatal("Error getting password confirmation", err)
|
|
}
|
|
|
|
// clear the line.
|
|
fmt.Println()
|
|
|
|
pass := string(password)
|
|
confirm := string(confirmation)
|
|
|
|
if pass == "" {
|
|
return ""
|
|
}
|
|
|
|
if pass == confirm {
|
|
return pass
|
|
}
|
|
|
|
fmt.Println("Password and password confirmation do not match")
|
|
}
|
|
}
|
|
|
|
func libraryError(libraries model.Libraries) error {
|
|
ids := make([]int, len(libraries))
|
|
for idx, library := range libraries {
|
|
ids[idx] = library.ID
|
|
}
|
|
return fmt.Errorf("not all available libraries found. Requested ids: %v, Found libraries: %v", libraryIds, ids)
|
|
}
|
|
|
|
func runCreateUser(ctx context.Context) {
|
|
password := promptPassword()
|
|
if password == "" {
|
|
log.Fatal("Empty password provided, user creation cancelled")
|
|
}
|
|
|
|
user := model.User{
|
|
UserName: userID,
|
|
Email: email,
|
|
Name: name,
|
|
IsAdmin: setAdmin,
|
|
NewPassword: password,
|
|
}
|
|
|
|
if user.Name == "" {
|
|
user.Name = userID
|
|
}
|
|
|
|
ds, ctx := getAdminContext(ctx)
|
|
|
|
err := ds.WithTx(func(tx model.DataStore) error {
|
|
existingUser, err := tx.User().FindByUsername(ctx, userID)
|
|
if existingUser != nil {
|
|
return fmt.Errorf("existing user '%s'", userID)
|
|
}
|
|
|
|
if err != nil && !errors.Is(err, model.ErrNotFound) {
|
|
return fmt.Errorf("failed to check existing username: %w", err)
|
|
}
|
|
|
|
if len(libraryIds) > 0 && !setAdmin {
|
|
user.Libraries, err = tx.Library().GetAll(ctx, model.QueryOptions{Filters: squirrel.Eq{"id": libraryIds}})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(user.Libraries) != len(libraryIds) {
|
|
return libraryError(user.Libraries)
|
|
}
|
|
} else {
|
|
user.Libraries, err = tx.Library().GetAll(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err = tx.User().Put(ctx, &user)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
updatedIds := make([]int, len(user.Libraries))
|
|
for idx, lib := range user.Libraries {
|
|
updatedIds[idx] = lib.ID
|
|
}
|
|
|
|
err = tx.User().SetUserLibraries(ctx, user.ID, updatedIds)
|
|
return err
|
|
})
|
|
|
|
if err != nil {
|
|
log.Fatal(ctx, err)
|
|
}
|
|
|
|
log.Info(ctx, "Successfully created user", "id", user.ID, "username", user.UserName)
|
|
}
|
|
|
|
func runDeleteUser(ctx context.Context) {
|
|
ds, ctx := getAdminContext(ctx)
|
|
|
|
var err error
|
|
var user *model.User
|
|
|
|
err = ds.WithTx(func(tx model.DataStore) error {
|
|
count, err := tx.User().CountAll(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if count == 1 {
|
|
return errors.New("refusing to delete the last user")
|
|
}
|
|
|
|
user, err = getUser(ctx, userID, tx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return tx.User().Delete(ctx, user.ID)
|
|
})
|
|
|
|
if err != nil {
|
|
log.Fatal(ctx, "Failed to delete user", err)
|
|
}
|
|
|
|
log.Info(ctx, "Deleted user", "username", user.UserName)
|
|
}
|
|
|
|
func runUserEdit(ctx context.Context) {
|
|
ds, ctx := getAdminContext(ctx)
|
|
|
|
var err error
|
|
var user *model.User
|
|
changes := []string{}
|
|
|
|
err = ds.WithTx(func(tx model.DataStore) error {
|
|
var newLibraries model.Libraries
|
|
|
|
user, err = getUser(ctx, userID, tx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(libraryIds) > 0 && !setAdmin {
|
|
libraries, err := tx.Library().GetAll(ctx, model.QueryOptions{Filters: squirrel.Eq{"id": libraryIds}})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(libraries) != len(libraryIds) {
|
|
return libraryError(libraries)
|
|
}
|
|
|
|
newLibraries = libraries
|
|
changes = append(changes, "updated library ids")
|
|
}
|
|
|
|
if setAdmin && !user.IsAdmin {
|
|
libraries, err := tx.Library().GetAll(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
user.IsAdmin = true
|
|
user.Libraries = libraries
|
|
changes = append(changes, "set admin")
|
|
|
|
newLibraries = libraries
|
|
}
|
|
|
|
if setRegularUser && user.IsAdmin {
|
|
user.IsAdmin = false
|
|
changes = append(changes, "set regular user")
|
|
}
|
|
|
|
if setPassword {
|
|
password := promptPassword()
|
|
|
|
if password != "" {
|
|
user.NewPassword = password
|
|
changes = append(changes, "updated password")
|
|
}
|
|
}
|
|
|
|
if email != "" && email != user.Email {
|
|
user.Email = email
|
|
changes = append(changes, "updated email")
|
|
} else if removeEmail && user.Email != "" {
|
|
user.Email = ""
|
|
changes = append(changes, "removed email")
|
|
}
|
|
|
|
if name != "" && name != user.Name {
|
|
user.Name = name
|
|
changes = append(changes, "updated name")
|
|
} else if removeName && user.Name != "" {
|
|
user.Name = ""
|
|
changes = append(changes, "removed name")
|
|
}
|
|
|
|
if len(changes) == 0 {
|
|
return nil
|
|
}
|
|
|
|
err := tx.User().Put(ctx, user)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(newLibraries) > 0 {
|
|
updatedIds := make([]int, len(newLibraries))
|
|
for idx, lib := range newLibraries {
|
|
updatedIds[idx] = lib.ID
|
|
}
|
|
|
|
err := tx.User().SetUserLibraries(ctx, user.ID, updatedIds)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
})
|
|
|
|
if err != nil {
|
|
log.Fatal(ctx, "Failed to update user", err)
|
|
}
|
|
|
|
if len(changes) == 0 {
|
|
log.Info(ctx, "No changes for user", "user", user.UserName)
|
|
} else {
|
|
log.Info(ctx, "Updated user", "user", user.UserName, "changes", strings.Join(changes, ", "))
|
|
}
|
|
}
|
|
|
|
type displayLibrary struct {
|
|
ID int `json:"id"`
|
|
Path string `json:"path"`
|
|
}
|
|
|
|
type displayUser struct {
|
|
Id string `json:"id"`
|
|
Username string `json:"username"`
|
|
Name string `json:"name"`
|
|
Email string `json:"email"`
|
|
Admin bool `json:"admin"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
UpdatedAt time.Time `json:"updatedAt"`
|
|
LastAccess *time.Time `json:"lastAccess"`
|
|
LastLogin *time.Time `json:"lastLogin"`
|
|
Libraries []displayLibrary `json:"libraries"`
|
|
}
|
|
|
|
func runUserList(ctx context.Context) {
|
|
if outputFormat != "csv" && outputFormat != "json" {
|
|
log.Fatal("Invalid output format. Must be one of csv, json", "format", outputFormat)
|
|
}
|
|
|
|
ds, ctx := getAdminContext(ctx)
|
|
|
|
userList, err := ds.User().ReadAll(ctx)
|
|
if err != nil {
|
|
log.Fatal(ctx, "Failed to retrieve users", err)
|
|
}
|
|
|
|
if outputFormat == "csv" {
|
|
w := csv.NewWriter(os.Stdout)
|
|
_ = w.Write([]string{
|
|
"user id",
|
|
"username",
|
|
"user's name",
|
|
"user email",
|
|
"admin",
|
|
"created at",
|
|
"updated at",
|
|
"last access",
|
|
"last login",
|
|
"libraries",
|
|
})
|
|
for _, user := range userList {
|
|
paths := make([]string, len(user.Libraries))
|
|
|
|
for idx, library := range user.Libraries {
|
|
paths[idx] = fmt.Sprintf("%d:%s", library.ID, library.Path)
|
|
}
|
|
|
|
var lastAccess, lastLogin string
|
|
|
|
if user.LastAccessAt != nil {
|
|
lastAccess = user.LastAccessAt.Format(time.RFC3339Nano)
|
|
} else {
|
|
lastAccess = "never"
|
|
}
|
|
|
|
if user.LastLoginAt != nil {
|
|
lastLogin = user.LastLoginAt.Format(time.RFC3339Nano)
|
|
} else {
|
|
lastLogin = "never"
|
|
}
|
|
|
|
_ = w.Write([]string{
|
|
user.ID,
|
|
user.UserName,
|
|
user.Name,
|
|
user.Email,
|
|
strconv.FormatBool(user.IsAdmin),
|
|
user.CreatedAt.Format(time.RFC3339Nano),
|
|
user.UpdatedAt.Format(time.RFC3339Nano),
|
|
lastAccess,
|
|
lastLogin,
|
|
fmt.Sprintf("'%s'", strings.Join(paths, "|")),
|
|
})
|
|
}
|
|
w.Flush()
|
|
} else {
|
|
users := make([]displayUser, len(userList))
|
|
for idx, user := range userList {
|
|
paths := make([]displayLibrary, len(user.Libraries))
|
|
|
|
for idx, library := range user.Libraries {
|
|
paths[idx].ID = library.ID
|
|
paths[idx].Path = library.Path
|
|
}
|
|
|
|
users[idx].Id = user.ID
|
|
users[idx].Username = user.UserName
|
|
users[idx].Name = user.Name
|
|
users[idx].Email = user.Email
|
|
users[idx].Admin = user.IsAdmin
|
|
users[idx].CreatedAt = user.CreatedAt
|
|
users[idx].UpdatedAt = user.UpdatedAt
|
|
users[idx].LastAccess = user.LastAccessAt
|
|
users[idx].LastLogin = user.LastLoginAt
|
|
users[idx].Libraries = paths
|
|
}
|
|
|
|
j, _ := json.Marshal(users)
|
|
fmt.Printf("%s\n", j)
|
|
}
|
|
}
|