Merge pull request #139 from fastly/dgryski/origin-addr-port

fsthttp, internal: add get_addr_dest_ip/port hostcalls

Author: dgryski

fsthttp/response.go

@@ -5,6 +5,8 @@ package fsthttp
 import (
 	"fmt"
 	"io"
+	"net"
+	"strconv"
 	"sync"
 
 	"github.com/fastly/compute-sdk-go/internal/abi/fastly"
@@ -32,13 +34,51 @@ type Response struct {
 
 	// Body of the response.
 	Body io.ReadCloser
+
+	abi struct {
+		resp *fastly.HTTPResponse
+	}
 }
 
 // Cookies parses and returns the cookies set in the Set-Cookie headers.
 func (resp *Response) Cookies() []*Cookie {
 	return readSetCookies(resp.Header)
 }
 
+// RemoteAddr returns the address of the server that provided the response.
+func (resp *Response) RemoteAddr() (net.Addr, error) {
+
+	var addr netaddr
+	var err error
+
+	addr.ip, err = resp.abi.resp.GetAddrDestIP()
+	if err != nil {
+		return nil, fmt.Errorf("get addr dest ip: %w", err)
+	}
+
+	addr.port, err = resp.abi.resp.GetAddrDestPort()
+	if err != nil {
+		return nil, fmt.Errorf("get addr dest port: %w", err)
+	}
+
+	return &addr, nil
+}
+
+type netaddr struct {
+	ip   net.IP
+	port uint16
+}
+
+var _ net.Addr = (*netaddr)(nil)
+
+func (n *netaddr) Network() string {
+	return "tcp"
+}
+
+func (n *netaddr) String() string {
+	return net.JoinHostPort(n.ip.String(), strconv.Itoa(int(n.port)))
+}
+
 func newResponse(req *Request, backend string, abiResp *fastly.HTTPResponse, abiBody *fastly.HTTPBody) (*Response, error) {
 	code, err := abiResp.GetStatusCode()
 	if err != nil {

internal/abi/fastly/hostcalls_noguest.go

@@ -177,6 +177,14 @@ func (r *HTTPRequest) SetFramingHeadersMode(manual bool) error {
 	return fmt.Errorf("not implemented")
 }
 
+func (r *HTTPResponse) GetAddrDestIP() (net.IP, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (r *HTTPResponse) GetAddrDestPort() (uint16, error) {
+	return 0, fmt.Errorf("not implemented")
+}
+
 func HandoffWebsocket(backend string) error {
 	return fmt.Errorf("not implemented")
 }

internal/abi/fastly/http_guest.go

@@ -1869,6 +1869,70 @@ func (r *HTTPResponse) SetFramingHeadersMode(manual bool) error {
 	).toError()
 }
 
+// witx:
+//
+//	;;; Hostcall for getting the destination IP used for this request.
+//	;;;
+//	;;; The buffer for the IP address must be 16 bytes.
+//	;;; syntax used in URLs as specified in RFC 3986 section 3.
+//	(@interface func (export "get_addr_dest_ip")
+//		(param $h $response_handle)
+//		;; must be a 16-byte array
+//		(param $addr_octets_out (@witx pointer (@witx char8)))
+//		(result $err (expected $num_bytes (error $fastly_status)))
+//	)
+//
+//go:wasmimport fastly_http_resp get_addr_dest_ip
+//go:noescape
+func fastlyHTTPRespGetAddrDestIP(
+	h responseHandle,
+	addr prim.Pointer[prim.Char8],
+	nWritten prim.Pointer[prim.Usize],
+) FastlyStatus
+
+// GetAddrDestIP
+func (r *HTTPResponse) GetAddrDestIP() (net.IP, error) {
+	buf := prim.NewWriteBuffer(ipBufLen)
+
+	if err := fastlyHTTPRespGetAddrDestIP(
+		r.h,
+		prim.ToPointer(buf.Char8Pointer()),
+		prim.ToPointer(buf.NPointer()),
+	).toError(); err != nil {
+		return nil, err
+	}
+
+	return net.IP(buf.AsBytes()), nil
+}
+
+// witx:
+//
+//	;;; Hostcall for getting the destination port used for this request.
+//	(@interface func (export "get_addr_dest_port")
+//		(param $h $response_handle)
+//		(result $err (expected $port (error $fastly_status)))
+//	)
+//
+//go:wasmimport fastly_http_resp get_addr_dest_port
+//go:noescape
+func fastlyHTTPRespGetAddrDestPort(
+	h responseHandle,
+	port prim.Pointer[prim.U16],
+) FastlyStatus
+
+// GetAddrDestPort
+func (r *HTTPResponse) GetAddrDestPort() (uint16, error) {
+	var port prim.U16
+
+	if err := fastlyHTTPRespGetAddrDestPort(
+		r.h, prim.ToPointer(&port),
+	).toError(); err != nil {
+		return 0, err
+	}
+
+	return uint16(port), nil
+}
+
 // witx:
 //
 //	(module $fastly_uap