MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 21:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies for CVE fix x/net

Browse Source
This commit is contained in:
Harshavardhana
2025-03-12 22:29:51 -07:00
parent cccb37a5ac
commit 5e2eb372bf
15 changed files with 949 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/admin-handlers.go
View File

@@ -49,6 +49,7 @@ import (
"github.com/klauspost/compress/zip"
"github.com/minio/madmin-go/v3"
"github.com/minio/madmin-go/v3/estream"
"github.com/minio/madmin-go/v3/logger/log"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/dsync"
@@ -59,7 +60,6 @@ import (
"github.com/minio/minio/internal/kms"
"github.com/minio/minio/internal/logger"
"github.com/minio/mux"
"github.com/minio/pkg/v3/logger/message/log"
xnet "github.com/minio/pkg/v3/net"
"github.com/minio/pkg/v3/policy"
"github.com/secure-io/sio-go"

2
cmd/consolelogger.go
View File

@@ -25,11 +25,11 @@ import (
"sync/atomic"
"github.com/minio/madmin-go/v3"
"github.com/minio/madmin-go/v3/logger/log"
"github.com/minio/minio/internal/logger"
"github.com/minio/minio/internal/logger/target/console"
"github.com/minio/minio/internal/logger/target/types"
"github.com/minio/minio/internal/pubsub"
"github.com/minio/pkg/v3/logger/message/log"
xnet "github.com/minio/pkg/v3/net"
)

2
cmd/peer-rest-server.go
View File

@@ -37,6 +37,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/klauspost/compress/zstd"
"github.com/minio/madmin-go/v3"
"github.com/minio/madmin-go/v3/logger/log"
"github.com/minio/minio/internal/bucket/bandwidth"
b "github.com/minio/minio/internal/bucket/bandwidth"
"github.com/minio/minio/internal/event"
@@ -45,7 +46,6 @@ import (
"github.com/minio/minio/internal/logger"
"github.com/minio/minio/internal/pubsub"
"github.com/minio/mux"
"github.com/minio/pkg/v3/logger/message/log"
)
// To abstract a node over network.

11
cmd/post-policy-fan-out.go
View File

@@ -23,7 +23,7 @@ import (
"sync"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/s3utils"
"github.com/minio/minio-go/v7/pkg/tags"
"github.com/minio/minio/internal/crypto"
"github.com/minio/minio/internal/hash"
xhttp "github.com/minio/minio/internal/http"
@@ -81,7 +81,14 @@ func fanOutPutObject(ctx context.Context, bucket string, objectAPI ObjectLayer,
for k, v := range req.UserMetadata {
userDefined[k] = v
}
userDefined[xhttp.AmzObjectTagging] = s3utils.TagEncode(req.UserTags)
tgs, err := tags.NewTags(req.UserTags, true)
if err != nil {
errs[idx] = err
return
}
userDefined[xhttp.AmzObjectTagging] = tgs.String()
if opts.Kind != nil {
encrd, objectEncryptionKey, err := newEncryptReader(ctx, hr, opts.Kind, opts.KeyID, opts.Key, bucket, req.Key, userDefined, opts.KmsCtx)

2
cmd/utils.go
View File

@@ -45,6 +45,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/felixge/fgprof"
"github.com/minio/madmin-go/v3"
xaudit "github.com/minio/madmin-go/v3/logger/audit"
"github.com/minio/minio-go/v7"
miniogopolicy "github.com/minio/minio-go/v7/pkg/policy"
"github.com/minio/minio/internal/config"
@@ -62,7 +63,6 @@ import (
"github.com/minio/mux"
"github.com/minio/pkg/v3/certs"
"github.com/minio/pkg/v3/env"
xaudit "github.com/minio/pkg/v3/logger/message/audit"
xnet "github.com/minio/pkg/v3/net"
"golang.org/x/oauth2"
)