Updated make logging better

Author: Chris Lenz

.github/workflows/release.yaml

@@ -47,25 +47,3 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GOARCH: amd64
         GOOS: darwin
-  release-windows-386:
-    name: release windows/386
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: compile and release
-      uses: ngs/go-release.action@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GOARCH: "386"
-        GOOS: windows
-  release-windows-amd64:
-    name: release windows/amd64
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: compile and release
-      uses: ngs/go-release.action@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GOARCH: amd64
-        GOOS: windows

README.md

@@ -17,6 +17,6 @@ go clean -i github.com/idefixcert/httpsink
 ## Download the prebuild files from github
 
 ```
-wget https://github.com/idefixcert/httpsink/releases/download/1.1.2/httpsink_1.1.2_linux_386.tar.gz
+wget https://github.com/idefixcert/httpsink/releases/download/1.1.3/httpsink_1.1.3_linux_386.tar.gz
 tar -xzvf httpsink_v1.1.2_linux_386.tar.gz
 ```

go.mod

@@ -1,5 +1,10 @@
 module github.com/idefixcert/httpsink
 
-go 1.13
+go 1.21
 
-require github.com/gookit/color v1.2.5
+require github.com/gookit/color v1.5.4
+
+require (
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+)

httpsink.go

@@ -8,21 +8,15 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
-	"net/url"
 	"time"
 )
 
 func main() {
 	addr := flag.String("addr", ":19091", "HTTP network address")
-	up := flag.String("up", "", "upstream address for proxy address, if not set, there is no upstream and the sink returns always with 200")
 	sleep := flag.Duration("sleep", 0, "sleeptime for non proxy function")
 	flag.Parse()
 
-	if *up == "" {
-		http.HandleFunc("/", rootHandler(*sleep))
-	} else {
-		http.HandleFunc("/", proxyHandler(*up))
-	}
+	http.HandleFunc("/", rootHandler(*sleep))
 
 	log.Printf("Starting server on %s\n", *addr)
 
@@ -35,26 +29,7 @@ func main() {
 func rootHandler(sleep time.Duration) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
 		time.Sleep(sleep)
-		_, _ = fmt.Fprintf(w, "<h1>Hello World</h1><div>Welcome to whereever you are</div>")
-	}
-}
-
-func proxyHandler(target string) http.HandlerFunc {
-	return func(w http.ResponseWriter, req *http.Request) {
-		// parse the targetURL
-		targetURL, _ := url.Parse(target)
-
-		// create the reverse proxy
-		proxy := httputil.NewSingleHostReverseProxy(targetURL)
-
-		// Update the headers to allow for SSL redirection
-		req.URL.Host = targetURL.Host
-		req.URL.Scheme = targetURL.Scheme
-		req.Header.Set("X-Forwarded-Host", req.Header.Get("Host"))
-		req.Host = targetURL.Host
-
-		// Note that ServeHttp is non blocking and uses a go routine under the hood
-		proxy.ServeHTTP(w, req)
+		_, _ = fmt.Fprintf(w, "")
 	}
 }
 
@@ -72,7 +47,7 @@ func logRequest(handler http.Handler) http.Handler {
 		//log.Printf("%s %s\n", err, string(body))
 		rec := httptest.NewRecorder()
 		handler.ServeHTTP(rec, r)
-		message := fmt.Sprintf("Request:\n%s\nResponse Code: %d\nResponse:\n%s\n\n", string(x), rec.Code, rec.Body.String())
+		message := fmt.Sprintf("Time:%v\nUrl:\n%sRequest:\n%s\nResponse Code: %d\nResponse:\n%s\n\n", time.Now(), r.URL.Path, string(x), rec.Code, rec.Body.String())
 		if rec.Code >= 500 {
 			color.Error.Block(message)
 		} else if rec.Code >= 400 {