Skip to content

Commit

Permalink
Add trailing slash middleware to prevent unexpected API crash (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
tarun-29 authored Oct 4, 2024
1 parent 12a0fef commit 911438f
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 3 deletions.
64 changes: 64 additions & 0 deletions internal/middleware/trailing_slash_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package middleware_test

import (
"net/http"
"net/http/httptest"
"server/internal/middleware"
"testing"
)

func TestTrailingSlashMiddleware(t *testing.T) {

handler := middleware.TrailingSlashMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}))

tests := []struct {
name string
requestURL string
expectedCode int
expectedUrl string
}{
{
name: "url with trailing slash",
requestURL: "/example/",
expectedCode: http.StatusMovedPermanently,
expectedUrl: "/example",
},
{
name: "url without trailing slash",
requestURL: "/example",
expectedCode: http.StatusOK,
expectedUrl: "",
},
{
name: "root url with trailing slash",
requestURL: "/",
expectedCode: http.StatusOK,
expectedUrl: "",
},
{
name: "URL with Query Parameters",
requestURL: "/example?query=1",
expectedCode: http.StatusOK,
expectedUrl: "",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
req := httptest.NewRequest("GET", tt.requestURL, nil)
w := httptest.NewRecorder()

handler.ServeHTTP(w, req)

if w.Code != tt.expectedCode {
t.Errorf("expected status %d, got %d", tt.expectedCode, w.Code)
}

if tt.expectedUrl != "" && w.Header().Get("Location") != tt.expectedUrl {
t.Errorf("expected location %s, got %s", tt.expectedUrl, w.Header().Get("Location"))
}
})
}
}
23 changes: 23 additions & 0 deletions internal/middleware/trailingslash.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package middleware

import (
"net/http"
"strings"
)

func TrailingSlashMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" && strings.HasSuffix(r.URL.Path, "/") {
// remove slash
newPath := strings.TrimSuffix(r.URL.Path, "/")
// if query params exist append them
newURL := newPath
if r.URL.RawQuery != "" {
newURL += "?" + r.URL.RawQuery
}
http.Redirect(w, r, newURL, http.StatusMovedPermanently)
return
}
next.ServeHTTP(w, r)
})
}
8 changes: 5 additions & 3 deletions internal/server/httpServer.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ func errorResponse(response string) string {

func (cim *HandlerMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Convert the path to lowercase before passing to the underlying mux.
r.URL.Path = strings.ToLower(r.URL.Path)
// Apply rate limiter
cim.rateLimiter(w, r, cim.mux)
middleware.TrailingSlashMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
r.URL.Path = strings.ToLower(r.URL.Path)
// Apply rate limiter
cim.rateLimiter(w, r, cim.mux)
})).ServeHTTP(w, r)
}

func NewHTTPServer(addr string, mux *http.ServeMux, client *db.DiceDB, limit int64, window float64) *HTTPServer {
Expand Down

0 comments on commit 911438f

Please sign in to comment.