gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/seaweedfs/seaweedfs

Browse Source
This commit is contained in:
Chris Lu
2026-04-02 11:50:06 -07:00
parent 647b46bd8a 24805ff478
commit e93f4e3f39
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile.go_build
View File

@@ -51,7 +51,7 @@ COPY --from=builder /go/src/github.com/seaweedfs/seaweedfs/docker/entrypoint.sh
# Install dependencies and create non-root user # Install dependencies and create non-root user
RUN apk upgrade --no-cache zlib && \ RUN apk upgrade --no-cache zlib && \
apk add --no-cache fuse curl su-exec && \ apk add --no-cache fuse curl su-exec libgcc && \
addgroup -g 1000 seaweed && \ addgroup -g 1000 seaweed && \
adduser -D -u 1000 -G seaweed seaweed adduser -D -u 1000 -G seaweed seaweed

10
weed/s3api/s3_sse_c.go
View File

@@ -58,9 +58,9 @@ var (
// SSECustomerKey represents a customer-provided encryption key for SSE-C // SSECustomerKey represents a customer-provided encryption key for SSE-C
type SSECustomerKey struct { type SSECustomerKey struct {
Algorithm string Algorithm string
Key []byte Key []byte
KeyMD5 string KeyMD5 string
} }
// IsSSECRequest checks if the request contains SSE-C headers // IsSSECRequest checks if the request contains SSE-C headers
@@ -119,8 +119,8 @@ func validateAndParseSSECHeaders(algorithm, key, keyMD5 string) (*SSECustomerKey
sum := md5.Sum(keyBytes) sum := md5.Sum(keyBytes)
expectedMD5 := base64.StdEncoding.EncodeToString(sum[:]) expectedMD5 := base64.StdEncoding.EncodeToString(sum[:])
// Debug logging for MD5 validation // Debug logging for MD5 validation (never log key material)
glog.V(4).Infof("SSE-C MD5 validation: provided='%s', expected='%s', keyBytes=%x", keyMD5, expectedMD5, keyBytes) glog.V(4).Infof("SSE-C MD5 validation: provided='%s', expected='%s'", keyMD5, expectedMD5)
if keyMD5 != expectedMD5 { if keyMD5 != expectedMD5 {
glog.Errorf("SSE-C MD5 mismatch: provided='%s', expected='%s'", keyMD5, expectedMD5) glog.Errorf("SSE-C MD5 mismatch: provided='%s', expected='%s'", keyMD5, expectedMD5)