Browse Source

fix: s3 command ignore -tlsVerifyClientCert and -cacert.file arguments (#6547)

s3 command ignore tlsVerifyClientCert and cacert.file arguments from
command line. On startS3Server instead of use real values (in s3opt),
default values (from s3Options, always empty) are checked.

Now on right values are checked and if user provide this arguments
RequireAndVerifyClientCert is set and/or ca certificate is loaded.
pull/6551/head
Karol Będkowski 1 week ago
committed by GitHub
parent
commit
441614b386
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      weed/command/s3.go

4
weed/command/s3.go

@ -312,7 +312,7 @@ func (s3opt *S3Options) startS3Server() bool {
}
caCertPool := x509.NewCertPool()
if *s3Options.tlsCACertificate != "" {
if *s3opt.tlsCACertificate != "" {
// load CA certificate file and add it to list of client CAs
caCertFile, err := ioutil.ReadFile(*s3opt.tlsCACertificate)
if err != nil {
@ -322,7 +322,7 @@ func (s3opt *S3Options) startS3Server() bool {
}
clientAuth := tls.NoClientCert
if *s3Options.tlsVerifyClientCert {
if *s3opt.tlsVerifyClientCert {
clientAuth = tls.RequireAndVerifyClientCert
}

Loading…
Cancel
Save