1c3f244fc5
Current code allowed it wrongly to generate secret key upto 100 we should only use 100 as a value to validate but for generating it should be 40. Fixes #4470
140 lines
4.2 KiB
Go
140 lines
4.2 KiB
Go
/*
|
|
* Minio Cloud Storage, (C) 2015, 2016, 2017 Minio, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"crypto/rand"
|
|
"encoding/base64"
|
|
"errors"
|
|
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
const (
|
|
// Minimum length for Minio access key.
|
|
accessKeyMinLen = 5
|
|
|
|
// Maximum length for Minio access key.
|
|
accessKeyMaxLen = 20
|
|
|
|
// Minimum length for Minio secret key for both server and gateway mode.
|
|
secretKeyMinLen = 8
|
|
|
|
// Maximum secret key length for Minio, this
|
|
// is used when autogenerating new credentials.
|
|
secretKeyMaxLenMinio = 40
|
|
|
|
// Maximum secret key length allowed from client side
|
|
// caters for both server and gateway mode.
|
|
secretKeyMaxLen = 100
|
|
|
|
// Alpha numeric table used for generating access keys.
|
|
alphaNumericTable = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
|
|
|
// Total length of the alpha numeric table.
|
|
alphaNumericTableLen = byte(len(alphaNumericTable))
|
|
)
|
|
|
|
// Common errors generated for access and secret key validation.
|
|
var (
|
|
errInvalidAccessKeyLength = errors.New("Invalid access key, access key should be 5 to 20 characters in length")
|
|
errInvalidSecretKeyLength = errors.New("Invalid secret key, secret key should be 8 to 100 characters in length")
|
|
)
|
|
|
|
// isAccessKeyValid - validate access key for right length.
|
|
func isAccessKeyValid(accessKey string) bool {
|
|
return len(accessKey) >= accessKeyMinLen && len(accessKey) <= accessKeyMaxLen
|
|
}
|
|
|
|
// isSecretKeyValid - validate secret key for right length.
|
|
func isSecretKeyValid(secretKey string) bool {
|
|
return len(secretKey) >= secretKeyMinLen && len(secretKey) <= secretKeyMaxLen
|
|
}
|
|
|
|
// credential container for access and secret keys.
|
|
type credential struct {
|
|
AccessKey string `json:"accessKey,omitempty"`
|
|
SecretKey string `json:"secretKey,omitempty"`
|
|
secretKeyHash []byte
|
|
}
|
|
|
|
// IsValid - returns whether credential is valid or not.
|
|
func (cred credential) IsValid() bool {
|
|
return isAccessKeyValid(cred.AccessKey) && isSecretKeyValid(cred.SecretKey)
|
|
}
|
|
|
|
// Equals - returns whether two credentials are equal or not.
|
|
func (cred credential) Equal(ccred credential) bool {
|
|
if !ccred.IsValid() {
|
|
return false
|
|
}
|
|
|
|
if cred.secretKeyHash == nil {
|
|
secretKeyHash, err := bcrypt.GenerateFromPassword([]byte(cred.SecretKey), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
errorIf(err, "Unable to generate hash of given password")
|
|
return false
|
|
}
|
|
|
|
cred.secretKeyHash = secretKeyHash
|
|
}
|
|
|
|
return (cred.AccessKey == ccred.AccessKey &&
|
|
bcrypt.CompareHashAndPassword(cred.secretKeyHash, []byte(ccred.SecretKey)) == nil)
|
|
}
|
|
|
|
func createCredential(accessKey, secretKey string) (cred credential, err error) {
|
|
if !isAccessKeyValid(accessKey) {
|
|
err = errInvalidAccessKeyLength
|
|
} else if !isSecretKeyValid(secretKey) {
|
|
err = errInvalidSecretKeyLength
|
|
} else {
|
|
var secretKeyHash []byte
|
|
secretKeyHash, err = bcrypt.GenerateFromPassword([]byte(secretKey), bcrypt.DefaultCost)
|
|
if err == nil {
|
|
cred.AccessKey = accessKey
|
|
cred.SecretKey = secretKey
|
|
cred.secretKeyHash = secretKeyHash
|
|
}
|
|
}
|
|
|
|
return cred, err
|
|
}
|
|
|
|
// Initialize a new credential object
|
|
func mustGetNewCredential() credential {
|
|
// Generate access key.
|
|
keyBytes := make([]byte, accessKeyMaxLen)
|
|
_, err := rand.Read(keyBytes)
|
|
fatalIf(err, "Unable to generate access key.")
|
|
for i := 0; i < accessKeyMaxLen; i++ {
|
|
keyBytes[i] = alphaNumericTable[keyBytes[i]%alphaNumericTableLen]
|
|
}
|
|
accessKey := string(keyBytes)
|
|
|
|
// Generate secret key.
|
|
keyBytes = make([]byte, secretKeyMaxLenMinio)
|
|
_, err = rand.Read(keyBytes)
|
|
fatalIf(err, "Unable to generate secret key.")
|
|
secretKey := string([]byte(base64.StdEncoding.EncodeToString(keyBytes))[:secretKeyMaxLenMinio])
|
|
|
|
cred, err := createCredential(accessKey, secretKey)
|
|
fatalIf(err, "Unable to generate new credential.")
|
|
|
|
return cred
|
|
}
|