feat: Add lower case matching support

Author: layou233

config/rule.go

@@ -0,0 +1,29 @@
+package config
+
+import (
+	"encoding/json"
+
+	"github.com/layou233/zbproxy/v3/common/jsonx"
+)
+
+type _RuleParameterListableString struct {
+	Lists     jsonx.Listable[string]
+	LowerCase bool
+}
+
+type RuleParameterListableString _RuleParameterListableString
+
+var _ json.Unmarshaler = (*RuleParameterListableString)(nil)
+
+func (r *RuleParameterListableString) UnmarshalJSON(bytes []byte) error {
+	err := json.Unmarshal(bytes, (*_RuleParameterListableString)(r))
+	if err == nil {
+		return nil
+	}
+	err = json.Unmarshal(bytes, &r.Lists)
+	if err == nil {
+		r.LowerCase = false
+		return nil
+	}
+	return err
+}

config/service.go

@@ -17,8 +17,9 @@ type Service struct {
 }
 
 type access struct {
-	Mode     string   // 'accept' or 'deny' or empty
-	ListTags []string `json:",omitempty"`
+	Mode      string   // 'accept' or 'deny' or empty
+	ListTags  []string `json:",omitempty"`
+	LowerCase bool     `json:",omitempty"`
 }
 
 type MinecraftService struct {

protocol/minecraft/outbound.go

@@ -224,7 +224,10 @@ func (o *Outbound) InjectConnection(ctx context.Context, conn *bufio.CachedConn,
 	}
 	if o.config.Minecraft.HostnameAccess.Mode != access.DefaultMode {
 		hostnameClean := metadata.Minecraft.CleanOriginDestination()
-		if !access.Check(o.hostnameAccessLists, o.config.Minecraft.HostnameAccess.Mode, metadata.Minecraft.CleanOriginDestination()) {
+		if o.config.Minecraft.HostnameAccess.LowerCase {
+			hostnameClean = strings.ToLower(hostnameClean)
+		}
+		if !access.Check(o.hostnameAccessLists, o.config.Minecraft.HostnameAccess.Mode, hostnameClean) {
 			conn.Conn.(*net.TCPConn).SetLinger(0)
 			conn.Close()
 			return common.Cause("hostname "+o.config.Minecraft.HostnameAccess.Mode+
@@ -338,7 +341,11 @@ func (o *Outbound) InjectConnection(ctx context.Context, conn *bufio.CachedConn,
 		buffer := buf.New()
 		buffer.Reset(mcprotocol.MaxVarIntLen)
 		if o.config.Minecraft.NameAccess.Mode != access.DefaultMode {
-			if !access.Check(o.nameAccessLists, o.config.Minecraft.NameAccess.Mode, metadata.Minecraft.PlayerName) {
+			name := metadata.Minecraft.PlayerName
+			if o.config.Minecraft.NameAccess.LowerCase {
+				name = strings.ToLower(metadata.Minecraft.PlayerName)
+			}
+			if !access.Check(o.nameAccessLists, o.config.Minecraft.NameAccess.Mode, name) {
 				msg, err := generateKickMessage(o.config, metadata.Minecraft.PlayerName).MarshalJSON()
 				if err != nil { // almost impossible
 					buffer.Release()

route/rule_minecraft.go

@@ -6,29 +6,29 @@ import (
 	"strings"
 
 	"github.com/layou233/zbproxy/v3/adapter"
-	"github.com/layou233/zbproxy/v3/common/jsonx"
 	"github.com/layou233/zbproxy/v3/common/mcprotocol"
 	"github.com/layou233/zbproxy/v3/common/set"
 	"github.com/layou233/zbproxy/v3/config"
 )
 
 type RuleMinecraftPlayerName struct {
-	sets   []set.StringSet
-	config *config.Rule
+	sets      []set.StringSet
+	lowerCase bool
+	config    *config.Rule
 }
 
 var _ Rule = (*RuleMinecraftPlayerName)(nil)
 
 func NewMinecraftPlayerNameRule(newConfig *config.Rule, listMap map[string]set.StringSet) (Rule, error) {
-	var playerList jsonx.Listable[string]
-	err := json.Unmarshal(newConfig.Parameter, &playerList)
+	var playerNameParameter config.RuleParameterListableString
+	err := json.Unmarshal(newConfig.Parameter, &playerNameParameter)
 	if err != nil {
-		return nil, fmt.Errorf("bad player name list %v: %w", newConfig.Parameter, err)
+		return nil, fmt.Errorf("bad player name parameter %v: %w", newConfig.Parameter, err)
 	}
 	sets := []set.StringSet{
 		{}, // new set for individual names
 	}
-	for _, i := range playerList {
+	for _, i := range playerNameParameter.Lists {
 		if strings.HasPrefix(i, parameterListPrefix) {
 			i = strings.TrimPrefix(i, parameterListPrefix)
 			nameSet, found := listMap[i]
@@ -41,8 +41,9 @@ func NewMinecraftPlayerNameRule(newConfig *config.Rule, listMap map[string]set.S
 		}
 	}
 	return &RuleMinecraftPlayerName{
-		sets:   sets,
-		config: newConfig,
+		sets:      sets,
+		lowerCase: playerNameParameter.LowerCase,
+		config:    newConfig,
 	}, nil
 }
 
@@ -52,8 +53,12 @@ func (r *RuleMinecraftPlayerName) Config() *config.Rule {
 
 func (r *RuleMinecraftPlayerName) Match(metadata *adapter.Metadata) (match bool) {
 	if metadata.Minecraft != nil {
+		name := metadata.Minecraft.PlayerName
+		if r.lowerCase {
+			name = strings.ToLower(name)
+		}
 		for _, nameSet := range r.sets {
-			match = nameSet.Has(metadata.Minecraft.PlayerName)
+			match = nameSet.Has(name)
 			if match {
 				break
 			}