Add support in http provider

Author: jsumners

challenge/http01/http_challenge_server.go

@@ -12,6 +12,14 @@ import (
 	"github.com/go-acme/lego/v4/log"
 )
 
+type ProviderNetwork string
+
+const (
+	DefaultNetwork = "tcp"
+	Tcp4Network    = "tcp4"
+	Tcp6Network    = "tcp6"
+)
+
 // ProviderServer implements ChallengeProvider for `http-01` challenge.
 // It may be instantiated without using the NewProviderServer function if
 // you want only to use the default values.
@@ -29,12 +37,15 @@ type ProviderServer struct {
 // NewProviderServer creates a new ProviderServer on the selected interface and port.
 // Setting iface and / or port to an empty string will make the server fall back to
 // the "any" interface and port 80 respectively.
-func NewProviderServer(iface, port string) *ProviderServer {
+func NewProviderServer(iface, port string, network ProviderNetwork) *ProviderServer {
 	if port == "" {
 		port = "80"
 	}
+	if network == "" {
+		network = DefaultNetwork
+	}
 
-	return &ProviderServer{network: "tcp", address: net.JoinHostPort(iface, port), matcher: &hostMatcher{}}
+	return &ProviderServer{network: string(network), address: net.JoinHostPort(iface, port), matcher: &hostMatcher{}}
 }
 
 func NewUnixProviderServer(socketPath string, mode fs.FileMode) *ProviderServer {

challenge/http01/http_challenge_test.go

@@ -36,17 +36,27 @@ func TestProviderServer_GetAddress(t *testing.T) {
 	}{
 		{
 			desc:     "TCP default address",
-			server:   NewProviderServer("", ""),
+			server:   NewProviderServer("", "", ""),
 			expected: ":80",
 		},
 		{
 			desc:     "TCP with explicit port",
-			server:   NewProviderServer("", "8080"),
+			server:   NewProviderServer("", "8080", ""),
 			expected: ":8080",
 		},
 		{
 			desc:     "TCP with host and port",
-			server:   NewProviderServer("localhost", "8080"),
+			server:   NewProviderServer("localhost", "8080", ""),
+			expected: "localhost:8080",
+		},
+		{
+			desc:     "TCP4 with host and port",
+			server:   NewProviderServer("localhost", "8080", Tcp4Network),
+			expected: "localhost:8080",
+		},
+		{
+			desc:     "TCP6 with host and port",
+			server:   NewProviderServer("localhost", "8080", Tcp6Network),
 			expected: "localhost:8080",
 		},
 		{
@@ -70,7 +80,7 @@ func TestProviderServer_GetAddress(t *testing.T) {
 func TestChallenge(t *testing.T) {
 	_, apiURL := tester.SetupFakeAPI(t)
 
-	providerServer := NewProviderServer("", "23457")
+	providerServer := NewProviderServer("", "23457", "")
 
 	validate := func(_ *api.Core, _ string, chlng acme.Challenge) error {
 		uri := "http://localhost" + providerServer.GetAddress() + ChallengePath(chlng.Token)
@@ -199,7 +209,7 @@ func TestChallengeInvalidPort(t *testing.T) {
 
 	validate := func(_ *api.Core, _ string, _ acme.Challenge) error { return nil }
 
-	solver := NewChallenge(core, validate, NewProviderServer("", "123456"))
+	solver := NewChallenge(core, validate, NewProviderServer("", "123456", ""))
 
 	authz := acme.Authorization{
 		Identifier: acme.Identifier{
@@ -374,7 +384,7 @@ func testServeWithProxy(t *testing.T, header, extra *testProxyHeader, expectErro
 
 	_, apiURL := tester.SetupFakeAPI(t)
 
-	providerServer := NewProviderServer("localhost", "23457")
+	providerServer := NewProviderServer("localhost", "23457", "")
 	if header != nil {
 		providerServer.SetProxyHeader(header.name)
 	}

cmd/setup_challenges.go

@@ -42,6 +42,16 @@ func setupChallenges(ctx *cli.Context, client *lego.Client) {
 }
 
 func setupHTTPProvider(ctx *cli.Context) challenge.Provider {
+	var network http01.ProviderNetwork
+	switch {
+	case ctx.IsSet("ipv4only") && ctx.IsSet("ipv6only"):
+		network = http01.DefaultNetwork
+	case ctx.IsSet("ipv4only"):
+		network = http01.Tcp4Network
+	case ctx.IsSet("ipv6only"):
+		network = http01.Tcp6Network
+	}
+
 	switch {
 	case ctx.IsSet("http.webroot"):
 		ps, err := webroot.NewHTTPProvider(ctx.String("http.webroot"))
@@ -66,13 +76,13 @@ func setupHTTPProvider(ctx *cli.Context) challenge.Provider {
 			log.Fatal(err)
 		}
 
-		srv := http01.NewProviderServer(host, port)
+		srv := http01.NewProviderServer(host, port, network)
 		if header := ctx.String("http.proxy-header"); header != "" {
 			srv.SetProxyHeader(header)
 		}
 		return srv
 	case ctx.Bool("http"):
-		srv := http01.NewProviderServer("", "")
+		srv := http01.NewProviderServer("", "", network)
 		if header := ctx.String("http.proxy-header"); header != "" {
 			srv.SetProxyHeader(header)
 		}