Merge branch 'rgdd/fix-redirect-bug' into 'main'

fix: Attribute OL with the domain we arrived at

See merge request tpo/onion-services/onion-grab!2

1 files changed, 9 insertions, 0 deletions

diff --git a/main.go b/main.go
index 539e86f..72f6dd1 100644
--- a/main.go
+++ b/main.go
@@ -129,6 +129,15 @@ func work(ctx context.Context, cli *http.Client, timeout time.Duration, question
 	}
 	defer rsp.Body.Close()
 
+	// We're using an HTTP client that follows redirects.  Ensure that we're
+	// attributing any found Onion-Location header with the domain name we were
+	// redirected too, rather than the original domain name that we started
+	// from.  If there are no redirects this assignment doesn't change anything.
+	//
+	// More details on why this behavior matters:
+	// https://gitlab.torproject.org/tpo/onion-services/onion-grab/-/issues/1
+	answer.Domain = rsp.Request.URL.Host
+
 	onion, ok := onionloc.HTTP(rsp)
 	if ok {
 		answer.HTTP = onion