fix: hostname mismatching when using host:port as input

webanalyze.go

@@ -15,7 +15,7 @@ import (
 	"github.com/bobesa/go-domain-util/domainutil"
 )
 
-const VERSION = "1.0"
+const VERSION = "0.3.7"
 
 var (
 	timeout = 8 * time.Second
@@ -102,7 +102,7 @@ func (wa *WebAnalyzer) CategoryById(cid string) string {
 	return wa.appDefs.Cats[cid].Name
 }
 
-func fetchHost(host string, client *http.Client) (*http.Response, error) {
+func fetchHost(urlStr string, client *http.Client) (*http.Response, error) {
 	if client == nil {
 		client = &http.Client{
 			Timeout: timeout,
@@ -111,21 +111,21 @@ func fetchHost(host string, client *http.Client) (*http.Response, error) {
 				Proxy:           http.ProxyFromEnvironment,
 			},
 			CheckRedirect: func(req *http.Request, via []*http.Request) error {
-				url, err := url.Parse(host)
+				url, err := url.Parse(urlStr)
 				if err != nil {
 					return http.ErrUseLastResponse
 				}
 
 				// allow redirects from http -> https on the same host
-				if url.Host != req.URL.Host {
+				if url.Hostname() != req.URL.Hostname() {
 					return http.ErrUseLastResponse
 				}
 
 				return nil
 			},
 		}
 	}
-	req, err := http.NewRequest("GET", host, nil)
+	req, err := http.NewRequest("GET", urlStr, nil)
 	if err != nil {
 		return nil, err
 	}

webanalyze_test.go

@@ -2,9 +2,6 @@ package webanalyze
 
 import (
 	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"strings"
 	"testing"
@@ -91,30 +88,3 @@ func TestIsSubdomain(t *testing.T) {
 		t.Fatalf("%v is not a subdomain of %v (but should be)", u2, u1)
 	}
 }
-
-func TestRedirect(t *testing.T) {
-	testServer1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("should not be reached"))
-	}))
-
-	testServer2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, testServer1.URL, http.StatusTemporaryRedirect)
-	}))
-
-	defer func() {
-		testServer1.Close()
-		testServer2.Close()
-	}()
-
-	resp, err := fetchHost(testServer2.URL, nil)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	body, _ := ioutil.ReadAll(resp.Body)
-	if string(body) == "should not be reached" {
-		t.Error("fetchHost did follow redirect")
-	}
-
-}