From e593efdb1566e467e4620bac45fa189c117bb1b3 Mon Sep 17 00:00:00 2001
From: Deng Ming <mingflycash@gmail.com>
Date: Mon, 25 Apr 2022 12:14:31 +0800
Subject: [PATCH] pick the fix 4459: /abc.html/aaa match /abc/aaa

---
 tree.go | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tree.go b/tree.go
index 9e53003b..4d800bc4 100644
--- a/tree.go
+++ b/tree.go
@@ -32,13 +32,13 @@ var (
 // wildcard stores params
 // leaves store the endpoint information
 type Tree struct {
-	//prefix set for static router
+	// prefix set for static router
 	prefix string
-	//search fix route first
+	// search fix route first
 	fixrouters []*Tree
-	//if set, failure to match fixrouters search then search wildcard
+	// if set, failure to match fixrouters search then search wildcard
 	wildcard *Tree
-	//if set, failure to match wildcard search
+	// if set, failure to match wildcard search
 	leaves []*leafInfo
 }
 
@@ -68,13 +68,13 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st
 			filterTreeWithPrefix(tree, wildcards, reg)
 		}
 	}
-	//Rule: /login/*/access match /login/2009/11/access
-	//if already has *, and when loop the access, should as a regexpStr
+	// Rule: /login/*/access match /login/2009/11/access
+	// if already has *, and when loop the access, should as a regexpStr
 	if !iswild && utils.InSlice(":splat", wildcards) {
 		iswild = true
 		regexpStr = seg
 	}
-	//Rule: /user/:id/*
+	// Rule: /user/:id/*
 	if seg == "*" && len(wildcards) > 0 && reg == "" {
 		regexpStr = "(.+)"
 	}
@@ -221,13 +221,13 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
 			t.addseg(segments[1:], route, wildcards, reg)
 			params = params[1:]
 		}
-		//Rule: /login/*/access match /login/2009/11/access
-		//if already has *, and when loop the access, should as a regexpStr
+		// Rule: /login/*/access match /login/2009/11/access
+		// if already has *, and when loop the access, should as a regexpStr
 		if !iswild && utils.InSlice(":splat", wildcards) {
 			iswild = true
 			regexpStr = seg
 		}
-		//Rule: /user/:id/*
+		// Rule: /user/:id/*
 		if seg == "*" && len(wildcards) > 0 && reg == "" {
 			regexpStr = "(.+)"
 		}
@@ -341,8 +341,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 {
@@ -392,7 +393,7 @@ type leafInfo struct {
 }
 
 func (leaf *leafInfo) match(treePattern string, wildcardValues []string, ctx *context.Context) (ok bool) {
-	//fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
+	// fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
 	if leaf.regexps == nil {
 		if len(wildcardValues) == 0 && len(leaf.wildcards) == 0 { // static path
 			return true
@@ -499,7 +500,7 @@ func splitSegment(key string) (bool, []string, string) {
 				continue
 			}
 			if start {
-				//:id:int and :name:string
+				// :id:int and :name:string
 				if v == ':' {
 					if len(key) >= i+4 {
 						if key[i+1:i+4] == "int" {