MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-25 12:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Validate access/secret keys found in the config file and enhance invalid keys messages (#3017)

Browse Source
This commit is contained in:
Anis Elleuch 2016-10-21 00:07:24 +01:00 committed by Harshavardhana
parent 0e2cd1a64d
commit c21ac80268
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/main.go
View File

@ -178,18 +178,18 @@ func Main() {
accessKey := os.Getenv("MINIO_ACCESS_KEY") accessKey := os.Getenv("MINIO_ACCESS_KEY")
secretKey := os.Getenv("MINIO_SECRET_KEY") secretKey := os.Getenv("MINIO_SECRET_KEY")
if accessKey != "" && secretKey != "" { if accessKey != "" && secretKey != "" {
if !isValidAccessKey.MatchString(accessKey) {
fatalIf(errInvalidArgument, "Invalid access key.")
}
if !isValidSecretKey.MatchString(secretKey) {
fatalIf(errInvalidArgument, "Invalid secret key.")
}
// Set new credentials. // Set new credentials.
serverConfig.SetCredential(credential{ serverConfig.SetCredential(credential{
AccessKeyID: accessKey, AccessKeyID: accessKey,
SecretAccessKey: secretKey, SecretAccessKey: secretKey,
}) })
} }
if !isValidAccessKey.MatchString(serverConfig.GetCredential().AccessKeyID) {
fatalIf(errInvalidArgument, "Invalid access key. Accept only a string starting with a alphabetic and containing from 5 to 20 characters.")
}
if !isValidSecretKey.MatchString(serverConfig.GetCredential().SecretAccessKey) {
fatalIf(errInvalidArgument, "Invalid secret key. Accept only a string containing from 8 to 40 characters.")
}
// Enable all loggers by now. // Enable all loggers by now.
enableLoggers() enableLoggers()