85f2b74cfd
Creds don't require secretKeyHash to be calculated everytime, cache it instead and re-use. This is an optimization for bcrypt. Relevant results from the benchmark done locally, negative value means improvement in this scenario. ``` benchmark old ns/op new ns/op delta BenchmarkAuthenticateNode-4 160590992 80125647 -50.11% BenchmarkAuthenticateWeb-4 160556692 80432144 -49.90% benchmark old allocs new allocs delta BenchmarkAuthenticateNode-4 87 75 -13.79% BenchmarkAuthenticateWeb-4 87 75 -13.79% benchmark old bytes new bytes delta BenchmarkAuthenticateNode-4 15222 9785 -35.72% BenchmarkAuthenticateWeb-4 15222 9785 -35.72% ```
107 lines
3 KiB
Go
107 lines
3 KiB
Go
/*
|
|
* Minio Cloud Storage, (C) 2015, 2016 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"
|
|
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
const (
|
|
accessKeyMinLen = 5
|
|
accessKeyMaxLen = 20
|
|
secretKeyMinLen = 8
|
|
secretKeyMaxLen = 40
|
|
|
|
alphaNumericTable = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
|
alphaNumericTableLen = byte(len(alphaNumericTable))
|
|
)
|
|
|
|
func mustGetAccessKey() string {
|
|
keyBytes := make([]byte, accessKeyMaxLen)
|
|
if _, err := rand.Read(keyBytes); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
for i := 0; i < accessKeyMaxLen; i++ {
|
|
keyBytes[i] = alphaNumericTable[keyBytes[i]%alphaNumericTableLen]
|
|
}
|
|
|
|
return string(keyBytes)
|
|
}
|
|
|
|
func mustGetSecretKey() string {
|
|
keyBytes := make([]byte, secretKeyMaxLen)
|
|
if _, err := rand.Read(keyBytes); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return string([]byte(base64.StdEncoding.EncodeToString(keyBytes))[:secretKeyMaxLen])
|
|
}
|
|
|
|
// 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 `json:"secretKeyHash,omitempty"`
|
|
}
|
|
|
|
// Generate a bcrypt hashed key for input secret key.
|
|
func mustGetHashedSecretKey(secretKey string) []byte {
|
|
hashedSecretKey, err := bcrypt.GenerateFromPassword([]byte(secretKey), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return hashedSecretKey
|
|
}
|
|
|
|
// Initialize a new credential object.
|
|
func newCredential() credential {
|
|
secretKey := mustGetSecretKey()
|
|
accessKey := mustGetAccessKey()
|
|
|
|
secretHash := mustGetHashedSecretKey(secretKey)
|
|
return credential{accessKey, secretKey, secretHash}
|
|
}
|
|
|
|
// Converts accessKey and secretKeys into credential object which
|
|
// contains bcrypt secret key hash for future validation.
|
|
func getCredential(accessKey, secretKey string) (credential, error) {
|
|
if !isAccessKeyValid(accessKey) {
|
|
return credential{}, errInvalidAccessKeyLength
|
|
}
|
|
|
|
if !isSecretKeyValid(secretKey) {
|
|
return credential{}, errInvalidSecretKeyLength
|
|
}
|
|
|
|
secretHash := mustGetHashedSecretKey(secretKey)
|
|
return credential{accessKey, secretKey, secretHash}, nil
|
|
}
|