forked from mirror/gin
Fix: https://github.com/gin-gonic/gin/issues/1804 `allNoRoute` contains middlewares such as `gin.Logger`, `gin.Recovery`, so on. The correct code is to use `noRoute`. cc: @MetalBreaker
This commit is contained in:
parent
70a0aba3e4
commit
4a23c4f7b9
|
@ -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
|
// Check if file exists and/or if we have permission to access it
|
||||||
if _, err := fs.Open(file); err != nil {
|
if _, err := fs.Open(file); err != nil {
|
||||||
c.Writer.WriteHeader(http.StatusNotFound)
|
c.Writer.WriteHeader(http.StatusNotFound)
|
||||||
c.handlers = group.engine.allNoRoute
|
c.handlers = group.engine.noRoute
|
||||||
// Reset index
|
// Reset index
|
||||||
c.index = -1
|
c.index = -1
|
||||||
return
|
return
|
||||||
|
|
|
@ -429,7 +429,6 @@ func TestRouterNotFound(t *testing.T) {
|
||||||
|
|
||||||
func TestRouterStaticFSNotFound(t *testing.T) {
|
func TestRouterStaticFSNotFound(t *testing.T) {
|
||||||
router := New()
|
router := New()
|
||||||
|
|
||||||
router.StaticFS("/", http.FileSystem(http.Dir("/thisreallydoesntexist/")))
|
router.StaticFS("/", http.FileSystem(http.Dir("/thisreallydoesntexist/")))
|
||||||
router.NoRoute(func(c *Context) {
|
router.NoRoute(func(c *Context) {
|
||||||
c.String(404, "non existent")
|
c.String(404, "non existent")
|
||||||
|
@ -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) {
|
func TestRouteRawPath(t *testing.T) {
|
||||||
route := New()
|
route := New()
|
||||||
route.UseRawPath = true
|
route.UseRawPath = true
|
||||||
|
|
Loading…
Reference in New Issue