consolidate

pkg/js/js.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 
 	"github.com/StackExchange/dnscontrol/models"
-	"github.com/StackExchange/dnscontrol/transform"
+	"github.com/StackExchange/dnscontrol/pkg/transform"
 
 	"github.com/robertkrimen/otto"
 	//load underscore js into vm by default

transform/arpa.go

@@ -1,89 +0,0 @@
-package transform
-
-import (
-	"fmt"
-	"net"
-	"strings"
-)
-
-func ReverseDomainName(cidr string) (string, error) {
-	a, c, err := net.ParseCIDR(cidr)
-	if err != nil {
-		return "", err
-	}
-	base, err := reverseaddr(a.String())
-	if err != nil {
-		return "", err
-	}
-	base = strings.TrimRight(base, ".")
-	bits, total := c.Mask.Size()
-	var toTrim int
-	if bits == 0 {
-		return "", fmt.Errorf("Cannot use /0 in reverse cidr")
-	}
-	if total == 32 {
-		if bits%8 != 0 {
-			return "", fmt.Errorf("IPv4 mask must be multiple of 8 bits")
-		}
-		toTrim = (total - bits) / 8
-	} else if total == 128 {
-		if bits%4 != 0 {
-			return "", fmt.Errorf("IPv6 mask must be multiple of 4 bits")
-		}
-		toTrim = (total - bits) / 4
-	} else {
-		return "", fmt.Errorf("Invalid mask bit size: %d", total)
-	}
-
-	parts := strings.SplitN(base, ".", toTrim+1)
-	return parts[len(parts)-1], nil
-}
-
-// copied from go source.
-// https://github.com/golang/go/blob/bfc164c64d33edfaf774b5c29b9bf5648a6447fb/src/net/dnsclient.go#L15
-
-// reverseaddr returns the in-addr.arpa. or ip6.arpa. hostname of the IP
-// address addr suitable for rDNS (PTR) record lookup or an error if it fails
-// to parse the IP address.
-func reverseaddr(addr string) (arpa string, err error) {
-	ip := net.ParseIP(addr)
-	if ip == nil {
-		return "", &net.DNSError{Err: "unrecognized address", Name: addr}
-	}
-	if ip.To4() != nil {
-		return uitoa(uint(ip[15])) + "." + uitoa(uint(ip[14])) + "." + uitoa(uint(ip[13])) + "." + uitoa(uint(ip[12])) + ".in-addr.arpa.", nil
-	}
-	// Must be IPv6
-	buf := make([]byte, 0, len(ip)*4+len("ip6.arpa."))
-	// Add it, in reverse, to the buffer
-	for i := len(ip) - 1; i >= 0; i-- {
-		v := ip[i]
-		buf = append(buf, hexDigit[v&0xF])
-		buf = append(buf, '.')
-		buf = append(buf, hexDigit[v>>4])
-		buf = append(buf, '.')
-	}
-	// Append "ip6.arpa." and return (buf already has the final .)
-	buf = append(buf, "ip6.arpa."...)
-	return string(buf), nil
-}
-
-// Convert unsigned integer to decimal string.
-func uitoa(val uint) string {
-	if val == 0 { // avoid string allocation
-		return "0"
-	}
-	var buf [20]byte // big enough for 64bit value base 10
-	i := len(buf) - 1
-	for val >= 10 {
-		q := val / 10
-		buf[i] = byte('0' + val - q*10)
-		i--
-		val = q
-	}
-	// val < 10
-	buf[i] = byte('0' + val)
-	return string(buf[i:])
-}
-
-const hexDigit = "0123456789abcdef"

transform/arpa_test.go

@@ -1,45 +0,0 @@
-package transform
-
-import "testing"
-import "fmt"
-
-func TestReverse(t *testing.T) {
-	var tests = []struct {
-		in      string
-		isError bool
-		out     string
-	}{
-		{"174.136.107.0/24", false, "107.136.174.in-addr.arpa"},
-
-		{"174.136.0.0/16", false, "136.174.in-addr.arpa"},
-		{"174.136.43.0/16", false, "136.174.in-addr.arpa"}, //do bits set inside the masked range matter? Should this be invalid? Is there a shorter way to specify this?
-
-		{"174.0.0.0/8", false, "174.in-addr.arpa"},
-		{"174.136.43.0/8", false, "174.in-addr.arpa"},
-		{"174.136.43.0/8", false, "174.in-addr.arpa"},
-
-		{"2001::/16", false, "1.0.0.2.ip6.arpa"},
-		{"2001:0db8:0123:4567:89ab:cdef:1234:5670/124", false, "7.6.5.4.3.2.1.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.8.b.d.0.1.0.0.2.ip6.arpa"},
-
-		{"174.136.107.14/32", false, "14.107.136.174.in-addr.arpa"},
-		{"2001:0db8:0123:4567:89ab:cdef:1234:5678/128", false, "8.7.6.5.4.3.2.1.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.8.b.d.0.1.0.0.2.ip6.arpa"},
-
-		//Errror Cases:
-		{"0.0.0.0/0", true, ""},
-		{"2001::/0", true, ""},
-		{"4.5/16", true, ""},
-		{"foo.com", true, ""},
-	}
-	for i, tst := range tests {
-		t.Run(fmt.Sprintf("%d--%s", i, tst.in), func(t *testing.T) {
-			d, err := ReverseDomainName(tst.in)
-			if err != nil && !tst.isError {
-				t.Error("Should not have errored ", err)
-			} else if tst.isError && err == nil {
-				t.Errorf("Should have errored, but didn't. Got %s", d)
-			} else if d != tst.out {
-				t.Errorf("Expected '%s' but got '%s'", tst.out, d)
-			}
-		})
-	}
-}