diff --git a/middleware/pprof/pprof.go b/middleware/pprof/pprof.go index 6978d325e3..7e0c8cc415 100644 --- a/middleware/pprof/pprof.go +++ b/middleware/pprof/pprof.go @@ -29,6 +29,9 @@ func New(config ...Config) fiber.Handler { pprofThreadcreate = fasthttpadaptor.NewFastHTTPHandlerFunc(pprof.Handler("threadcreate").ServeHTTP) ) + // Construct actual prefix + prefix := cfg.Prefix + "/debug/pprof" + // Return new handler return func(c *fiber.Ctx) error { // Don't execute middleware if Next returns true @@ -38,39 +41,40 @@ func New(config ...Config) fiber.Handler { path := c.Path() // We are only interested in /debug/pprof routes - if len(path) < 12 || !strings.HasPrefix(path, cfg.Prefix+"/debug/pprof") { + path, found := cutPrefix(path, prefix) + if !found { return c.Next() } - // Switch to original path without stripped slashes + // Switch on trimmed path against constant strings switch path { - case cfg.Prefix + "/debug/pprof/": + case "/": pprofIndex(c.Context()) - case cfg.Prefix + "/debug/pprof/cmdline": + case "/cmdline": pprofCmdline(c.Context()) - case cfg.Prefix + "/debug/pprof/profile": + case "/profile": pprofProfile(c.Context()) - case cfg.Prefix + "/debug/pprof/symbol": + case "/symbol": pprofSymbol(c.Context()) - case cfg.Prefix + "/debug/pprof/trace": + case "/trace": pprofTrace(c.Context()) - case cfg.Prefix + "/debug/pprof/allocs": + case "/allocs": pprofAllocs(c.Context()) - case cfg.Prefix + "/debug/pprof/block": + case "/block": pprofBlock(c.Context()) - case cfg.Prefix + "/debug/pprof/goroutine": + case "/goroutine": pprofGoroutine(c.Context()) - case cfg.Prefix + "/debug/pprof/heap": + case "/heap": pprofHeap(c.Context()) - case cfg.Prefix + "/debug/pprof/mutex": + case "/mutex": pprofMutex(c.Context()) - case cfg.Prefix + "/debug/pprof/threadcreate": + case "/threadcreate": pprofThreadcreate(c.Context()) default: // pprof index only works with trailing slash if strings.HasSuffix(path, "/") { path = strings.TrimRight(path, "/") } else { - path = cfg.Prefix + "/debug/pprof/" + path = prefix + "/" } return c.Redirect(path, fiber.StatusFound) @@ -78,3 +82,14 @@ func New(config ...Config) fiber.Handler { return nil } } + +// cutPrefix is a copy of [strings.CutPrefix] added in Go 1.20. +// Remove this function when we drop support for Go 1.19. +// +//nolint:nonamedreturns // Align with its original form in std. +func cutPrefix(s, prefix string) (after string, found bool) { + if !strings.HasPrefix(s, prefix) { + return s, false + } + return s[len(prefix):], true +}