fix search

Author: springhack

geo-sni-proxy/internal/geosite/matcher.go

@@ -131,44 +131,41 @@ func parseDomainItem(s string) []*router.Domain {
 	case strings.HasPrefix(t, "domain:"):
 		body := strings.TrimSpace(strings.TrimPrefix(t, "domain:"))
 		return []*router.Domain{{
-			Type:  router.Domain_Plain,
+			Type:  router.Domain_Domain,
 			Value: strings.ToLower(body),
 		}}
 	case strings.HasPrefix(t, "keyword:"):
 		body := strings.TrimSpace(strings.TrimPrefix(t, "keyword:"))
 		return []*router.Domain{{
 			Type:  router.Domain_Plain,
 			Value: strings.ToLower(body),
-			Attribute: []*router.Domain_Attribute{
-				{Key: "keyword", TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true}},
-			},
 		}}
 	case strings.HasPrefix(t, "full:"):
 		body := strings.TrimSpace(strings.TrimPrefix(t, "full:"))
 		return []*router.Domain{{
-			Type:  router.Domain_Plain,
+			Type:  router.Domain_Full,
 			Value: strings.ToLower(body),
-			Attribute: []*router.Domain_Attribute{
-				{Key: "full", TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true}},
-			},
 		}}
 	case strings.HasPrefix(t, "dotless:"):
 		body := strings.TrimSpace(strings.TrimPrefix(t, "dotless:"))
+		value := ""
+		switch substr := strings.ToLower(body); {
+		case substr == "":
+			value = "^[^.]*$"
+		case !strings.Contains(substr, "."):
+			value = "^[^.]*" + substr + "[^.]*$"
+		default:
+			return []*router.Domain{}
+		}
 		return []*router.Domain{{
-			Type:  router.Domain_Plain,
-			Value: body,
-			Attribute: []*router.Domain_Attribute{
-				{Key: "dotless", TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true}},
-			},
+			Type:  router.Domain_Regex,
+			Value: value,
 		}}
 	default:
 		body := strings.ToLower(t)
 		return []*router.Domain{{
 			Type:  router.Domain_Plain,
 			Value: body,
-			Attribute: []*router.Domain_Attribute{
-				{Key: "keyword", TypedValue: &router.Domain_Attribute_BoolValue{BoolValue: true}},
-			},
 		}}
 	}
 }
@@ -195,5 +192,5 @@ func (m *Matcher) Match(domain string) bool {
 	if m == nil || m.dm == nil {
 		return false
 	}
-	return m.dm.ApplyDomain(strings.TrimSuffix(domain, "."))
+	return m.dm.ApplyDomain(strings.ToLower(strings.TrimSuffix(domain, ".")))
 }