ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-06 09:16:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow mdmctl config set without args (#421)

Browse Source
This commit is contained in:
Scott Knight
2018-05-27 13:08:14 -04:00
committed by Victor Vrantchan
parent 4283b5a76e
commit be837649b3
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cmd/mdmctl/config.go
View File

@@ -138,11 +138,17 @@ func setCmd(args []string) error {
return err
}
if flagset.NFlag() == 0 {
flagset.Usage()
os.Exit(1)
}
cfg := new(ServerConfig)
if *flToken != "" {
cfg.APIToken = *flToken
if *flToken == "" {
return errors.New("bad input: api-token must be provided.")
}
cfg.APIToken = *flToken
validatedURL, err := validateServerURL(*flServerURL)
if err != nil {
@@ -182,20 +188,22 @@ func migrateCmd(args []string) error {
}
func validateServerURL(serverURL string) (string, error) {
if serverURL != "" {
if !(strings.HasPrefix(serverURL, "http") ||
strings.HasPrefix(serverURL, "https")) {
serverURL = "https://" + serverURL
}
u, err := url.Parse(serverURL)
if err != nil {
return "", err
}
u.Path = "/"
serverURL = u.String()
if serverURL == "" {
return serverURL, errors.New("bad input: server-url must be provided.")
}
return serverURL, nil
if !(strings.HasPrefix(serverURL, "http") ||
strings.HasPrefix(serverURL, "https")) {
serverURL = "https://" + serverURL
}
u, err := url.Parse(serverURL)
if err != nil {
return "", err
}
u.Path = "/"
serverURL = u.String()
return serverURL, nil
}
func clientConfigPath() (string, error) {
@@ -256,6 +264,9 @@ func switchServerConfig(name string) error {
if err != nil {
return err
}
if _, ok := clientCfg.Servers[name]; !ok {
return fmt.Errorf("no server named \"%s\" found", name)
}
clientCfg.Active = name
return saveClientConfig(clientCfg)
}