diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2025-04-07 21:45:49 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-07 09:45:49 -0700 |
| commit | 4dca59ed276f90fea1f79cf72cdeb23371f39ba8 (patch) | |
| tree | 2bcfa3c0f2ce087356377d6a6c8edda781519968 | |
| parent | cc67a0370c60a3fd5aa582c9fe677bb35a3331ae (diff) | |
| download | seaweedfs-4dca59ed276f90fea1f79cf72cdeb23371f39ba8.tar.xz seaweedfs-4dca59ed276f90fea1f79cf72cdeb23371f39ba8.zip | |
[filer] void panic if s3opt.tlsCACertificate is nill (#6685)
* fix issues/6684
* add s3.cacert.file option for filer
| -rw-r--r-- | weed/command/filer.go | 1 | ||||
| -rw-r--r-- | weed/command/s3.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index 55ea1169d..1a341ac69 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -114,6 +114,7 @@ func init() { filerS3Options.dataCenter = cmdFiler.Flag.String("s3.dataCenter", "", "prefer to read and write to volumes in this data center") filerS3Options.tlsPrivateKey = cmdFiler.Flag.String("s3.key.file", "", "path to the TLS private key file") filerS3Options.tlsCertificate = cmdFiler.Flag.String("s3.cert.file", "", "path to the TLS certificate file") + filerS3Options.tlsCACertificate = cmdFiler.Flag.String("s3.cacert.file", "", "path to the TLS CA certificate file") filerS3Options.config = cmdFiler.Flag.String("s3.config", "", "path to the config file") filerS3Options.auditLogConfig = cmdFiler.Flag.String("s3.auditLogConfig", "", "path to the audit log config file") filerS3Options.allowEmptyFolder = cmdFiler.Flag.Bool("s3.allowEmptyFolder", true, "allow empty folders") diff --git a/weed/command/s3.go b/weed/command/s3.go index 84042b3e0..06eb5529b 100644 --- a/weed/command/s3.go +++ b/weed/command/s3.go @@ -312,7 +312,7 @@ func (s3opt *S3Options) startS3Server() bool { } caCertPool := x509.NewCertPool() - if *s3opt.tlsCACertificate != "" { + if s3opt.tlsCACertificate != nil && *s3opt.tlsCACertificate != "" { // load CA certificate file and add it to list of client CAs caCertFile, err := ioutil.ReadFile(*s3opt.tlsCACertificate) if err != nil { |