diff --git a/pkg/middleware.go b/pkg/middleware.go index b0a4951..aee826a 100644 --- a/pkg/middleware.go +++ b/pkg/middleware.go @@ -34,3 +34,14 @@ func doesExist(tyName string) bool { } return false } +func GetMiddleware(rule string, middlewares []Middleware) (Middleware, error) { + for _, m := range middlewares { + if strings.Contains(rule, m.Name) { + + return m, nil + } + continue + } + + return Middleware{}, errors.New("no middleware found with name " + rule) +} diff --git a/pkg/middleware/access-middleware.go b/pkg/middleware/access-middleware.go index 500f201..1686a4b 100644 --- a/pkg/middleware/access-middleware.go +++ b/pkg/middleware/access-middleware.go @@ -30,7 +30,7 @@ func (blockList AccessListMiddleware) AccessMiddleware(next http.Handler) http.H 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)) { - logger.Debug("%s: access to %s is forbidden", getRealIP(r), r.URL.Path) + logger.Debug("%s: %s access forbidden", getRealIP(r), r.URL.Path) w.Header().Set("Content-Type", "application/json") w.WriteHeader(http.StatusNotFound) err := json.NewEncoder(w).Encode(ProxyResponseError{ diff --git a/pkg/middleware_test.go b/pkg/middleware_test.go index 7e8161c..cb464c1 100644 --- a/pkg/middleware_test.go +++ b/pkg/middleware_test.go @@ -102,7 +102,7 @@ func TestReadMiddleware(t *testing.T) { func TestFoundMiddleware(t *testing.T) { middlewares := getMiddlewares(t) - middleware, err := getAuthMiddleware("jwt", middlewares) + middleware, err := GetMiddleware("jwt", middlewares) if err != nil { t.Errorf("Error getting middleware %v", err) }