fix #983

irc/client_lookup_set.go

@@ -452,7 +452,7 @@ func (set *UserMaskSet) setRegexp() {
 	set.RUnlock()
 
 	if index > 0 {
-		expr := "^" + strings.Join(maskExprs, "|") + "$"
+		expr := "^(" + strings.Join(maskExprs, "|") + ")$"
 		re, _ = regexp.Compile(expr)
 	}
 

irc/client_test.go

@@ -27,3 +27,32 @@ func BenchmarkGenerateBatchID(b *testing.B) {
 		session.generateBatchID()
 	}
 }
+
+func TestUserMasks(t *testing.T) {
+	var um UserMaskSet
+
+	if um.Match("horse_!user@tor-network.onion") {
+		t.Error("bad match")
+	}
+
+	um.Add("_!*@*", "x", "x")
+	if !um.Match("_!user@tor-network.onion") {
+		t.Error("failure to match")
+	}
+	if um.Match("horse_!user@tor-network.onion") {
+		t.Error("bad match")
+	}
+
+	um.Add("beer*!*@*", "x", "x")
+	if !um.Match("beergarden!user@tor-network.onion") {
+		t.Error("failure to match")
+	}
+	if um.Match("horse_!user@tor-network.onion") {
+		t.Error("bad match")
+	}
+
+	um.Add("horse*!user@*", "x", "x")
+	if !um.Match("horse_!user@tor-network.onion") {
+		t.Error("failure to match")
+	}
+}