3592a03f15
Fixes issue where token expiration time from config file was not saved to database during initial setup, causing Docker deployments to ignore the tokenExpirationTime setting. Changes: - Add TokenExpirationTime to quick setup initialization (cmd/root.go) - Add TokenExpirationTime to config init command (cmd/config_init.go) - Add token-expiration-time support to config set command (cmd/config_set.go) - Display token expiration time in config cat output (cmd/config.go) All initialization paths now properly read and save token expiration settings from config files, environment variables, and CLI flags. Fixes #3718, #3150, #2554, #2553 Related to #2753
129 lines
3.4 KiB
Go
129 lines
3.4 KiB
Go
package cmd
|
|
|
|
import (
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
func init() {
|
|
configCmd.AddCommand(configSetCmd)
|
|
addConfigFlags(configSetCmd.Flags())
|
|
}
|
|
|
|
var configSetCmd = &cobra.Command{
|
|
Use: "set",
|
|
Short: "Updates the configuration",
|
|
Long: `Updates the configuration. Set the flags for the options
|
|
you want to change. Other options will remain unchanged.`,
|
|
Args: cobra.NoArgs,
|
|
RunE: python(func(cmd *cobra.Command, _ []string, d *pythonData) error {
|
|
flags := cmd.Flags()
|
|
set, err := d.store.Settings.Get()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ser, err := d.store.Settings.GetServer()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
hasAuth := false
|
|
flags.Visit(func(flag *pflag.Flag) {
|
|
if err != nil {
|
|
return
|
|
}
|
|
switch flag.Name {
|
|
case "baseurl":
|
|
ser.BaseURL, err = getString(flags, flag.Name)
|
|
case "root":
|
|
ser.Root, err = getString(flags, flag.Name)
|
|
case "socket":
|
|
ser.Socket, err = getString(flags, flag.Name)
|
|
case "cert":
|
|
ser.TLSCert, err = getString(flags, flag.Name)
|
|
case "key":
|
|
ser.TLSKey, err = getString(flags, flag.Name)
|
|
case "address":
|
|
ser.Address, err = getString(flags, flag.Name)
|
|
case "port":
|
|
ser.Port, err = getString(flags, flag.Name)
|
|
case "log":
|
|
ser.Log, err = getString(flags, flag.Name)
|
|
case "token-expiration-time":
|
|
ser.TokenExpirationTime, err = getString(flags, flag.Name)
|
|
case "hide-login-button":
|
|
set.HideLoginButton, err = getBool(flags, flag.Name)
|
|
case "signup":
|
|
set.Signup, err = getBool(flags, flag.Name)
|
|
case "auth.method":
|
|
hasAuth = true
|
|
case "shell":
|
|
var shell string
|
|
shell, err = getString(flags, flag.Name)
|
|
set.Shell = convertCmdStrToCmdArray(shell)
|
|
case "create-user-dir":
|
|
set.CreateUserDir, err = getBool(flags, flag.Name)
|
|
case "minimum-password-length":
|
|
set.MinimumPasswordLength, err = getUint(flags, flag.Name)
|
|
case "branding.name":
|
|
set.Branding.Name, err = getString(flags, flag.Name)
|
|
case "branding.color":
|
|
set.Branding.Color, err = getString(flags, flag.Name)
|
|
case "branding.theme":
|
|
set.Branding.Theme, err = getString(flags, flag.Name)
|
|
case "branding.disableExternal":
|
|
set.Branding.DisableExternal, err = getBool(flags, flag.Name)
|
|
case "branding.disableUsedPercentage":
|
|
set.Branding.DisableUsedPercentage, err = getBool(flags, flag.Name)
|
|
case "branding.files":
|
|
set.Branding.Files, err = getString(flags, flag.Name)
|
|
case "file-mode":
|
|
set.FileMode, err = getMode(flags, flag.Name)
|
|
case "dir-mode":
|
|
set.DirMode, err = getMode(flags, flag.Name)
|
|
case "tus.chunkSize":
|
|
set.Tus.ChunkSize, err = flags.GetUint64(flag.Name)
|
|
case "tus.retryCount":
|
|
set.Tus.RetryCount, err = flags.GetUint16(flag.Name)
|
|
}
|
|
})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = getUserDefaults(flags, &set.Defaults, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// read the defaults
|
|
auther, err := d.store.Auth.Get(set.AuthMethod)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// check if there are new flags for existing auth method
|
|
set.AuthMethod, auther, err = getAuthentication(flags, hasAuth, set, auther)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = d.store.Auth.Save(auther)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = d.store.Settings.Save(set)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = d.store.Settings.SaveServer(ser)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return printSettings(ser, set, auther)
|
|
}, pythonConfig{}),
|
|
}
|