minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2025-11-28 08:03:56 +03:00
Code Activity

improve signature probe avoid repeated code (#3169)

Browse Source
This commit is contained in:
Harshavardhana
2020-04-16 11:45:28 -07:00
committed by GitHub
parent 68b638f2f9
commit 91ca683b03
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README_zh_CN.md
View File

@@ -92,7 +92,7 @@ make
添加一个或多个S3兼容的服务，请参考下面说明。`mc`将所有的配置信息都存储在``~/.mc/config.json``文件中。 添加一个或多个S3兼容的服务，请参考下面说明。`mc`将所有的配置信息都存储在``~/.mc/config.json``文件中。
``` ```
mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY> <API-SIGNATURE> mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY> [--api API-SIGNATURE]
``` ```
别名就是给你的云存储服务起了一个短点的外号。S3 endpoint,access key和secret key是你的云存储服务提供的。API签名是可选参数，默认情况下，它被设置为"S3v4"。 别名就是给你的云存储服务起了一个短点的外号。S3 endpoint,access key和secret key是你的云存储服务提供的。API签名是可选参数，默认情况下，它被设置为"S3v4"。
@@ -101,21 +101,21 @@ mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY
从MinIO服务获得URL、access key和secret key。 从MinIO服务获得URL、access key和secret key。
``` ```
mc config host add minio http://192.168.1.51 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4 mc config host add minio http://192.168.1.51 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v4
``` ```
### 示例-Amazon S3云存储 ### 示例-Amazon S3云存储
参考[AWS Credentials指南](http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html)获取你的AccessKeyID和SecretAccessKey。 参考[AWS Credentials指南](http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html)获取你的AccessKeyID和SecretAccessKey。
``` ```
mc config host add s3 https://s3.amazonaws.com BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4 mc config host add s3 https://s3.amazonaws.com BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v4
``` ```
### 示例-Google云存储 ### 示例-Google云存储
参考[Google Credentials Guide](https://cloud.google.com/storage/docs/migrating?hl=en#keys)获取你的AccessKeyID和SecretAccessKey。 参考[Google Credentials Guide](https://cloud.google.com/storage/docs/migrating?hl=en#keys)获取你的AccessKeyID和SecretAccessKey。
``` ```
mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v2 mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v2
``` ```
注意：Google云存储只支持旧版签名版本V2，所以你需要选择S3v2。 注意：Google云存储只支持旧版签名版本V2，所以你需要选择S3v2。

48
cmd/config-host-add.go
View File

@@ -26,6 +26,7 @@ import (
"github.com/fatih/color" "github.com/fatih/color"
"github.com/minio/cli" "github.com/minio/cli"
"github.com/minio/mc/pkg/probe" "github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v6"
"github.com/minio/minio/pkg/console" "github.com/minio/minio/pkg/console"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
) )
@@ -166,39 +167,44 @@ func probeS3Signature(accessKey, secretKey, url string) (string, *probe.Error) {
Insecure: globalInsecure, Insecure: globalInsecure,
AccessKey: accessKey, AccessKey: accessKey,
SecretKey: secretKey, SecretKey: secretKey,
Signature: "s3v4",
HostURL: urlJoinPath(url, probeBucketName), HostURL: urlJoinPath(url, probeBucketName),
Debug: globalDebug, Debug: globalDebug,
} }
probeSignatureType := func(stype string) (string, *probe.Error) {
s3Config.Signature = stype
s3Client, err := S3New(s3Config) s3Client, err := S3New(s3Config)
if err != nil { if err != nil {
return "", err return "", err
} }
if _, err = s3Client.Stat(false, false, false, nil); err != nil { if _, err := s3Client.Stat(false, false, false, nil); err != nil {
switch err.ToGoError().(type) { e := err.ToGoError()
case BucketDoesNotExist: if _, ok := e.(BucketDoesNotExist); ok {
// Bucket doesn't exist, means signature probing worked V4. // Bucket doesn't exist, means signature probing worked successfully.
default: return stype, nil
// Attempt with signature v2, since v4 seem to have failed.
s3Config.Signature = "s3v2"
s3Client, err = S3New(s3Config)
if err != nil {
return "", err
}
if _, err = s3Client.Stat(false, false, false, nil); err != nil {
switch err.ToGoError().(type) {
case BucketDoesNotExist:
// Bucket doesn't exist, means signature probing worked with V2.
default:
return "", err
}
}
} }
// AccessDenied means Stat() is not allowed but credentials are valid.
// AccessDenied is only returned when policy doesn't allow HeadBucket
// operations.
if minio.ToErrorResponse(err.ToGoError()).Code == "AccessDenied" {
return stype, nil
} }
return s3Config.Signature, nil // For any other errors we fail.
return "", err.Trace(s3Config.Signature)
}
return stype, nil
}
stype, err := probeSignatureType("s3v4")
if err != nil {
if stype, err = probeSignatureType("s3v2"); err != nil {
return "", err.Trace("s3v4", "s3v2")
}
return stype, nil
}
return stype, nil
} }
// BuildS3Config constructs an S3 Config and does // BuildS3Config constructs an S3 Config and does

8
docs/zh_CN/minio-client-complete-guide.md
View File

@@ -110,7 +110,7 @@ mc.exe --help
#### 使用 #### 使用
``` ```
mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY> <API-SIGNATURE> mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY> [--api API-SIGNATURE]
``` ```
别名就是给你的云存储服务起了一个短点的外号。S3 endpoint,access key和secret key是你的云存储服务提供的。API签名是可选参数，默认情况下，它被设置为"S3v4"。 别名就是给你的云存储服务起了一个短点的外号。S3 endpoint,access key和secret key是你的云存储服务提供的。API签名是可选参数，默认情况下，它被设置为"S3v4"。
@@ -120,21 +120,21 @@ mc config host add <ALIAS> <YOUR-S3-ENDPOINT> <YOUR-ACCESS-KEY> <YOUR-SECRET-KEY
``` ```
mc config host add minio http://192.168.1.51 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4 mc config host add minio http://192.168.1.51 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v4
``` ```
### 示例-Amazon S3云存储 ### 示例-Amazon S3云存储
参考[AWS Credentials指南](http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html)获取你的AccessKeyID和SecretAccessKey。 参考[AWS Credentials指南](http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html)获取你的AccessKeyID和SecretAccessKey。
``` ```
mc config host add s3 https://s3.amazonaws.com BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4 mc config host add s3 https://s3.amazonaws.com BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v4
``` ```
### 示例-Google云存储 ### 示例-Google云存储
参考[Google Credentials Guide](https://cloud.google.com/storage/docs/migrating?hl=en#keys)获取你的AccessKeyID和SecretAccessKey。 参考[Google Credentials Guide](https://cloud.google.com/storage/docs/migrating?hl=en#keys)获取你的AccessKeyID和SecretAccessKey。
``` ```
mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v2 mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 --api s3v2
``` ```
注意：Google云存储只支持旧版签名版本V2，所以你需要选择S3v2。 注意：Google云存储只支持旧版签名版本V2，所以你需要选择S3v2。