Fixed an issue with OHTTP responses

Author: ameshkov

CHANGELOG.md

@@ -15,6 +15,7 @@ adheres to [Semantic Versioning][semver].
 
 - Fixed using `--http3` together with `--connect-to`.
 - Fixed unexpected panic when the server stops responding unexpectedly.
+- Fixed OHTTP responses not being written to the output.
 
 [unreleased]: https://github.com/ameshkov/gocurl/compare/v1.5.0...HEAD
 

internal/client/ohttp.go

@@ -116,6 +116,10 @@ func (t *obliviousHTTPTransport) RoundTrip(r *http.Request) (resp *http.Response
 		return nil, fmt.Errorf("failed to parse decrypted response: %w", err)
 	}
 
+	// bhttp does not set the status and proto fields, so we do it here.
+	resp.Status = fmt.Sprintf("%d", resp.StatusCode)
+	resp.Proto = "OHTTP/1.0"
+
 	return resp, nil
 }
 

internal/cmd/cmd.go

@@ -81,11 +81,20 @@ func Run(cfg *config.Config, out *output.Output) error {
 		_ = body.Close()
 	}(resp.Body)
 
-	// Response body is only written when we're sure that it is there.
+	// Response body is only written when we're sure that it is there and can
+	// be fully read.
 	var responseBody io.Reader
 	if resp.ProtoMajor >= 2 ||
+		// Content length guarantees that the response can be fully read.
 		resp.ContentLength > 0 ||
+		// Transfer-Encoding also guarantees that it's clear when body is
+		// finished.
 		len(resp.TransferEncoding) > 0 ||
+		// OHTTP responses may not have any headers apart from content-type,
+		// but they contain the full body right away.
+		cfg.OHTTPGatewayURL != nil ||
+		// When Connection: close we must read the body until the connection is
+		// closed.
 		resp.Header.Get("Connection") == "close" {
 		responseBody = resp.Body
 	}

internal/cmd/cmd_test.go

@@ -432,12 +432,12 @@ func TestRunOHTTP(t *testing.T) {
 	err = cmd.Run(cfg, out)
 	require.NoError(t, err)
 
-	// Verify the output
+	// Verify the output contains the actual response body
 	data := dataBuffer.String()
 
-	// httpbin /get returns JSON with the request details
-	// The response should contain JSON content
-	assert.Contains(t, data, "application/json")
+	// httpbin /get returns JSON with the request details including the URL
+	// This verifies that the response body is actually written to output
+	assert.Contains(t, data, "httpbin.agrd.workers.dev/get")
 }
 
 // TestOHTTPInvalidOptions tests that invalid OHTTP option combinations are rejected.
@@ -567,9 +567,9 @@ func TestRunOHTTPWithProxy(t *testing.T) {
 	// Verify the request went through the proxy
 	assert.True(t, *proxyReceived, "OHTTP request should have gone through the proxy")
 
-	// Verify the output contains JSON content (OHTTP response)
+	// Verify the output contains the actual response body
 	data := dataBuffer.String()
-	assert.Contains(t, data, "application/json")
+	assert.Contains(t, data, "httpbin.agrd.workers.dev/get")
 }
 
 // TestRunWithConnectTo tests the --connect-to flag functionality.