Use default rate limiter error handlers to fix responses (#78)

iotaledger · Feb 27, 2023 · b513f55 · b513f55
1 parent fb0517f
commit b513f55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/core/app/app.go b/core/app/app.go
@@ -13,7 +13,7 @@ var (
 	Name = "inx-faucet"
 
 	// Version of the app.
-	Version = "1.0.0-rc.2"
+	Version = "1.0.0-rc.3"
 )
 
 func App() *app.App {

diff --git a/core/faucet/frontend.go b/core/faucet/frontend.go
@@ -50,7 +50,7 @@ func frontendMiddleware() echo.MiddlewareFunc {
 		return func(c echo.Context) error {
 			contentType := calculateMimeType(c)
 
-			path := strings.TrimPrefix(c.Request().URL.Path, "/")
+			path := strings.TrimPrefix(c.Request().RequestURI, "/")
 			if len(path) == 0 {
 				path = "index.html"
 				contentType = echo.MIMETextHTMLCharsetUTF8

diff --git a/core/faucet/routes.go b/core/faucet/routes.go
@@ -30,7 +30,7 @@ const (
 
 func enforceMaxOneDotPerURL(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
-		if strings.Count(c.Request().URL.Path, "..") != 0 {
+		if strings.Count(c.Request().RequestURI, "..") != 0 {
 			return c.String(http.StatusForbidden, "path not allowed")
 		}
 
@@ -93,12 +93,6 @@ func setupRoutes(e *echo.Echo) {
 
 				return id, nil
 			},
-			ErrorHandler: func(context echo.Context, err error) error {
-				return context.JSON(http.StatusForbidden, nil)
-			},
-			DenyHandler: func(context echo.Context, identifier string, err error) error {
-				return context.JSON(http.StatusTooManyRequests, nil)
-			},
 		}
 		apiGroup.Use(middleware.RateLimiterWithConfig(rateLimiterConfig))
 	}