mirror of
https://github.com/sipeed/picoclaw.git
synced 2026-06-12 18:08:54 +00:00
fix(identity): prevent allowlist ID entries from matching usernames (#1406)
This commit is contained in:
@@ -59,6 +59,9 @@ func MatchAllowed(sender bus.SenderInfo, allowed string) bool {
|
||||
}
|
||||
}
|
||||
|
||||
// Keep track of explicit username format
|
||||
isAtUsername := strings.HasPrefix(allowed, "@")
|
||||
|
||||
// Strip leading "@" for username matching
|
||||
trimmed := strings.TrimPrefix(allowed, "@")
|
||||
|
||||
@@ -75,11 +78,9 @@ func MatchAllowed(sender bus.SenderInfo, allowed string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// Match against Username
|
||||
if sender.Username != "" {
|
||||
if sender.Username == trimmed || sender.Username == allowedUser {
|
||||
return true
|
||||
}
|
||||
// Match against Username only when explicitly requested via "@username"
|
||||
if isAtUsername && sender.Username != "" && sender.Username == trimmed {
|
||||
return true
|
||||
}
|
||||
|
||||
// Match compound sender format against allowed parts
|
||||
|
||||
@@ -104,6 +104,16 @@ func TestMatchAllowed(t *testing.T) {
|
||||
allowed: "@alice",
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "plain entry does not match username",
|
||||
sender: bus.SenderInfo{
|
||||
Platform: "discord",
|
||||
PlatformID: "999999",
|
||||
Username: "123456",
|
||||
},
|
||||
allowed: "123456",
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "@username does not match",
|
||||
sender: telegramSender,
|
||||
@@ -123,6 +133,16 @@ func TestMatchAllowed(t *testing.T) {
|
||||
allowed: "999|alice",
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "compound matches by ID when username differs",
|
||||
sender: bus.SenderInfo{
|
||||
Platform: "discord",
|
||||
PlatformID: "123456",
|
||||
Username: "not123456",
|
||||
},
|
||||
allowed: "123456|alice",
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "compound does not match",
|
||||
sender: telegramSender,
|
||||
|
||||
Reference in New Issue
Block a user