Fixes: debug RR and header bits (#151)

Always set the auth and rd bits in the reply. And reverse the
ownername of debug queries so that manual matching is much easier.

middleware/etcd/msg/path.go

@@ -0,0 +1,46 @@
+package msg
+
+import (
+	"path"
+	"strings"
+
+	"github.com/miekg/dns"
+)
+
+// Path converts a domainname to an etcd path. If s looks like service.staging.skydns.local.,
+// the resulting key will be /skydns/local/skydns/staging/service .
+func Path(s, prefix string) string {
+	l := dns.SplitDomainName(s)
+	for i, j := 0, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	return path.Join(append([]string{"/" + prefix + "/"}, l...)...)
+}
+
+// Domain is the opposite of Path.
+func Domain(s string) string {
+	l := strings.Split(s, "/")
+	// start with 1, to strip /skydns
+	for i, j := 1, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	return dns.Fqdn(strings.Join(l[1:len(l)-1], "."))
+}
+
+// As Path, but if a name contains wildcards (* or any), the name will be
+// chopped of before the (first) wildcard, and we do a highler evel search and
+// later find the matching names.  So service.*.skydns.local, will look for all
+// services under skydns.local and will later check for names that match
+// service.*.skydns.local.  If a wildcard is found the returned bool is true.
+func PathWithWildcard(s, prefix string) (string, bool) {
+	l := dns.SplitDomainName(s)
+	for i, j := 0, len(l)-1; i < j; i, j = i+1, j-1 {
+		l[i], l[j] = l[j], l[i]
+	}
+	for i, k := range l {
+		if k == "*" || k == "any" {
+			return path.Join(append([]string{"/" + prefix + "/"}, l[:i]...)...), true
+		}
+	}
+	return path.Join(append([]string{"/" + prefix + "/"}, l...)...), false
+}

middleware/etcd/msg/path_test.go

@@ -0,0 +1,12 @@
+package msg
+
+import "testing"
+
+func TestPath(t *testing.T) {
+	for _, path := range []string{"mydns", "skydns"} {
+		result := Path("service.staging.skydns.local.", path)
+		if result != "/"+path+"/local/skydns/staging/service" {
+			t.Errorf("Failure to get domain's path with prefix: %s", result)
+		}
+	}
+}

middleware/etcd/msg/service.go

@@ -39,13 +39,13 @@ type Service struct {
 // RR returns an RR representation of s. It is in a condensed form to minimize space
 // when this is returned in a DNS message.
 // The RR will look like:
-//	skydns.local.skydns.east.production.rails.1. 300 CH TXT "service1.example.com:8080(10,0,,false)[0,]"
-//                      etcd Key                     Ttl               Host:Port          <   see below   >
+//	1.rails.production.east.skydns.local. 300 CH TXT "service1.example.com:8080(10,0,,false)[0,]"
+//                      etcd Key              Ttl               Host:Port          <   see below   >
 // between parens: (Priority, Weight, Text (only first 200 bytes!), Mail)
 // between blockquotes: [TargetStrip,Group]
 // If the record is synthesised by CoreDNS (i.e. no lookup in etcd happened):
 //
-//	skydns.local.skydns.east.production.rails.1. 300 CH TXT "service1.example.com:8080(10,0,,false)[0,]"
+//	TODO(miek): what to put here?
 //
 func (s *Service) RR() *dns.TXT {
 	l := len(s.Text)
@@ -56,8 +56,7 @@ func (s *Service) RR() *dns.TXT {
 	t.Hdr.Class = dns.ClassCHAOS
 	t.Hdr.Ttl = s.Ttl
 	t.Hdr.Rrtype = dns.TypeTXT
-	// TODO(miek): key guaranteerd to be > 1?
-	t.Hdr.Name = strings.Replace(s.Key[1:], "/", ".", -1) + "." // TODO(miek): slightly more like etcd.Domain()
+	t.Hdr.Name = Domain(s.Key)
 
 	t.Txt = make([]string, 1)
 	t.Txt[0] = fmt.Sprintf("%s:%d(%d,%d,%s,%t)[%d,%s]",