Skip to content

Commit

Permalink
fix #1804 which is caused by calling middleware twice. (#1805)
Browse files Browse the repository at this point in the history
Fix: #1804

`allNoRoute` contains middlewares such as `gin.Logger`, `gin.Recovery`, so on.  The correct code is to use `noRoute`.

cc: @MetalBreaker
  • Loading branch information
sairoutine authored and appleboy committed Mar 11, 2019
1 parent 70a0aba commit 4a23c4f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion routergroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func (group *RouterGroup) createStaticHandler(relativePath string, fs http.FileS
// Check if file exists and/or if we have permission to access it
if _, err := fs.Open(file); err != nil {
c.Writer.WriteHeader(http.StatusNotFound)
c.handlers = group.engine.allNoRoute
c.handlers = group.engine.noRoute
// Reset index
c.index = -1
return
Expand Down
22 changes: 21 additions & 1 deletion routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ func TestRouterNotFound(t *testing.T) {

func TestRouterStaticFSNotFound(t *testing.T) {
router := New()

router.StaticFS("/", http.FileSystem(http.Dir("/thisreallydoesntexist/")))
router.NoRoute(func(c *Context) {
c.String(404, "non existent")
Expand All @@ -452,6 +451,27 @@ func TestRouterStaticFSFileNotFound(t *testing.T) {
})
}

// Reproduction test for the bug of issue #1805
func TestMiddlewareCalledOnceByRouterStaticFSNotFound(t *testing.T) {
router := New()

// Middleware must be called just only once by per request.
middlewareCalledNum := 0
router.Use(func(c *Context) {
middlewareCalledNum += 1
})

router.StaticFS("/", http.FileSystem(http.Dir("/thisreallydoesntexist/")))

// First access
performRequest(router, "GET", "/nonexistent")
assert.Equal(t, 1, middlewareCalledNum)

// Second access
performRequest(router, "HEAD", "/nonexistent")
assert.Equal(t, 2, middlewareCalledNum)
}

func TestRouteRawPath(t *testing.T) {
route := New()
route.UseRawPath = true
Expand Down

0 comments on commit 4a23c4f

Please sign in to comment.