Fix BUG: /abc.html/aaa match /abc/aaa

CHANGELOG.md

@@ -1,4 +1,5 @@
 # developing
+- Fix: /abc.html/aaa match /abc/aaa. [4459](https://github.com/beego/beego/pull/4459)
 - ORM mock. [4407](https://github.com/beego/beego/pull/4407)
 - Add sonar check and ignore test. [4432](https://github.com/beego/beego/pull/4432) [4433](https://github.com/beego/beego/pull/4433)
 - Update changlog.yml to check every PR to develop branch.[4427](https://github.com/beego/beego/pull/4427)

server/web/tree.go

@@ -342,8 +342,9 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
 	if runObject == nil && len(t.fixrouters) > 0 {
 		// Filter the .json .xml .html extension
 		for _, str := range allowSuffixExt {
-			if strings.HasSuffix(seg, str) {
+			if strings.HasSuffix(seg, str) && strings.HasSuffix(treePattern, seg){
 				for _, subTree := range t.fixrouters {
+					// strings.HasSuffix(treePattern, seg) avoid cases: /aaa.html/bbb could access /aaa/bbb
 					if subTree.prefix == seg[:len(seg)-len(str)] {
 						runObject = subTree.match(treePattern, pattern, wildcardValues, ctx)
 						if runObject != nil {

server/web/tree_test.go

@@ -17,6 +17,7 @@ package web
 import (
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/beego/beego/v2/server/web/context"
 )
@@ -49,7 +50,7 @@ func notMatchTestInfo(pattern, url string) testInfo {
 }
 
 func init() {
-	routers = make([]testInfo, 0)
+	routers = make([]testInfo, 0, 128)
 	// match example
 	routers = append(routers, matchTestInfo("/topic/?:auth:int", "/topic", nil))
 	routers = append(routers, matchTestInfo("/topic/?:auth:int", "/topic/123", map[string]string{":auth": "123"}))
@@ -108,12 +109,23 @@ func init() {
 	routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222_htm"))
 	routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", " /read_262shtm"))
 
+	// test .html, .json not suffix
+	const abcHtml = "/suffix/abc.html"
+	routers = append(routers, notMatchTestInfo(abcHtml, "/suffix.html/abc"))
+	routers = append(routers, matchTestInfo("/suffix/abc", abcHtml, nil))
+	routers = append(routers, matchTestInfo("/suffix/*", abcHtml, nil))
+	routers = append(routers, notMatchTestInfo("/suffix/*", "/suffix.html/a"))
+	const abcSuffix = "/abc/suffix/*"
+	routers = append(routers, notMatchTestInfo(abcSuffix, "/abc/suffix.html/a"))
+	routers = append(routers, matchTestInfo(abcSuffix, "/abc/suffix/a", nil))
+	routers = append(routers, notMatchTestInfo(abcSuffix, "/abc.j/suffix/a"))
+
 }
 
 func TestTreeRouters(t *testing.T) {
 	for _, r := range routers {
-		shouldMatch := r.shouldMatchOrNot
 
+		shouldMatch := r.shouldMatchOrNot
 		tr := NewTree()
 		tr.AddRouter(r.pattern, "astaxie")
 		ctx := context.NewContext()
@@ -122,7 +134,7 @@ func TestTreeRouters(t *testing.T) {
 			if obj != nil {
 				t.Fatal("pattern:", r.pattern, ", should not match", r.requestUrl)
 			} else {
-				return
+				continue
 			}
 		}
 		if obj == nil || obj.(string) != "astaxie" {
@@ -138,6 +150,7 @@ func TestTreeRouters(t *testing.T) {
 			}
 		}
 	}
+	time.Sleep(time.Second)
 }
 
 func TestStaticPath(t *testing.T) {