Merge pull request '[agent/codex:gpt-5.4-mini] Read docs/RFC.md fully. Find ONE feature described in the sp...' (#62) from main into dev

This commit is contained in:
Virgil 2026-04-03 22:15:55 +00:00
commit b868602c7f
2 changed files with 32 additions and 3 deletions

View file

@ -971,14 +971,14 @@ func findWildcardMatch(name string, records map[string]NameRecords) (NameRecords
}
func wildcardMatches(suffix, name string) bool {
parts := strings.Split(suffix, ".")
if len(parts) == 0 || len(name) <= len(suffix)+1 {
if suffix == "" || name == suffix {
return false
}
if !strings.HasSuffix(name, "."+suffix) {
return false
}
return strings.Count(name[:len(name)-len(suffix)], ".") >= 1
prefix := strings.TrimSuffix(name, "."+suffix)
return prefix != "" && !strings.Contains(prefix, ".")
}
func betterWildcardMatch(candidate, current string) bool {

View file

@ -93,6 +93,35 @@ func TestServiceResolveUsesMostSpecificWildcard(t *testing.T) {
}
}
func TestServiceResolveWildcardMatchesOnlyOneLabel(t *testing.T) {
service := NewService(ServiceOptions{
Records: map[string]NameRecords{
"*.charon.lthn": {
A: []string{"10.0.0.2"},
},
"*.bar.charon.lthn": {
A: []string{"10.0.0.3"},
},
},
})
if _, ok := service.Resolve("foo.bar.charon.lthn"); !ok {
t.Fatal("expected deeper wildcard match to resolve against the matching depth")
}
result, ok := service.Resolve("foo.charon.lthn")
if !ok {
t.Fatal("expected single-label wildcard to resolve")
}
if len(result.A) != 1 || result.A[0] != "10.0.0.2" {
t.Fatalf("unexpected wildcard result for single-label match: %#v", result.A)
}
if _, ok := service.Resolve("foo.baz.charon.lthn"); ok {
t.Fatal("expected wildcard to require an exact one-label match")
}
}
func TestServiceResolveTXTUsesWildcard(t *testing.T) {
service := NewService(ServiceOptions{
Records: map[string]NameRecords{