Merge pull request #131 from akamai/release/v1.1.1

Release/v1.1.1
akamai · May 11, 2021 · 0c6ee5c · 0c6ee5c
2 parents 714bc0a + 225d65d
commit 0c6ee5c
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # EDGEGRID GOLANG RELEASE NOTES
 
+## 1.1.1 (May 11, 2021)
+
+#### BUG FIXES
+
+* DNSv2
+  * Fixed parsing SVCB, HTTPS rdata.
+
 ## 1.1.0 (Feb 23, 2021)
 
 #### FEATURES/ENHANCEMENTS:

diff --git a/configdns-v2/record_lookup.go b/configdns-v2/record_lookup.go
@@ -447,19 +447,31 @@ func ParseRData(rtype string, rdata []string) map[string]interface{} {
 
 	case "SVCB":
 		for _, rcontent := range rdata {
-			parts := strings.Split(rcontent, " ")
+			parts := strings.SplitN(rcontent, " ", 3)
+			// has to be at least two fields.
+			if len(parts) < 2 {
+				break
+			}
 			fieldMap["svc_priority"], _ = strconv.Atoi(parts[0])
 			fieldMap["target_name"] = parts[1]
-			fieldMap["svc_params"] = parts[2]
+			if len(parts) > 2 {
+				fieldMap["svc_params"] = parts[2]
+			}
 			break
 		}
 
 	case "HTTPS":
 		for _, rcontent := range rdata {
-			parts := strings.Split(rcontent, " ")
+			parts := strings.SplitN(rcontent, " ", 3)
+			// has to be at least two fields.
+			if len(parts) < 2 {
+				break
+			}
 			fieldMap["svc_priority"], _ = strconv.Atoi(parts[0])
 			fieldMap["target_name"] = parts[1]
-			fieldMap["svc_params"] = parts[2]
+			if len(parts) > 2 {
+				fieldMap["svc_params"] = parts[2]
+			}
 			break
 		}
 

diff --git a/configdns-v2/record_test.go b/configdns-v2/record_test.go
@@ -265,3 +265,91 @@ func TestGetRecord(t *testing.T) {
 	assert.Equal(t, testrecord.Name, dnsTestRecordName)
 
 }
+
+func TestParseRDataNoParams(t *testing.T) {
+
+	rtype := "SVCB"
+	rdata := []string{"0 svc4.example.com."}
+
+	parsedData := ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 2)
+	assert.Equal(t, parsedData["svc_priority"].(int), 0)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+}
+
+func TestParseRDataOneParam(t *testing.T) {
+
+	rtype := "HTTPS"
+	// quoted
+	rdata := []string{"3 svc4.example.com. alpn=\"bar\""}
+	parsedData := ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn=\"bar\"")
+
+	// unquoted
+	rdata = []string{"3 svc4.example.com. alpn=bar"}
+	parsedData = ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn=bar")
+}
+
+func TestParseRDataMultipleParams(t *testing.T) {
+
+	rtype := "SVCB"
+	// quoted
+	rdata := []string{"3 svc4.example.com. alpn=\"bar\" port=\"8080\""}
+	parsedData := ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn=\"bar\" port=\"8080\"")
+
+	// unquoted
+	rdata = []string{"3 svc4.example.com. alpn=bar port=8080"}
+	parsedData = ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn=bar port=8080")
+
+	// mixed
+	rdata = []string{"3 svc4.example.com. alpn=bar port=\"8080\""}
+	parsedData = ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn=bar port=\"8080\"")
+}
+
+func TestParseRDataParamNoVal(t *testing.T) {
+
+	rtype := "HTTPS"
+
+	rdata := []string{"3 svc4.example.com. alpn"}
+	parsedData := ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 3)
+	assert.Equal(t, parsedData["svc_priority"].(int), 3)
+	assert.Equal(t, parsedData["target_name"].(string), "svc4.example.com.")
+	assert.Equal(t, parsedData["svc_params"].(string), "alpn")
+}
+
+func TestParseRDataMissingFields(t *testing.T) {
+
+	rtype := "SVCB"
+
+	rdata := []string{"svc4.example.com."}
+	parsedData := ParseRData(rtype, rdata)
+	delete(parsedData, "target")
+	assert.Equal(t, len(parsedData), 0)
+}