Skip to content

Commit 3667fb7

Browse files
dvaldiviadvaldivia
committed
Pass Client IP address to MinIO on x-forwarded-for header
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent ee8fac8 commit 3667fb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+382
-590
lines changed

‎cluster/cluster.go

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎cluster/config.go

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎cluster/const.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎cmd/console/app_commands.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ func StartServer(ctx *cli.Context) error {
4141
}
4242

4343
xctx := context.Background()
44-
transport := restapi.PrepareSTSClientTransport(false)
45-
if err := logger.InitializeLogger(xctx, transport); err != nil {
44+
45+
transport := restapi.PrepareSTSClientTransport(false, restapi.LocalAddress)
46+
if err := logger.InitializeLogger(xctx, transport.Transport); err != nil {
4647
fmt.Println("error InitializeLogger", err)
4748
logger.CriticalIf(xctx, err)
4849
}

‎go.mod

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ require (
1919
github.com/jessevdk/go-flags v1.5.0
2020
github.com/klauspost/compress v1.16.5
2121
github.com/minio/cli v1.24.2
22-
github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651
2322
github.com/minio/highwayhash v1.0.2
2423
github.com/minio/kes v0.22.3
2524
github.com/minio/madmin-go/v2 v2.2.0
2625
github.com/minio/mc v0.0.0-20230526175537-0fac0e006eae
2726
github.com/minio/minio-go/v7 v7.0.55-0.20230525060734-b7836f021bfb
28-
github.com/minio/operator v0.0.0-20230228004026-ad024a9dffe5
2927
github.com/minio/pkg v1.6.5
3028
github.com/minio/selfupdate v0.6.0
3129
github.com/minio/websocket v1.6.0
@@ -42,10 +40,6 @@ require (
4240
// https://github.com/golang/go/issues/56152
4341
golang.org/x/text v0.9.0 // indirect
4442
gopkg.in/yaml.v2 v2.4.0 // indirect
45-
k8s.io/api v0.27.1 // indirect
46-
k8s.io/apimachinery v0.27.1 // indirect
47-
k8s.io/client-go v0.27.1
48-
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
4943
)
5044

5145
require (
@@ -66,30 +60,19 @@ require (
6660
github.com/davecgh/go-spew v1.1.1 // indirect
6761
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
6862
github.com/docker/go-units v0.5.0 // indirect
69-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
70-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7163
github.com/fatih/structs v1.1.0 // indirect
72-
github.com/fsnotify/fsnotify v1.6.0 // indirect
7364
github.com/gdamore/encoding v1.0.0 // indirect
7465
github.com/gdamore/tcell/v2 v2.6.0 // indirect
75-
github.com/go-logr/logr v1.2.3 // indirect
7666
github.com/go-ole/go-ole v1.2.6 // indirect
7767
github.com/go-openapi/analysis v0.21.4 // indirect
7868
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7969
github.com/go-openapi/jsonreference v0.20.2 // indirect
8070
github.com/goccy/go-json v0.10.2 // indirect
8171
github.com/gogo/protobuf v1.3.2 // indirect
82-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
83-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8472
github.com/golang/protobuf v1.5.3 // indirect
85-
github.com/google/gnostic v0.6.9 // indirect
86-
github.com/google/go-cmp v0.5.9 // indirect
87-
github.com/google/gofuzz v1.2.0 // indirect
8873
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8974
github.com/hashicorp/errwrap v1.1.0 // indirect
9075
github.com/hashicorp/go-multierror v1.1.1 // indirect
91-
github.com/hashicorp/hcl v1.0.0 // indirect
92-
github.com/imdario/mergo v0.3.15 // indirect
9376
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9477
github.com/jedib0t/go-pretty/v6 v6.4.6 // indirect
9578
github.com/josharian/intern v1.0.0 // indirect
@@ -104,16 +87,13 @@ require (
10487
github.com/lestrrat-go/option v1.0.1 // indirect
10588
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
10689
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
107-
github.com/magiconair/properties v1.8.7 // indirect
10890
github.com/mailru/easyjson v0.7.7 // indirect
10991
github.com/mattn/go-colorable v0.1.13 // indirect
11092
github.com/mattn/go-ieproxy v0.0.1 // indirect
11193
github.com/mattn/go-isatty v0.0.18 // indirect
11294
github.com/mattn/go-localereader v0.0.1 // indirect
11395
github.com/mattn/go-runewidth v0.0.14 // indirect
11496
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
115-
github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
116-
github.com/miekg/dns v1.1.52 // indirect
11797
github.com/minio/colorjson v1.0.4 // indirect
11898
github.com/minio/filepath v1.0.0 // indirect
11999
github.com/minio/md5-simd v1.1.2 // indirect
@@ -126,11 +106,9 @@ require (
126106
github.com/muesli/cancelreader v0.2.2 // indirect
127107
github.com/muesli/reflow v0.3.0 // indirect
128108
github.com/muesli/termenv v0.15.1 // indirect
129-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
130109
github.com/navidys/tvxwidgets v0.3.0 // indirect
131110
github.com/oklog/ulid v1.3.1 // indirect
132111
github.com/olekukonko/tablewriter v0.0.5 // indirect
133-
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
134112
github.com/philhofer/fwd v1.1.2 // indirect
135113
github.com/pkg/errors v0.9.1 // indirect
136114
github.com/pkg/xattr v0.4.9 // indirect
@@ -145,15 +123,10 @@ require (
145123
github.com/rivo/tview v0.0.0-20230406072732-e22ce9588bb4 // indirect
146124
github.com/rivo/uniseg v0.4.4 // indirect
147125
github.com/rjeczalik/notify v0.9.3 // indirect
126+
github.com/rogpeppe/go-internal v1.10.0 // indirect
148127
github.com/shirou/gopsutil/v3 v3.23.3 // indirect
149128
github.com/shoenig/go-m1cpu v0.1.5 // indirect
150129
github.com/sirupsen/logrus v1.9.2 // indirect
151-
github.com/spf13/afero v1.9.5 // indirect
152-
github.com/spf13/cast v1.5.0 // indirect
153-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
154-
github.com/spf13/pflag v1.0.5 // indirect
155-
github.com/spf13/viper v1.15.0 // indirect
156-
github.com/subosito/gotenv v1.4.2 // indirect
157130
github.com/tidwall/match v1.1.1 // indirect
158131
github.com/tidwall/pretty v1.2.1 // indirect
159132
github.com/tinylib/msgp v1.1.8 // indirect
@@ -167,24 +140,14 @@ require (
167140
go.uber.org/atomic v1.10.0 // indirect
168141
go.uber.org/multierr v1.11.0 // indirect
169142
go.uber.org/zap v1.24.0 // indirect
170-
golang.org/x/mod v0.9.0 // indirect
171143
golang.org/x/sync v0.1.0 // indirect
172144
golang.org/x/sys v0.8.0 // indirect
173145
golang.org/x/term v0.8.0 // indirect
174-
golang.org/x/time v0.3.0 // indirect
175-
golang.org/x/tools v0.7.0 // indirect
176146
google.golang.org/appengine v1.6.7 // indirect
177147
google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
178148
google.golang.org/grpc v1.54.0 // indirect
179149
google.golang.org/protobuf v1.30.0 // indirect
180150
gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
181-
gopkg.in/inf.v0 v0.9.1 // indirect
182151
gopkg.in/ini.v1 v1.67.0 // indirect
183152
gopkg.in/yaml.v3 v3.0.1 // indirect
184-
k8s.io/apiextensions-apiserver v0.26.3 // indirect
185-
k8s.io/klog/v2 v2.90.1 // indirect
186-
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
187-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
188-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
189-
sigs.k8s.io/yaml v1.3.0 // indirect
190153
)

0 commit comments

Comments
 (0)