Fix invalid model header resulting in DoH failure

Fixes #934

host/model_darwin.go

@@ -1,12 +1,13 @@
 package host
 
 import (
+	"bytes"
 	"os/exec"
 )
 
 func Model() string {
 	if b, err := exec.Command("sysctl", "-n", "hw.model").Output(); err == nil && len(b) > 0 {
-		return "Apple " + string(b)
+		return "Apple " + string(bytes.TrimSpace(b))
 	}
 	return ""
 }

host/model_dragonfly.go

@@ -1,10 +1,13 @@
 package host
 
-import "os/exec"
+import (
+	"bytes"
+	"os/exec"
+)
 
 func Model() string {
 	if b, err := exec.Command("sysctl", "-n", "kern.version").Output(); err == nil && len(b) > 0 {
-		return string(b)
+		return string(bytes.TrimSpace(b))
 	}
 	return "DragonFly BSD"
 }

host/model_freebsd.go

@@ -1,10 +1,13 @@
 package host
 
-import "os/exec"
+import (
+	"bytes"
+	"os/exec"
+)
 
 func Model() string {
 	if b, err := exec.Command("sysctl", "-n", "kern.version").Output(); err == nil && len(b) > 0 {
-		return string(b)
+		return string(bytes.TrimSpace(b))
 	}
 	return "FreeBSD"
 }

host/model_linux.go

@@ -2,6 +2,7 @@ package host
 
 import (
 	"bufio"
+	"bytes"
 	"os"
 	"os/exec"
 	"strings"
@@ -26,7 +27,7 @@ func Model() string {
 func tryExec(cmds [][]string) string {
 	for _, cmd := range cmds {
 		if out, err := exec.Command(cmd[0], cmd[1:]...).Output(); err == nil && len(out) > 0 {
-			return string(out)
+			return string(bytes.TrimSpace(out))
 		}
 	}
 	return ""
@@ -41,7 +42,7 @@ func osName() string {
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
 		if strings.HasPrefix(scanner.Text(), "PRETTY_NAME=") {
-			return strings.Trim(scanner.Text()[12:], "\"")
+			return string(bytes.Trim(bytes.TrimSpace(scanner.Bytes()[12:]), "\""))
 		}
 	}
 	return ""

host/model_netbsd.go

@@ -1,10 +1,13 @@
 package host
 
-import "os/exec"
+import (
+	"bytes"
+	"os/exec"
+)
 
 func Model() string {
 	if b, err := exec.Command("sysctl", "-n", "kern.version").Output(); err == nil && len(b) > 0 {
-		return string(b)
+		return string(bytes.TrimSpace(b))
 	}
 	return "NetBSD"
 }

host/model_openbsd.go

@@ -1,10 +1,13 @@
 package host
 
-import "os/exec"
+import (
+	"bytes"
+	"os/exec"
+)
 
 func Model() string {
 	if b, err := exec.Command("sysctl", "-n", "kern.version").Output(); err == nil && len(b) > 0 {
-		return string(b)
+		return string(bytes.TrimSpace(b))
 	}
 	return "OpenBSD"
 }

resolver/doh.go

@@ -101,6 +101,7 @@ func (r *DOH) resolve(ctx context.Context, q query.Query, buf []byte, rt http.Ro
 		req.Header.Set("X-Device-Ip", ci.IP)
 	}
 	if ci.Model != "" {
+		println(ci.Model)
 		req.Header.Set("X-Device-Model", ci.Model)
 	}
 	if ci.Name != "" {