fix: ipv6 handling for RemoteAddr

Author: its-felix

functionurl_test.go

@@ -11,14 +11,15 @@ import (
 	"github.com/its-felix/aws-lambda-go-http-adapter/handler"
 	"github.com/labstack/echo/v4"
 	"io"
+	"net"
 	"net/http"
 	"reflect"
 	"strings"
 	"testing"
 	"time"
 )
 
-func newFunctionURLRequest() events.LambdaFunctionURLRequest {
+func newFunctionURLRequest(sourceIp string) events.LambdaFunctionURLRequest {
 	return events.LambdaFunctionURLRequest{
 		Version:               "2.0",
 		RawPath:               "/example",
@@ -39,7 +40,7 @@ func newFunctionURLRequest() events.LambdaFunctionURLRequest {
 				Method:    "POST",
 				Path:      "/example",
 				Protocol:  "HTTP/1.1",
-				SourceIP:  "127.0.0.1",
+				SourceIP:  sourceIp,
 				UserAgent: "Go-http-client/1.1",
 			},
 		},
@@ -150,7 +151,7 @@ func newFiberAdapter() handler.AdapterFunc {
 		result := make(map[string]string)
 		result["Method"] = ctx.Method()
 		result["URL"] = ctx.Request().URI().String()
-		result["RemoteAddr"] = ctx.IP() + ":http" // fiber uses net.ResolveTCPAddr which resolves :http to :80
+		result["RemoteAddr"] = net.JoinHostPort(ctx.IP(), "http") // fiber uses net.ResolveTCPAddr which resolves :http to :80
 		result["Body"] = string(ctx.Body())
 
 		return ctx.JSON(result)
@@ -262,38 +263,47 @@ func TestFunctionURLPOST(t *testing.T) {
 }
 
 func runTestFunctionURLPOST[T any](t *testing.T, h func(context.Context, events.LambdaFunctionURLRequest) (T, error), ex extractor[T]) {
-	req := newFunctionURLRequest()
-	res, err := h(context.Background(), req)
-	if err != nil {
-		t.Error(err)
+	sourceIps := map[string][2]string{
+		"ipv4": {"127.0.0.1", "127.0.0.1:http"},
+		"ipv6": {"::1", "[::1]:http"},
 	}
 
-	if ex.StatusCode(res) != http.StatusOK {
-		t.Error("expected status to be 200")
-	}
-
-	if ex.Headers(res)["Content-Type"] != "application/json" {
-		t.Error("expected Content-Type to be application/json")
-	}
-
-	if ex.IsBase64Encoded(res) {
-		t.Error("expected body not to be base64 encoded")
-	}
-
-	body := make(map[string]string)
-	_ = json.Unmarshal([]byte(ex.Body(res)), &body)
-
-	expectedBody := map[string]string{
-		"Method":     "POST",
-		"URL":        "https://0dhg9709da0dhg9709da0dhg9709da.lambda-url.eu-central-1.on.aws/example?key=value",
-		"RemoteAddr": "127.0.0.1:http",
-		"Body":       "hello world",
-	}
-
-	if !reflect.DeepEqual(body, expectedBody) {
-		t.Logf("expected: %v", expectedBody)
-		t.Logf("actual: %v", body)
-		t.Error("request/response didnt match")
+	for name, inputPair := range sourceIps {
+		t.Run(name, func(t *testing.T) {
+			req := newFunctionURLRequest(inputPair[0])
+			res, err := h(context.Background(), req)
+			if err != nil {
+				t.Error(err)
+			}
+
+			if ex.StatusCode(res) != http.StatusOK {
+				t.Error("expected status to be 200")
+			}
+
+			if ex.Headers(res)["Content-Type"] != "application/json" {
+				t.Error("expected Content-Type to be application/json")
+			}
+
+			if ex.IsBase64Encoded(res) {
+				t.Error("expected body not to be base64 encoded")
+			}
+
+			body := make(map[string]string)
+			_ = json.Unmarshal([]byte(ex.Body(res)), &body)
+
+			expectedBody := map[string]string{
+				"Method":     "POST",
+				"URL":        "https://0dhg9709da0dhg9709da0dhg9709da.lambda-url.eu-central-1.on.aws/example?key=value",
+				"RemoteAddr": inputPair[1],
+				"Body":       "hello world",
+			}
+
+			if !reflect.DeepEqual(body, expectedBody) {
+				t.Logf("expected: %v", expectedBody)
+				t.Logf("actual: %v", body)
+				t.Error("request/response didnt match")
+			}
+		})
 	}
 }
 
@@ -328,7 +338,7 @@ func TestFunctionURLWithPanicAndRecover(t *testing.T) {
 }
 
 func runTestFunctionURLPanicAndRecover[T any](t *testing.T, h func(context.Context, events.LambdaFunctionURLRequest) (T, error)) {
-	req := newFunctionURLRequest()
+	req := newFunctionURLRequest("127.0.0.1")
 	_, err := h(context.Background(), req)
 	if err == nil {
 		t.Error("expected to receive an error")
@@ -362,7 +372,7 @@ func TestFunctionURLDelayed(t *testing.T) {
 }
 
 func runTestFunctionURLDelayed[T any](t *testing.T, h func(context.Context, events.LambdaFunctionURLRequest) (T, error), ex extractor[T]) {
-	req := newFunctionURLRequest()
+	req := newFunctionURLRequest("127.0.0.1")
 	res, err := h(context.Background(), req)
 	if err != nil {
 		t.Error(err)

handler/apigwv1.go

@@ -53,7 +53,7 @@ func convertApiGwV1Request(ctx context.Context, event events.APIGatewayProxyRequ
 		req.ProtoMajor, req.ProtoMinor = pMajor, pMinor
 	}
 
-	req.RemoteAddr = event.RequestContext.Identity.SourceIP + ":http"
+	req.RemoteAddr = buildRemoteAddr(event.RequestContext.Identity.SourceIP)
 	req.RequestURI = req.URL.RequestURI()
 
 	return req, nil

handler/apigwv2.go

@@ -37,7 +37,7 @@ func convertApiGwV2Request(ctx context.Context, event events.APIGatewayV2HTTPReq
 		req.ProtoMajor, req.ProtoMinor = pMajor, pMinor
 	}
 
-	req.RemoteAddr = event.RequestContext.HTTP.SourceIP + ":http"
+	req.RemoteAddr = buildRemoteAddr(event.RequestContext.HTTP.SourceIP)
 	req.RequestURI = req.URL.RequestURI()
 
 	return req, nil

handler/common.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"encoding/base64"
 	"io"
+	"net"
 	"net/url"
 	"strings"
 )
@@ -57,3 +58,7 @@ func getBody(body string, isB64 bool) io.Reader {
 
 	return b
 }
+
+func buildRemoteAddr(sourceIp string) string {
+	return net.JoinHostPort(sourceIp, "http")
+}

handler/functionurl.go

@@ -38,7 +38,7 @@ func convertFunctionURLRequest(ctx context.Context, event events.LambdaFunctionU
 		req.ProtoMajor, req.ProtoMinor = pMajor, pMinor
 	}
 
-	req.RemoteAddr = event.RequestContext.HTTP.SourceIP + ":http"
+	req.RemoteAddr = buildRemoteAddr(event.RequestContext.HTTP.SourceIP)
 	req.RequestURI = req.URL.RequestURI()
 
 	return req, nil