all: imp code

internal/cmd/proxy.go

@@ -46,16 +46,13 @@ func createProxyConfig(
 		return nil, err
 	}
 
-	reqHdlr, err := handler.NewDefault(&handler.DefaultConfig{
+	reqHdlr := handler.NewDefault(&handler.DefaultConfig{
 		Logger: l.With(slogutil.KeyPrefix, "default_handler"),
 		// TODO(e.burkov):  Use the configured message constructor.
 		MessageConstructor: dnsmsg.DefaultMessageConstructor{},
 		HaltIPv6:           conf.IPv6Disabled,
 		HostsFiles:         hosts,
 	})
-	if err != nil {
-		return nil, fmt.Errorf("creating default handler: %w", err)
-	}
 
 	proxyConf = &proxy.Config{
 		Logger: l.With(slogutil.KeyPrefix, proxy.LogPrefix),

internal/handler/default.go

@@ -35,7 +35,7 @@ type Default struct {
 }
 
 // NewDefault creates a new [Default] handler.
-func NewDefault(conf *DefaultConfig) (d *Default, err error) {
+func NewDefault(conf *DefaultConfig) (d *Default) {
 	mc, ok := conf.MessageConstructor.(messageConstructor)
 	if !ok {
 		mc = defaultConstructor{
@@ -48,7 +48,7 @@ func NewDefault(conf *DefaultConfig) (d *Default, err error) {
 		isIPv6Halted: conf.HaltIPv6,
 		messages:     mc,
 		hosts:        conf.HostsFiles,
-	}, nil
+	}
 }
 
 // HandleRequest resolves the DNS request within proxyCtx.  It only calls

internal/handler/default_internal_test.go

@@ -49,12 +49,11 @@ func TestDefault_haltAAAA(t *testing.T) {
 	t.Run("disabled", func(t *testing.T) {
 		t.Parallel()
 
-		hdlr, err := NewDefault(&DefaultConfig{
+		hdlr := NewDefault(&DefaultConfig{
 			Logger:             slogutil.NewDiscardLogger(),
 			MessageConstructor: messages,
 			HaltIPv6:           false,
 		})
-		require.NoError(t, err)
 
 		ctx := testutil.ContextWithTimeout(t, defaultTimeout)
 
@@ -65,12 +64,11 @@ func TestDefault_haltAAAA(t *testing.T) {
 	t.Run("enabled", func(t *testing.T) {
 		t.Parallel()
 
-		hdlr, err := NewDefault(&DefaultConfig{
+		hdlr := NewDefault(&DefaultConfig{
 			Logger:             slogutil.NewDiscardLogger(),
 			MessageConstructor: messages,
 			HaltIPv6:           true,
 		})
-		require.NoError(t, err)
 
 		ctx := testutil.ContextWithTimeout(t, defaultTimeout)
 
@@ -86,19 +84,18 @@ func TestDefault_resolveFromHosts(t *testing.T) {
 	messages := dnsmsg.DefaultMessageConstructor{}
 
 	relPath := path.Join("testdata", t.Name(), "hosts")
-	absPath, err := filepath.Abs(path.Join("testdata", t.Name(), "hosts.txt"))
+	absPath, err := filepath.Abs(path.Join("testdata", t.Name(), "hosts"))
 	require.NoError(t, err)
 
 	strg, err := ReadHosts([]string{absPath, relPath})
 	require.NoError(t, err)
 
-	hdlr, err := NewDefault(&DefaultConfig{
+	hdlr := NewDefault(&DefaultConfig{
 		MessageConstructor: messages,
 		Logger:             slogutil.NewDiscardLogger(),
 		HostsFiles:         strg,
 		HaltIPv6:           true,
 	})
-	require.NoError(t, err)
 
 	const (
 		domainV4 = "ipv4.domain.example"

internal/handler/hosts.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/netip"
 	"os"
-	"path/filepath"
 	"slices"
 	"strings"
 
@@ -66,13 +65,8 @@ func ReadHosts(paths []string) (strg hostsfile.Storage, err error) {
 
 // readHostsFile reads the hosts file at path and parses it into strg.
 func readHostsFile(strg *hostsfile.DefaultStorage, path string) (err error) {
-	absPath, err := filepath.Abs(path)
-	if err != nil {
-		return err
-	}
-
 	// #nosec G304 -- Trust the file path from the configuration file.
-	f, err := os.Open(absPath)
+	f, err := os.Open(path)
 	if err != nil {
 		return err
 	}

internal/handler/testdata/TestDefault_resolveFromHosts/hosts

@@ -1,3 +1,3 @@
 1.2.3.4     ipv4.domain.example
-# 2001:db8::1 ipv6.domain.example
+2001:db8::1 ipv6.domain.example
 # comment