From 143f9371c639bb9b016ef19840c66ef977bfe9b0 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sat, 11 Jul 2020 14:02:07 -0700 Subject: [PATCH] fix: loading users regression additionally also move to latest gorilla/mux master to fix the DNS style bucket routing regression resolves #10022 resolves #10023 --- cmd/api-router.go | 11 +---------- cmd/iam-object-store.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/cmd/api-router.go b/cmd/api-router.go index ed11e781a..9f2369414 100644 --- a/cmd/api-router.go +++ b/cmd/api-router.go @@ -84,16 +84,7 @@ func registerAPIRouter(router *mux.Router, encryptionEnabled, allowSSEKMS bool) apiRouter := router.PathPrefix(SlashSeparator).Subrouter() var routers []*mux.Router for _, domainName := range globalDomainNames { - if globalMinioPort == "80" || globalMinioPort == "443" { - // For standard ports its possible, incoming requests - // might not have a port assigned, in such scenarios use - // have wildcard routing. - // FIXME: remove this code once https://github.com/gorilla/mux/pull/579 - // is merged and released upstream, as this entire change can become - // a single line. - routers = append(routers, apiRouter.Host("{bucket:.+}."+domainName).Subrouter()) - } - routers = append(routers, apiRouter.Host("{bucket:.+}."+domainName+":{port:.*}").Subrouter()) + routers = append(routers, apiRouter.Host("{bucket:.+}."+domainName).Subrouter()) } routers = append(routers, apiRouter.PathPrefix("/{bucket}").Subrouter()) diff --git a/cmd/iam-object-store.go b/cmd/iam-object-store.go index 8307300ca..a392c5f61 100644 --- a/cmd/iam-object-store.go +++ b/cmd/iam-object-store.go @@ -324,7 +324,7 @@ func (iamOS *IAMObjectStore) loadUsers(ctx context.Context, userType IAMUserType } userName := item.Item - if err := iamOS.loadUser(userName, userType, m); err != errNoSuchUser { + if err := iamOS.loadUser(userName, userType, m); err != nil && err != errNoSuchUser { return err } } diff --git a/go.mod b/go.mod index 366ded8ae..d1176c76a 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/gomodule/redigo v2.0.0+incompatible github.com/google/uuid v1.1.1 github.com/gorilla/handlers v1.4.2 - github.com/gorilla/mux v1.7.4 + github.com/gorilla/mux v1.7.5-0.20200711200521-98cb6bf42e08 github.com/gorilla/rpc v1.2.0 github.com/hashicorp/vault/api v1.0.4 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf @@ -43,7 +43,7 @@ require ( github.com/klauspost/reedsolomon v1.9.9 github.com/lib/pq v1.7.0 github.com/mattn/go-colorable v0.1.4 - github.com/mattn/go-ieproxy v0.0.1 + github.com/mattn/go-ieproxy v0.0.1 // indirect github.com/mattn/go-isatty v0.0.8 github.com/miekg/dns v1.1.8 github.com/minio/cli v1.22.0 diff --git a/go.sum b/go.sum index ca5a4c44d..c9d45c6d5 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGa github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.7.5-0.20200711200521-98cb6bf42e08 h1:kPna6oIGlRXWmg/jkKfxbpvsl+0DHYnw1qQwN+6+gyA= +github.com/gorilla/mux v1.7.5-0.20200711200521-98cb6bf42e08/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk= github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c h1:Lh2aW+HnU2Nbe1gqD9SOJLJxW1jBMmQOktN2acDyJk8=