self-hosted/minio
self-hosted/minio
1
0
Fork 0
mirror of https://github.com/minio/minio synced 2024-07-21 02:14:35 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[GH-1240] main: Print keys after init and full server initialization.

Browse source 
Setting MINIO_ACCESS_KEY and MINIO_SECRET_KEY re-writes the values
in config properly, but the init message is not updated.

Fix it by delay printing keys until everything is properly
initialized.
This commit is contained in:
Harshavardhana 2016-03-17 20:00:11 -07:00
parent a729d02c31
commit 72d364cbf2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api-auth-utils.go
View file

@ -40,7 +40,7 @@ func isValidAccessKey(accessKeyID string) bool {
// isValidSecretKey - validate secret key
func isValidSecretKey(secretKeyID string) bool {
regex := regexp.MustCompile("^[a-zA-Z0-9\\-\\.\\_\\~]{40}$")
regex := regexp.MustCompile("^.{40}$")
return regex.MatchString(secretKeyID)
}

14
server-main.go
View file

@ -237,10 +237,6 @@ func initServer() (*configV2, *probe.Error) {
if err := setLogger(conf); err != nil {
return nil, err.Trace()
}
if conf != nil {
console.Println()
console.Println(accessKeys{conf})
}
return conf, nil
}
@ -342,15 +338,15 @@ func serverMain(c *cli.Context) {
address := c.GlobalString("address")
checkPortAvailability(getPort(address))
conf, err := initServer()
fatalIf(err.Trace(), "Failed to read config for minio.", nil)
certFile := c.GlobalString("cert")
keyFile := c.GlobalString("key")
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
fatalIf(probe.NewError(errInvalidArgument), "Both certificate and key are required to enable https.", nil)
}
conf, err := initServer()
fatalIf(err.Trace(), "Failed to read config for minio.", nil)
accessKey := os.Getenv("MINIO_ACCESS_KEY")
secretKey := os.Getenv("MINIO_SECRET_KEY")
if accessKey != "" && secretKey != "" {
@ -398,6 +394,10 @@ func serverMain(c *cli.Context) {
apiServer, err := configureServer(serverConfig)
errorIf(err.Trace(), "Failed to configure API server.", nil)
console.Println()
// Print access keys and region.
console.Println(accessKeys{conf})
console.Println("\nMinio Object Storage:")
printServerMsg(apiServer)