From 2255857b3a59a6e9bb8a665e9543770889451e41 Mon Sep 17 00:00:00 2001
From: Herman Slatman <hermanslatman@hotmail.com>
Date: Wed, 28 Feb 2024 10:50:49 +0100
Subject: [PATCH] Fix `client` shadowing and e2e request ID test case

---
 ca/client.go               | 20 ++++++++++----------
 test/e2e/requestid_test.go | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ca/client.go b/ca/client.go
index d7ec28752..0c0f9907e 100644
--- a/ca/client.go
+++ b/ca/client.go
@@ -397,8 +397,8 @@ func getTransportFromSHA256(endpoint, sum string) (http.RoundTripper, error) {
 	if err != nil {
 		return nil, err
 	}
-	client := &Client{endpoint: u}
-	root, err := client.Root(sum)
+	caClient := &Client{endpoint: u}
+	root, err := caClient.Root(sum)
 	if err != nil {
 		return nil, err
 	}
@@ -759,14 +759,14 @@ func (c *Client) Renew(tr http.RoundTripper) (*api.SignResponse, error) {
 func (c *Client) RenewWithContext(ctx context.Context, tr http.RoundTripper) (*api.SignResponse, error) {
 	var retried bool
 	u := c.endpoint.ResolveReference(&url.URL{Path: "/renew"})
-	client := &http.Client{Transport: tr}
+	caClient := &http.Client{Transport: tr}
 retry:
 	req, err := http.NewRequestWithContext(ctx, "POST", u.String(), http.NoBody)
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/json")
-	resp, err := client.Do(req)
+	resp, err := caClient.Do(req)
 	if err != nil {
 		return nil, clientError(err)
 	}
@@ -836,14 +836,14 @@ func (c *Client) RekeyWithContext(ctx context.Context, req *api.RekeyRequest, tr
 		return nil, errors.Wrap(err, "error marshaling request")
 	}
 	u := c.endpoint.ResolveReference(&url.URL{Path: "/rekey"})
-	client := &http.Client{Transport: tr}
+	caClient := &http.Client{Transport: tr}
 retry:
 	httpReq, err := http.NewRequestWithContext(ctx, "POST", u.String(), bytes.NewReader(body))
 	if err != nil {
 		return nil, err
 	}
 	httpReq.Header.Set("Content-Type", "application/json")
-	resp, err := client.Do(httpReq)
+	resp, err := caClient.Do(httpReq)
 	if err != nil {
 		return nil, clientError(err)
 	}
@@ -875,16 +875,16 @@ func (c *Client) RevokeWithContext(ctx context.Context, req *api.RevokeRequest,
 	if err != nil {
 		return nil, errors.Wrap(err, "error marshaling request")
 	}
-	var client *uaClient
+	var uaClient *uaClient
 retry:
 	if tr != nil {
-		client = newClient(tr)
+		uaClient = newClient(tr)
 	} else {
-		client = c.client
+		uaClient = c.client
 	}
 
 	u := c.endpoint.ResolveReference(&url.URL{Path: "/revoke"})
-	resp, err := client.PostWithContext(ctx, u.String(), "application/json", bytes.NewReader(body))
+	resp, err := uaClient.PostWithContext(ctx, u.String(), "application/json", bytes.NewReader(body))
 	if err != nil {
 		return nil, clientError(err)
 	}
diff --git a/test/e2e/requestid_test.go b/test/e2e/requestid_test.go
index a1afd4234..2653039c1 100644
--- a/test/e2e/requestid_test.go
+++ b/test/e2e/requestid_test.go
@@ -19,7 +19,7 @@ import (
 	"go.step.sm/crypto/pemutil"
 )
 
-func TestXxx(t *testing.T) {
+func Test_reflectRequestID(t *testing.T) {
 	dir := t.TempDir()
 	m, err := minica.New(minica.WithName("Step E2E"))
 	require.NoError(t, err)
@@ -37,9 +37,11 @@ func TestXxx(t *testing.T) {
 	require.NoError(t, err)
 
 	// get a random address to listen on and connect to; currently no nicer way to get one before starting the server
-	l, err := net.Listen("tcp", "127.0.0.1:0")
+	l, err := net.Listen("tcp4", ":0")
 	require.NoError(t, err)
 	randomAddress := l.Addr().String()
+	_, port, err := net.SplitHostPort(l.Addr().String())
+	require.NoError(t, err)
 	err = l.Close()
 	require.NoError(t, err)
 
@@ -48,7 +50,7 @@ func TestXxx(t *testing.T) {
 		IntermediateCert: intermediateCertFilepath,
 		IntermediateKey:  intermediateKeyFilepath,
 		Address:          randomAddress, // reuse the address that was just "reserved"
-		DNSNames:         []string{"127.0.0.1", "stepca.localhost"},
+		DNSNames:         []string{"127.0.0.1", "[::1]", "localhost"},
 		AuthorityConfig: &config.AuthConfig{
 			AuthorityID:    "stepca-test",
 			DeploymentType: "standalone-test",
@@ -60,7 +62,7 @@ func TestXxx(t *testing.T) {
 
 	// instantiate a client for the CA running at the random address
 	caClient, err := ca.NewClient(
-		fmt.Sprintf("https://%s", randomAddress),
+		fmt.Sprintf("https://localhost:%s", port),
 		ca.WithRootFile(rootFilepath),
 	)
 	require.NoError(t, err)