From d99f0983a00d87bd2be911bfa3f30dc6ec0784bd Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 22 Jan 2024 21:11:21 +0000 Subject: [PATCH] s3: add [objects]s3-insecure Disables TLS. Useful for local development. --- s3/middleware.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/s3/middleware.go b/s3/middleware.go index db6c70ea72a13b6d718de9115291675d61c1e9dd..6ae215d5a8a02bd0af59a8753f4a35330372ad6a 100644 --- a/s3/middleware.go +++ b/s3/middleware.go @@ -44,20 +44,28 @@ func NewClient(conf ini.File) (*minio.Client, error) { upstream, _ := conf.Get("objects", "s3-upstream") accessKey, _ := conf.Get("objects", "s3-access-key") secretKey, _ := conf.Get("objects", "s3-secret-key") + insecure, _ := conf.Get("objects", "s3-insecure") if upstream == "" || accessKey == "" || secretKey == "" { return nil, ErrDisabled } return minio.New(upstream, &minio.Options{ Creds: credentials.NewStaticV4(accessKey, secretKey, ""), - Secure: true, + Secure: insecure != "yes", }) } func URL(conf ini.File, bucket string) string { upstream, _ := conf.Get("objects", "s3-upstream") + insecure, _ := conf.Get("objects", "s3-insecure") if upstream == "" { return "" } - return "https://" + upstream + + proto := "https" + if insecure == "yes" { + proto = "http" + } + + return proto + "://" + upstream }