Merge pull request #22 from projectdiscovery/iceman-add-colors

Added colors to output
projectdiscovery · Jun 15, 2020 · 1ba45c0 · 1ba45c0
2 parents e742e0f + 5fe086e
commit 1ba45c0
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 31 deletions.
diff --git a/cmd/httpx/httpx.go b/cmd/httpx/httpx.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 	"time"
 
@@ -56,6 +57,7 @@ func main() {
 	scanopts.StoreResponseDirectory = options.StoreResponseDir
 	scanopts.Method = options.Method
 	scanopts.OutputServerHeader = options.OutputServerHeader
+	scanopts.OutputWithNoColor = options.NoColor
 	scanopts.ResponseInStdout = options.responseInStdout
 
 	// Try to create output folder if it doesnt exist
@@ -180,7 +182,8 @@ type scanOptions struct {
 	StoreResponse          bool
 	StoreResponseDirectory string
 	OutputServerHeader     bool
-	ResponseInStdout	   bool
+	OutputWithNoColor      bool
+	ResponseInStdout       bool
 }
 
 func analyze(hp *httpx.HTTPX, protocol string, domain string, port int, scanopts *scanOptions, output chan Result) {
@@ -229,16 +232,56 @@ retry:
 	builder.WriteString(fullURL)
 
 	if scanopts.OutputStatusCode {
-		builder.WriteString(fmt.Sprintf(" [%d]", resp.StatusCode))
+		builder.WriteString(" [")
+
+		if !scanopts.OutputWithNoColor {
+			// Color the status code based on its value
+			switch {
+			case resp.StatusCode >= 200 && resp.StatusCode < 300:
+				builder.WriteString("\033[38;2;0;128;0m")
+			case resp.StatusCode >= 300 && resp.StatusCode < 400:
+				builder.WriteString("\033[38;2;255;165;0m")
+			case resp.StatusCode >= 400 && resp.StatusCode < 500:
+				builder.WriteString("\033[38;2;255;0;0m")
+			case resp.StatusCode > 500:
+				builder.WriteString("\033[38;2;255;255;0m")
+			}
+		}
+
+		builder.WriteString(strconv.Itoa(resp.StatusCode))
+		if !scanopts.OutputWithNoColor {
+			builder.WriteString("\u001b[0m")
+		}
+		builder.WriteRune(']')
 	}
 
 	if scanopts.OutputContentLength {
-		builder.WriteString(fmt.Sprintf(" [%d]", resp.ContentLength))
+		builder.WriteString(" [")
+
+		if !scanopts.OutputWithNoColor {
+			builder.WriteString("\033[38;2;138;43;226m")
+		}
+		builder.WriteString(strconv.Itoa(resp.ContentLength))
+
+		if !scanopts.OutputWithNoColor {
+			builder.WriteString("\u001b[0m")
+		}
+		builder.WriteRune(']')
 	}
 
 	title := httpx.ExtractTitle(resp)
 	if scanopts.OutputTitle {
-		builder.WriteString(fmt.Sprintf(" [%s]", title))
+		builder.WriteString(" [")
+
+		if !scanopts.OutputWithNoColor {
+			builder.WriteString("\033[38;2;34;215;211m")
+		}
+		builder.WriteString(title)
+
+		if !scanopts.OutputWithNoColor {
+			builder.WriteString("\u001b[0m")
+		}
+		builder.WriteRune(']')
 	}
 
 	serverHeader := resp.GetHeader("Server")

diff --git a/cmd/httpx/options.go b/cmd/httpx/options.go
@@ -12,33 +12,33 @@ import (
 
 // Options contains configuration options for chaos client.
 type Options struct {
-	RawRequestFile     string
-	VHost              bool
-	Smuggling          bool
-	ExtractTitle       bool
-	StatusCode         bool
-	ContentLength      bool
-	Retries            int
-	Threads            int
-	Timeout            int
-	CustomHeaders      customheader.CustomHeaders
-	CustomPorts        customport.CustomPorts
-	Output             string
-	FollowRedirects    bool
-	StoreResponse      bool
-	StoreResponseDir   string
-	HttpProxy          string
-	SocksProxy         string
-	JSONOutput         bool
-	InputFile          string
-	Method             string
-	Silent             bool
-	Version            bool
-	Verbose            bool
-	NoColor            bool
-	OutputServerHeader bool
-	responseInStdout   bool
-	FollowHostRedirects	 bool
+	RawRequestFile      string
+	VHost               bool
+	Smuggling           bool
+	ExtractTitle        bool
+	StatusCode          bool
+	ContentLength       bool
+	Retries             int
+	Threads             int
+	Timeout             int
+	CustomHeaders       customheader.CustomHeaders
+	CustomPorts         customport.CustomPorts
+	Output              string
+	FollowRedirects     bool
+	StoreResponse       bool
+	StoreResponseDir    string
+	HttpProxy           string
+	SocksProxy          string
+	JSONOutput          bool
+	InputFile           string
+	Method              string
+	Silent              bool
+	Version             bool
+	Verbose             bool
+	NoColor             bool
+	OutputServerHeader  bool
+	responseInStdout    bool
+	FollowHostRedirects bool
 }
 
 // ParseOptions parses the command line options for application