Merge pull request #1013 from p53/fix-prefix-to-lower

Fix txt prefix bug, should be lowercased because when writing to dns …
kubernetes-sigs · Sep 10, 2019 · 8da3b34 · 8da3b34
2 parents 74582ef + b685c73
commit 8da3b34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/registry/txt.go b/registry/txt.go
@@ -202,12 +202,13 @@ type prefixNameMapper struct {
 var _ nameMapper = prefixNameMapper{}
 
 func newPrefixNameMapper(prefix string) prefixNameMapper {
-	return prefixNameMapper{prefix: prefix}
+	return prefixNameMapper{prefix: strings.ToLower(prefix)}
 }
 
 func (pr prefixNameMapper) toEndpointName(txtDNSName string) string {
-	if strings.HasPrefix(txtDNSName, pr.prefix) {
-		return strings.TrimPrefix(txtDNSName, pr.prefix)
+	lowerDNSName := strings.ToLower(txtDNSName)
+	if strings.HasPrefix(lowerDNSName, pr.prefix) {
+		return strings.TrimPrefix(lowerDNSName, pr.prefix)
 	}
 	return ""
 }

diff --git a/registry/txt_test.go b/registry/txt_test.go
@@ -77,7 +77,7 @@ func testTXTRegistryRecordsPrefixed(t *testing.T) {
 			newEndpointWithOwner("txt.bar.test-zone.example.org", "baz.test-zone.example.org", endpoint.RecordTypeCNAME, ""),
 			newEndpointWithOwner("qux.test-zone.example.org", "random", endpoint.RecordTypeTXT, ""),
 			newEndpointWithOwnerAndLabels("tar.test-zone.example.org", "tar.loadbalancer.com", endpoint.RecordTypeCNAME, "", endpoint.Labels{"tar": "sometar"}),
-			newEndpointWithOwner("txt.tar.test-zone.example.org", "\"heritage=external-dns,external-dns/owner=owner-2\"", endpoint.RecordTypeTXT, ""),
+			newEndpointWithOwner("TxT.tar.test-zone.example.org", "\"heritage=external-dns,external-dns/owner=owner-2\"", endpoint.RecordTypeTXT, ""), // case-insensitive TXT prefix
 			newEndpointWithOwner("foobar.test-zone.example.org", "foobar.loadbalancer.com", endpoint.RecordTypeCNAME, ""),
 			newEndpointWithOwner("foobar.test-zone.example.org", "\"heritage=external-dns,external-dns/owner=owner\"", endpoint.RecordTypeTXT, ""),
 		},
@@ -140,6 +140,11 @@ func testTXTRegistryRecordsPrefixed(t *testing.T) {
 	records, _ := r.Records()
 
 	assert.True(t, testutils.SameEndpoints(records, expectedRecords))
+
+	// Ensure prefix is case-insensitive
+	r, _ = NewTXTRegistry(p, "TxT.", "owner", time.Hour)
+	records, _ = r.Records()
+
 	assert.True(t, testutils.SameEndpointLabels(records, expectedRecords))
 }