diff --git a/pkg/middleware/bloclist.go b/pkg/middleware/access-middleware.go similarity index 93% rename from pkg/middleware/bloclist.go rename to pkg/middleware/access-middleware.go index f389a52..decd703 100644 --- a/pkg/middleware/bloclist.go +++ b/pkg/middleware/access-middleware.go @@ -25,8 +25,8 @@ import ( "time" ) -// BlocklistMiddleware checks if the request path is forbidden and returns 403 Forbidden -func (blockList BlockListMiddleware) BlocklistMiddleware(next http.Handler) http.Handler { +// AccessMiddleware checks if the request path is forbidden and returns 403 Forbidden +func (blockList AccessListMiddleware) AccessMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { for _, block := range blockList.List { if isPathBlocked(r.URL.Path, util.ParseURLPath(blockList.Path+block)) { diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index a9707e2..04433fe 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -50,6 +50,7 @@ func NewRateLimiterWindow(requests int, window time.Duration) *RateLimiter { } } +// TokenRateLimiter stores tokenRate limit type TokenRateLimiter struct { tokens int maxTokens int @@ -65,7 +66,7 @@ type ProxyResponseError struct { Message string `json:"message"` } -// JwtAuth Define struct +// JwtAuth stores JWT configuration type JwtAuth struct { AuthURL string RequiredHeaders []string @@ -73,20 +74,20 @@ type JwtAuth struct { Params map[string]string } -// AuthenticationMiddleware Define struct +// AuthenticationMiddleware Define struct type AuthenticationMiddleware struct { AuthURL string RequiredHeaders []string Headers map[string]string Params map[string]string } -type BlockListMiddleware struct { +type AccessListMiddleware struct { Path string Destination string List []string } -// AuthBasic Define Basic auth +// AuthBasic contains Basic auth configuration type AuthBasic struct { Username string Password string diff --git a/pkg/route.go b/pkg/route.go index 46d330b..8623102 100644 --- a/pkg/route.go +++ b/pkg/route.go @@ -53,11 +53,11 @@ func (gatewayServer GatewayServer) Initialize() *mux.Router { } else { // Apply access middleware if accessMiddleware.Type == AccessMiddleware { - blM := middleware.BlockListMiddleware{ + blM := middleware.AccessListMiddleware{ Path: route.Path, List: accessMiddleware.Paths, } - r.Use(blM.BlocklistMiddleware) + r.Use(blM.AccessMiddleware) }