mirror of
https://github.com/navidrome/navidrome.git
synced 2026-06-02 07:01:36 +00:00
* feat(conf): add Dir type with lazy directory creation Introduces the Dir type that wraps a directory path string and defers os.MkdirAll until the first call to Path() or MustPath(), using sync.Once to ensure the creation happens exactly once. Implements fmt.Stringer, encoding.TextMarshaler, and encoding.TextUnmarshaler for config integration. Includes Ginkgo/Gomega tests covering all methods and error paths. * refactor(conf): replace eager dir creation with lazy Dir type Change DataFolder, CacheFolder, Plugins.Folder, and Backup.Path from string to Dir. Remove all os.MkdirAll calls from Load() so directories are created lazily on first Path()/MustPath() call. Artwork folder creation was already handled at point-of-use in image_upload.go. Add SnapshotConfig() to conf package for safe test config save/restore that avoids copying sync.Once inside Dir fields. Fix copy-lock vet warning in nativeapi/config.go by marshalling pointer instead of value. * refactor(conf): migrate tests and db init to lazy Dir type Update all test files to use conf.NewDir() for Dir field assignments. Ensure DataFolder is created lazily when the database is first opened in db.Db(). Remove eager directory creation from conf.Load() tests. * fix(conf): address review findings for Dir type - Use os.ModePerm for DataFolder/CacheFolder (was 0700, should match original behavior). Add NewDirWithPerm for PluginsFolder (0700). - Use Path() instead of MustPath() in db.Prune() to avoid logFatal from background cron job. - Panic on marshal/unmarshal errors in SnapshotConfig (test helper). - Clean up redundant String()/MustPath() calls in plugin manager. - Remove dead code in dir_test.go. Signed-off-by: Deluan <deluan@navidrome.org> * fix(conf): add GoString to Dir for clean config dump output Implement fmt.GoStringer on Dir so pretty.Sprintf shows the path string instead of internal struct fields (sync.Once, perm, err). Also add TODO comment to configtest about removing the indirection. * fix(dir): improve error logging in MustPath method Signed-off-by: Deluan <deluan@navidrome.org> * refactor(tests): remove redundant tests for unwritable DataFolder and CacheFolder Signed-off-by: Deluan <deluan@navidrome.org> * fix(conf): address PR review feedback - Ensure Plugins.Folder always uses 0700, even when user-configured (previously only the derived default got restrictive permissions). - Create LogFile parent directory before opening, so LogFile paths inside a not-yet-created DataFolder work correctly. --------- Signed-off-by: Deluan <deluan@navidrome.org>
130 lines
3.6 KiB
Go
130 lines
3.6 KiB
Go
package nativeapi
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/log"
|
|
)
|
|
|
|
// sensitiveFieldsPartialMask contains configuration field names that should be redacted
|
|
// using partial masking (first and last character visible, middle replaced with *).
|
|
// For values with 7+ characters: "secretvalue123" becomes "s***********3"
|
|
// For values with <7 characters: "short" becomes "****"
|
|
// Add field paths using dot notation (e.g., "LastFM.ApiKey")
|
|
var sensitiveFieldsPartialMask = []string{
|
|
"LastFM.ApiKey",
|
|
"LastFM.Secret",
|
|
"Prometheus.MetricsPath",
|
|
"DevAutoLoginUsername",
|
|
}
|
|
|
|
// sensitiveFieldsFullMask contains configuration field names that should always be
|
|
// completely masked with "****" regardless of their length.
|
|
// Add field paths using dot notation for any fields that should never show any content.
|
|
var sensitiveFieldsFullMask = []string{
|
|
"DevAutoCreateAdminPassword",
|
|
"PasswordEncryptionKey",
|
|
"Prometheus.Password",
|
|
}
|
|
|
|
type configResponse struct {
|
|
ID string `json:"id"`
|
|
ConfigFile string `json:"configFile"`
|
|
Config map[string]any `json:"config"`
|
|
}
|
|
|
|
func redactValue(key string, value string) string {
|
|
// Return empty values as-is
|
|
if len(value) == 0 {
|
|
return value
|
|
}
|
|
|
|
// Check if this field should be fully masked
|
|
if slices.Contains(sensitiveFieldsFullMask, key) {
|
|
return "****"
|
|
}
|
|
|
|
// Check if this field should be partially masked
|
|
for _, field := range sensitiveFieldsPartialMask {
|
|
if field == key {
|
|
if len(value) < 7 {
|
|
return "****"
|
|
}
|
|
// Show first and last character with * in between
|
|
return string(value[0]) + strings.Repeat("*", len(value)-2) + string(value[len(value)-1])
|
|
}
|
|
}
|
|
|
|
// Return original value if not sensitive
|
|
return value
|
|
}
|
|
|
|
// applySensitiveFieldMasking recursively applies masking to sensitive fields in the configuration map
|
|
func applySensitiveFieldMasking(ctx context.Context, config map[string]any, prefix string) {
|
|
for key, value := range config {
|
|
fullKey := key
|
|
if prefix != "" {
|
|
fullKey = prefix + "." + key
|
|
}
|
|
|
|
switch v := value.(type) {
|
|
case map[string]any:
|
|
// Recursively process nested maps
|
|
applySensitiveFieldMasking(ctx, v, fullKey)
|
|
case string:
|
|
// Apply masking to string values
|
|
config[key] = redactValue(fullKey, v)
|
|
default:
|
|
// For other types (numbers, booleans, etc.), convert to string and check for masking
|
|
if str := fmt.Sprint(v); str != "" {
|
|
masked := redactValue(fullKey, str)
|
|
if masked != str {
|
|
// Only replace if masking was applied
|
|
config[key] = masked
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func getConfig(w http.ResponseWriter, r *http.Request) {
|
|
ctx := r.Context()
|
|
|
|
// Marshal the actual configuration struct to preserve original field names
|
|
configBytes, err := json.Marshal(conf.Server)
|
|
if err != nil {
|
|
log.Error(ctx, "Error marshaling config", err)
|
|
http.Error(w, "Internal server error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Unmarshal back to map to get the structure with proper field names
|
|
var configMap map[string]any
|
|
err = json.Unmarshal(configBytes, &configMap)
|
|
if err != nil {
|
|
log.Error(ctx, "Error unmarshaling config to map", err)
|
|
http.Error(w, "Internal server error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Apply sensitive field masking
|
|
applySensitiveFieldMasking(ctx, configMap, "")
|
|
|
|
resp := configResponse{
|
|
ID: "config",
|
|
ConfigFile: conf.Server.ConfigFile,
|
|
Config: configMap,
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
if err := json.NewEncoder(w).Encode(resp); err != nil {
|
|
log.Error(ctx, "Error encoding config response", err)
|
|
}
|
|
}
|