astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-08-09 15:53:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add logger command - also migrate from old config to newer config

Browse Source
This commit is contained in:
Harshavardhana
2015-10-20 00:33:53 -07:00
parent e8892a9f3c
commit 56003fded7
13 changed files with 538 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-signature.go
+12 -12
View File
@@ -105,17 +105,17 @@ func initSignatureV4(req *http.Request) (*fs.Signature, *probe.Error) {
if err != nil {
return nil, err.Trace()
}
authConfig, err := loadAuthConfig()
config, err := loadConfigV2()
if err != nil {
return nil, err.Trace()
}
authFields := strings.Split(strings.TrimSpace(authHeaderValue), ",")
signedHeaders := strings.Split(strings.Split(strings.TrimSpace(authFields[1]), "=")[1], ";")
signature := strings.Split(strings.TrimSpace(authFields[2]), "=")[1]
if authConfig.AccessKeyID == accessKeyID {
if config.Credentials.AccessKeyID == accessKeyID {
signature := &fs.Signature{
AccessKeyID: authConfig.AccessKeyID,
SecretAccessKey: authConfig.SecretAccessKey,
AccessKeyID: config.Credentials.AccessKeyID,
SecretAccessKey: config.Credentials.SecretAccessKey,
Signature: signature,
SignedHeaders: signedHeaders,
Request: req,
@@ -210,14 +210,14 @@ func initPostPresignedPolicyV4(formValues map[string]string) (*fs.Signature, *pr
if !isValidAccessKey(accessKeyID) {
return nil, probe.NewError(errAccessKeyIDInvalid)
}
authConfig, perr := loadAuthConfig()
config, perr := loadConfigV2()
if perr != nil {
return nil, perr.Trace()
}
if authConfig.AccessKeyID == accessKeyID {
if config.Credentials.AccessKeyID == accessKeyID {
signature := &fs.Signature{
AccessKeyID: authConfig.AccessKeyID,
SecretAccessKey: authConfig.SecretAccessKey,
AccessKeyID: config.Credentials.AccessKeyID,
SecretAccessKey: config.Credentials.SecretAccessKey,
Signature: formValues["X-Amz-Signature"],
PresignedPolicy: formValues["Policy"],
}
@@ -236,16 +236,16 @@ func initPresignedSignatureV4(req *http.Request) (*fs.Signature, *probe.Error) {
if !isValidAccessKey(accessKeyID) {
return nil, probe.NewError(errAccessKeyIDInvalid)
}
authConfig, err := loadAuthConfig()
config, err := loadConfigV2()
if err != nil {
return nil, err.Trace()
}
signedHeaders := strings.Split(strings.TrimSpace(req.URL.Query().Get("X-Amz-SignedHeaders")), ";")
signature := strings.TrimSpace(req.URL.Query().Get("X-Amz-Signature"))
if authConfig.AccessKeyID == accessKeyID {
if config.Credentials.AccessKeyID == accessKeyID {
signature := &fs.Signature{
AccessKeyID: authConfig.AccessKeyID,
SecretAccessKey: authConfig.SecretAccessKey,
AccessKeyID: config.Credentials.AccessKeyID,
SecretAccessKey: config.Credentials.SecretAccessKey,
Signature: signature,
SignedHeaders: signedHeaders,
Presigned: true,