Merge branch 'dev' into feature-basic-auth-single-option

Mzack9999 · web-flow · commit 260a0d7d4d2a · 2021-02-23T01:56:29.000+01:00
diff --git a/go.mod b/go.mod
@@ -1,3 +1,5 @@
 module github.com/projectdiscovery/simplehttpserver
 
 go 1.15
+
+require github.com/projectdiscovery/gologger v1.1.4
diff --git a/go.sum b/go.sum
@@ -0,0 +1,35 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
+github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/projectdiscovery/gologger v1.1.4 h1:qWxGUq7ukHWT849uGPkagPKF3yBPYAsTtMKunQ8O2VI=
+github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/simplehttpserver.go b/simplehttpserver.go
@@ -10,6 +10,8 @@ import (
 	"net/http/httputil"
 	"path"
 	"strings"
+
+	"github.com/projectdiscovery/gologger"
 )
 
 type options struct {
@@ -45,7 +47,7 @@ func main() {
 		opts.Folder = flag.Args()[0]
 	}
 
-	log.Printf("Serving %s on http://%s/...", opts.Folder, opts.ListenAddress)
+	gologger.Print().Msgf("Serving %s on http://%s/...", opts.Folder, opts.ListenAddress)
 	layers := loglayer(http.FileServer(http.Dir(opts.Folder)))
 	if opts.BasicAuth != "" {
 		baTokens := strings.SplitN(opts.BasicAuth, ":", 2)
@@ -59,15 +61,15 @@ func main() {
 	}
 
 	if opts.Upload {
-		log.Println("Upload enabled")
+		gologger.Print().Msgf("Upload enabled")
 	}
 	if opts.HTTPS {
 		if opts.Certificate == "" || opts.Key == "" {
-			log.Fatal("Certificate or Key file not specified")
+			gologger.Fatal().Msgf("Certificate or Key file not specified")
 		}
-		fmt.Println(http.ListenAndServeTLS(opts.ListenAddress, opts.Certificate, opts.Key, layers))
+		gologger.Print().Msgf("%s\n", http.ListenAndServeTLS(opts.ListenAddress, opts.Certificate, opts.Key, layers))
 	} else {
-		fmt.Println(http.ListenAndServe(opts.ListenAddress, layers))
+		gologger.Print().Msgf("%s\n", http.ListenAndServe(opts.ListenAddress, layers))
 	}
 }
 
@@ -92,9 +94,9 @@ func loglayer(handler http.Handler) http.Handler {
 		if opts.Verbose {
 			headers := new(bytes.Buffer)
 			lrw.Header().Write(headers) //nolint
-			log.Printf("\nRemote Address: %s\n%s\n%s %d %s\n%s\n%s\n", r.RemoteAddr, string(fullRequest), r.Proto, lrw.statusCode, http.StatusText(lrw.statusCode), headers.String(), string(lrw.Data))
+			gologger.Print().Msgf("\nRemote Address: %s\n%s\n%s %d %s\n%s\n%s\n", r.RemoteAddr, string(fullRequest), r.Proto, lrw.statusCode, http.StatusText(lrw.statusCode), headers.String(), string(lrw.Data))
 		} else {
-			log.Printf("%s \"%s %s %s\" %d %d", r.RemoteAddr, r.Method, r.URL, r.Proto, lrw.statusCode, len(lrw.Data))
+			gologger.Print().Msgf("%s \"%s %s %s\" %d %d", r.RemoteAddr, r.Method, r.URL, r.Proto, lrw.statusCode, len(lrw.Data))
 		}
 	})
 }

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 module github.com/projectdiscovery/simplehttpserver
 go 1.15
++
 +require github.com/projectdiscovery/gologger v1.1.4
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ import (`
`10`	`10`	`"net/http/httputil"`
`11`	`11`	`"path"`
`12`	`12`	`"strings"`
	`13`	`+`
	`14`	`+ "github.com/projectdiscovery/gologger"`
`13`	`15`	`)`
`14`	`16`
`15`	`17`	`type options struct {`
`@@ -45,7 +47,7 @@ func main() {`
`45`	`47`	`opts.Folder = flag.Args()[0]`
`46`	`48`	`}`
`47`	`49`
`48`		`- log.Printf("Serving %s on http://%s/...", opts.Folder, opts.ListenAddress)`
	`50`	`+ gologger.Print().Msgf("Serving %s on http://%s/...", opts.Folder, opts.ListenAddress)`
`49`	`51`	`layers := loglayer(http.FileServer(http.Dir(opts.Folder)))`
`50`	`52`	`if opts.BasicAuth != "" {`
`51`	`53`	`baTokens := strings.SplitN(opts.BasicAuth, ":", 2)`
`@@ -59,15 +61,15 @@ func main() {`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`if opts.Upload {`
`62`		`- log.Println("Upload enabled")`
	`64`	`+ gologger.Print().Msgf("Upload enabled")`
`63`	`65`	`}`
`64`	`66`	`if opts.HTTPS {`
`65`	`67`	`if opts.Certificate == "" \|\| opts.Key == "" {`
`66`		`- log.Fatal("Certificate or Key file not specified")`
	`68`	`+ gologger.Fatal().Msgf("Certificate or Key file not specified")`
`67`	`69`	`}`
`68`		`- fmt.Println(http.ListenAndServeTLS(opts.ListenAddress, opts.Certificate, opts.Key, layers))`
	`70`	`+ gologger.Print().Msgf("%s\n", http.ListenAndServeTLS(opts.ListenAddress, opts.Certificate, opts.Key, layers))`
`69`	`71`	`} else {`
`70`		`- fmt.Println(http.ListenAndServe(opts.ListenAddress, layers))`
	`72`	`+ gologger.Print().Msgf("%s\n", http.ListenAndServe(opts.ListenAddress, layers))`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`
`@@ -92,9 +94,9 @@ func loglayer(handler http.Handler) http.Handler {`
`92`	`94`	`if opts.Verbose {`
`93`	`95`	`headers := new(bytes.Buffer)`
`94`	`96`	`lrw.Header().Write(headers) //nolint`
`95`		`- log.Printf("\nRemote Address: %s\n%s\n%s %d %s\n%s\n%s\n", r.RemoteAddr, string(fullRequest), r.Proto, lrw.statusCode, http.StatusText(lrw.statusCode), headers.String(), string(lrw.Data))`
	`97`	`+ gologger.Print().Msgf("\nRemote Address: %s\n%s\n%s %d %s\n%s\n%s\n", r.RemoteAddr, string(fullRequest), r.Proto, lrw.statusCode, http.StatusText(lrw.statusCode), headers.String(), string(lrw.Data))`
`96`	`98`	`} else {`
`97`		`- log.Printf("%s \"%s %s %s\" %d %d", r.RemoteAddr, r.Method, r.URL, r.Proto, lrw.statusCode, len(lrw.Data))`
	`99`	`+ gologger.Print().Msgf("%s \"%s %s %s\" %d %d", r.RemoteAddr, r.Method, r.URL, r.Proto, lrw.statusCode, len(lrw.Data))`
`98`	`100`	`}`
`99`	`101`	`})`
`100`	`102`	`}`