kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a9852794af into 18a0df505b

This commit is contained in:
Robert Szulist 2026-06-27 14:53:10 +02:00 committed by GitHub
parent 18a0df505b a9852794af
commit e94517ba83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/files/filehandling.go
View File

@ -21,6 +21,7 @@ import (
"context"
"errors"
"fmt"
"net/http"
"os"
"testing"
"time"
@ -45,6 +46,16 @@ func setDefaultLocalConfig() {
config.FilesBasePath.Set(config.ResolvePath(config.FilesBasePath.GetString()))
}
// Wrap Signer to remove header
type gcsHttpSigner struct {
wrapped s3.HTTPSignerV4
}
func (s *gcsHttpSigner) SignHTTP(ctx context.Context, credentials aws.Credentials, req *http.Request, payloadHash string, service string, region string, signingTime time.Time, optFns ...func(*v4.SignerOptions)) error {
req.Header.Del("Accept-Encoding")
return s.wrapped.SignHTTP(ctx, credentials, req, payloadHash, service, region, signingTime, optFns...)
}
// initS3FileHandler initializes the S3 file backend
func initS3FileHandler() error {
// Get S3 configuration
@ -80,6 +91,10 @@ func initS3FileHandler() error {
client := s3.NewFromConfig(cfg, func(o *s3.Options) {
o.BaseEndpoint = aws.String(endpoint)
o.UsePathStyle = config.FilesS3UsePathStyle.GetBool()
if endpoint == "https://storage.googleapis.com" {
o.HTTPSignerV4 = &gcsHttpSigner{wrapped: o.HTTPSignerV4}
cfg.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
}
if config.FilesS3DisableSigning.GetBool() {
o.APIOptions = append(o.APIOptions, v4.SwapComputePayloadSHA256ForUnsignedPayloadMiddleware)
}