Merge 96f63d68d3086cd0883f77ac39c5cc73aedd530d into 58135f06cf206a9ff713eb14150ef04a05b031d4

.golangci.yml

@@ -18,8 +18,15 @@ linters:
     - wastedassign
   settings:
     gosec:
-      excludes:
-        - G115
+      includes:
+        - G102
+        - G106
+        - G108
+        - G109
+        - G111
+        - G112
+        - G201
+        - G203
     perfsprint:
       int-conversion: true
       err-error: true

context.go

@@ -55,14 +55,6 @@ const ContextRequestKey ContextKeyType = 0
 // abortIndex represents a typical value used in abort functions.
 const abortIndex int8 = math.MaxInt8 >> 1
 
-// safeInt8 converts int to int8 safely, capping at math.MaxInt8
-func safeInt8(n int) int8 {
-	if n > math.MaxInt8 {
-		return math.MaxInt8
-	}
-	return int8(n)
-}
-
 // Context is the most important part of gin. It allows us to pass variables between middleware,
 // manage the flow, validate the JSON of a request and render a JSON response for example.
 type Context struct {
@@ -194,7 +186,7 @@ func (c *Context) FullPath() string {
 // See example in GitHub.
 func (c *Context) Next() {
 	c.index++
-	for c.index < safeInt8(len(c.handlers)) {
+	for c.index < int8(len(c.handlers)) {
 		if c.handlers[c.index] != nil {
 			c.handlers[c.index](c)
 		}

gin.go

@@ -23,12 +23,10 @@ import (
 	"golang.org/x/net/http2/h2c"
 )
 
-const (
-	defaultMultipartMemory = 32 << 20 // 32 MB
-	escapedColon           = "\\:"
-	colon                  = ":"
-	backslash              = "\\"
-)
+const defaultMultipartMemory = 32 << 20 // 32 MB
+const escapedColon = "\\:"
+const colon = ":"
+const backslash = "\\"
 
 var (
 	default404Body = []byte("404 page not found")
@@ -48,10 +46,8 @@ var defaultTrustedCIDRs = []*net.IPNet{
 	},
 }
 
-var (
-	regSafePrefix         = regexp.MustCompile("[^a-zA-Z0-9/-]+")
-	regRemoveRepeatedChar = regexp.MustCompile("/{2,}")
-)
+var regSafePrefix = regexp.MustCompile("[^a-zA-Z0-9/-]+")
+var regRemoveRepeatedChar = regexp.MustCompile("/{2,}")
 
 // HandlerFunc defines the handler used by gin middleware as return value.
 type HandlerFunc func(*Context)
@@ -98,10 +94,6 @@ const (
 type Engine struct {
 	RouterGroup
 
-	// routeTreesUpdated ensures that the initialization or update of the route trees
-	// (used for routing HTTP requests) happens only once, even if called multiple times concurrently.
-	routeTreesUpdated sync.Once
-
 	// RedirectTrailingSlash enables automatic redirection if the current route can't be matched but a
 	// handler for the path with (without) the trailing slash exists.
 	// For example if /foo/ is requested but a route only exists for /foo, the
@@ -559,11 +551,7 @@ func (engine *Engine) Run(addr ...string) (err error) {
 	engine.updateRouteTrees()
 	address := resolveAddress(addr)
 	debugPrint("Listening and serving HTTP on %s\n", address)
-	server := &http.Server{ // #nosec G112
-		Addr:    address,
-		Handler: engine.Handler(),
-	}
-	err = server.ListenAndServe()
+	err = http.ListenAndServe(address, engine.Handler())
 	return
 }
 
@@ -579,11 +567,7 @@ func (engine *Engine) RunTLS(addr, certFile, keyFile string) (err error) {
 			"Please check https://github.com/gin-gonic/gin/blob/master/docs/doc.md#dont-trust-all-proxies for details.")
 	}
 
-	server := &http.Server{ // #nosec G112
-		Addr:    addr,
-		Handler: engine.Handler(),
-	}
-	err = server.ListenAndServeTLS(certFile, keyFile)
+	err = http.ListenAndServeTLS(addr, certFile, keyFile, engine.Handler())
 	return
 }
 
@@ -606,10 +590,7 @@ func (engine *Engine) RunUnix(file string) (err error) {
 	defer listener.Close()
 	defer os.Remove(file)
 
-	server := &http.Server{ // #nosec G112
-		Handler: engine.Handler(),
-	}
-	err = server.Serve(listener)
+	err = http.Serve(listener, engine.Handler())
 	return
 }
 
@@ -663,19 +644,12 @@ func (engine *Engine) RunListener(listener net.Listener) (err error) {
 			"Please check https://github.com/gin-gonic/gin/blob/master/docs/doc.md#dont-trust-all-proxies for details.")
 	}
 
-	server := &http.Server{ // #nosec G112
-		Handler: engine.Handler(),
-	}
-	err = server.Serve(listener)
+	err = http.Serve(listener, engine.Handler())
 	return
 }
 
 // ServeHTTP conforms to the http.Handler interface.
 func (engine *Engine) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	engine.routeTreesUpdated.Do(func() {
-		engine.updateRouteTrees()
-	})
-
 	c := engine.pool.Get().(*Context)
 	c.writermem.reset(w)
 	c.Request = req

gin_test.go

@@ -966,102 +966,3 @@ func TestMethodNotAllowedNoRoute(t *testing.T) {
 	assert.NotPanics(t, func() { g.ServeHTTP(resp, req) })
 	assert.Equal(t, http.StatusNotFound, resp.Code)
 }
-
-// Test the fix for https://github.com/gin-gonic/gin/pull/4415
-func TestLiteralColonWithRun(t *testing.T) {
-	SetMode(TestMode)
-	router := New()
-
-	router.GET(`/test\:action`, func(c *Context) {
-		c.JSON(http.StatusOK, H{"path": "literal_colon"})
-	})
-
-	router.updateRouteTrees()
-
-	w := httptest.NewRecorder()
-
-	req, _ := http.NewRequest(http.MethodGet, "/test:action", nil)
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t, w.Body.String(), "literal_colon")
-}
-
-func TestLiteralColonWithDirectServeHTTP(t *testing.T) {
-	SetMode(TestMode)
-	router := New()
-
-	router.GET(`/test\:action`, func(c *Context) {
-		c.JSON(http.StatusOK, H{"path": "literal_colon"})
-	})
-
-	w := httptest.NewRecorder()
-	req, _ := http.NewRequest(http.MethodGet, "/test:action", nil)
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t, w.Body.String(), "literal_colon")
-}
-
-func TestLiteralColonWithHandler(t *testing.T) {
-	SetMode(TestMode)
-	router := New()
-
-	router.GET(`/test\:action`, func(c *Context) {
-		c.JSON(http.StatusOK, H{"path": "literal_colon"})
-	})
-
-	handler := router.Handler()
-
-	w := httptest.NewRecorder()
-	req, _ := http.NewRequest(http.MethodGet, "/test:action", nil)
-	handler.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t, w.Body.String(), "literal_colon")
-}
-
-func TestLiteralColonWithHTTPServer(t *testing.T) {
-	SetMode(TestMode)
-	router := New()
-
-	router.GET(`/test\:action`, func(c *Context) {
-		c.JSON(http.StatusOK, H{"path": "literal_colon"})
-	})
-
-	router.GET("/test/:param", func(c *Context) {
-		c.JSON(http.StatusOK, H{"param": c.Param("param")})
-	})
-
-	w := httptest.NewRecorder()
-	req, _ := http.NewRequest(http.MethodGet, "/test:action", nil)
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t, w.Body.String(), "literal_colon")
-
-	w2 := httptest.NewRecorder()
-	req2, _ := http.NewRequest(http.MethodGet, "/test/foo", nil)
-	router.ServeHTTP(w2, req2)
-
-	assert.Equal(t, http.StatusOK, w2.Code)
-	assert.Contains(t, w2.Body.String(), "foo")
-}
-
-// Test that updateRouteTrees is called only once
-func TestUpdateRouteTreesCalledOnce(t *testing.T) {
-	SetMode(TestMode)
-	router := New()
-
-	router.GET(`/test\:action`, func(c *Context) {
-		c.String(http.StatusOK, "ok")
-	})
-
-	for range 5 {
-		w := httptest.NewRecorder()
-		req, _ := http.NewRequest(http.MethodGet, "/test:action", nil)
-		router.ServeHTTP(w, req)
-		assert.Equal(t, http.StatusOK, w.Code)
-		assert.Equal(t, "ok", w.Body.String())
-	}
-}

tree.go

@@ -5,7 +5,6 @@
 package gin
 
 import (
-	"math"
 	"net/url"
 	"strings"
 	"unicode"
@@ -78,22 +77,14 @@ func (n *node) addChild(child *node) {
 	}
 }
 
-// safeUint16 converts int to uint16 safely, capping at math.MaxUint16
-func safeUint16(n int) uint16 {
-	if n > math.MaxUint16 {
-		return math.MaxUint16
-	}
-	return uint16(n)
-}
-
 func countParams(path string) uint16 {
 	colons := strings.Count(path, ":")
 	stars := strings.Count(path, "*")
-	return safeUint16(colons + stars)
+	return uint16(colons + stars)
 }
 
 func countSections(path string) uint16 {
-	return safeUint16(strings.Count(path, "/"))
+	return uint16(strings.Count(path, "/"))
 }
 
 type nodeType uint8