{{range $result := .Results}}
-|result_raw|{{ $result.StatusCode }}{{ range $keyword, $value := $result.Input }}|{{ $value | printf "%s" }}{{ end }}|{{ $result.Url }}|{{ $result.RedirectLocation }}|{{ $result.Position }}|{{ $result.ContentLength }}|{{ $result.ContentWords }}|{{ $result.ContentLines }}|
+|result_raw|{{ $result.StatusCode }}{{ range $keyword, $value := $result.Input }}|{{ $value | printf "%s" }}{{ end }}|{{ $result.Url }}|{{ $result.RedirectLocation }}|{{ $result.Position }}|{{ $result.ContentLength }}|{{ $result.ContentWords }}|{{ $result.ContentLines }}|{{ $result.ContentType }}|
| {{ $result.StatusCode }} |
@@ -96,7 +97,8 @@
{{ $result.Position }} |
{{ $result.ContentLength }} |
{{ $result.ContentWords }} |
- {{ $result.ContentLines }} |
+ {{ $result.ContentLines }} |
+ {{ $result.ContentType }} |
{{ $result.ResultFile }} |
{{ end }}
@@ -143,8 +145,8 @@
)
// colorizeResults returns a new slice with HTMLColor attribute
-func colorizeResults(results []Result) []Result {
- newResults := make([]Result, 0)
+func colorizeResults(results []ffuf.Result) []ffuf.Result {
+ newResults := make([]ffuf.Result, 0)
for _, r := range results {
result := r
@@ -174,12 +176,12 @@
return newResults
}
-func writeHTML(config *ffuf.Config, results []Result) error {
-
- if(config.OutputCreateEmptyFile && (len(results) == 0)){
+func writeHTML(filename string, config *ffuf.Config, results []ffuf.Result) error {
+
+ if config.OutputCreateEmptyFile && (len(results) == 0) {
return nil
- }
-
+ }
+
results = colorizeResults(results)
ti := time.Now()
@@ -196,7 +198,7 @@
Keys: keywords,
}
- f, err := os.Create(config.OutputFile)
+ f, err := os.Create(filename)
if err != nil {
return err
}
diff --git a/pkg/output/file_json.go b/pkg/output/file_json.go
index 604b4fc..cf495b2 100644
--- a/pkg/output/file_json.go
+++ b/pkg/output/file_json.go
@@ -9,10 +9,10 @@
)
type ejsonFileOutput struct {
- CommandLine string `json:"commandline"`
- Time string `json:"time"`
- Results []Result `json:"results"`
- Config *ffuf.Config `json:"config"`
+ CommandLine string `json:"commandline"`
+ Time string `json:"time"`
+ Results []ffuf.Result `json:"results"`
+ Config *ffuf.Config `json:"config"`
}
type JsonResult struct {
@@ -22,6 +22,7 @@
ContentLength int64 `json:"length"`
ContentWords int64 `json:"words"`
ContentLines int64 `json:"lines"`
+ ContentType string `json:"content-type"`
RedirectLocation string `json:"redirectlocation"`
ResultFile string `json:"resultfile"`
Url string `json:"url"`
@@ -35,12 +36,12 @@
Config *ffuf.Config `json:"config"`
}
-func writeEJSON(config *ffuf.Config, res []Result) error {
-
- if(config.OutputCreateEmptyFile && (len(res) == 0)){
+func writeEJSON(filename string, config *ffuf.Config, res []ffuf.Result) error {
+
+ if config.OutputCreateEmptyFile && (len(res) == 0) {
return nil
}
-
+
t := time.Now()
outJSON := ejsonFileOutput{
CommandLine: config.CommandLine,
@@ -52,14 +53,14 @@
if err != nil {
return err
}
- err = ioutil.WriteFile(config.OutputFile, outBytes, 0644)
+ err = ioutil.WriteFile(filename, outBytes, 0644)
if err != nil {
return err
}
return nil
}
-func writeJSON(config *ffuf.Config, res []Result) error {
+func writeJSON(filename string, config *ffuf.Config, res []ffuf.Result) error {
t := time.Now()
jsonRes := make([]JsonResult, 0)
for _, r := range res {
@@ -74,6 +75,7 @@
ContentLength: r.ContentLength,
ContentWords: r.ContentWords,
ContentLines: r.ContentLines,
+ ContentType: r.ContentType,
RedirectLocation: r.RedirectLocation,
ResultFile: r.ResultFile,
Url: r.Url,
@@ -90,7 +92,7 @@
if err != nil {
return err
}
- err = ioutil.WriteFile(config.OutputFile, outBytes, 0644)
+ err = ioutil.WriteFile(filename, outBytes, 0644)
if err != nil {
return err
}
diff --git a/pkg/output/file_md.go b/pkg/output/file_md.go
index 6e25b4a..86db0b8 100644
--- a/pkg/output/file_md.go
+++ b/pkg/output/file_md.go
@@ -14,15 +14,15 @@
Command line : ` + "`{{.CommandLine}}`" + `
Time: ` + "{{ .Time }}" + `
- {{ range .Keys }}| {{ . }} {{ end }}| URL | Redirectlocation | Position | Status Code | Content Length | Content Words | Content Lines | ResultFile |
- {{ range .Keys }}| :- {{ end }}| :-- | :--------------- | :---- | :------- | :---------- | :------------- | :------------ | :--------- |
- {{range .Results}}{{ range $keyword, $value := .Input }}| {{ $value | printf "%s" }} {{ end }}| {{ .Url }} | {{ .RedirectLocation }} | {{ .Position }} | {{ .StatusCode }} | {{ .ContentLength }} | {{ .ContentWords }} | {{ .ContentLines }} | {{ .ResultFile }} |
+ {{ range .Keys }}| {{ . }} {{ end }}| URL | Redirectlocation | Position | Status Code | Content Length | Content Words | Content Lines | Content Type | ResultFile |
+ {{ range .Keys }}| :- {{ end }}| :-- | :--------------- | :---- | :------- | :---------- | :------------- | :------------ | :--------- | :----------- |
+ {{range .Results}}{{ range $keyword, $value := .Input }}| {{ $value | printf "%s" }} {{ end }}| {{ .Url }} | {{ .RedirectLocation }} | {{ .Position }} | {{ .StatusCode }} | {{ .ContentLength }} | {{ .ContentWords }} | {{ .ContentLines }} | {{ .ContentType }} | {{ .ResultFile }} |
{{end}}` // The template format is not pretty but follows the markdown guide
)
-func writeMarkdown(config *ffuf.Config, res []Result) error {
+func writeMarkdown(filename string, config *ffuf.Config, res []ffuf.Result) error {
- if(config.OutputCreateEmptyFile && (len(res) == 0)){
+ if config.OutputCreateEmptyFile && (len(res) == 0) {
return nil
}
@@ -40,7 +40,7 @@
Keys: keywords,
}
- f, err := os.Create(config.OutputFile)
+ f, err := os.Create(filename)
if err != nil {
return err
}
diff --git a/pkg/output/stdout.go b/pkg/output/stdout.go
index 8de94a1..b68cedd 100644
--- a/pkg/output/stdout.go
+++ b/pkg/output/stdout.go
@@ -7,6 +7,7 @@
"os"
"path"
"strconv"
+ "strings"
"time"
"github.com/ffuf/ffuf/pkg/ffuf"
@@ -26,32 +27,19 @@
type Stdoutput struct {
config *ffuf.Config
- Results []Result
-}
-
-type Result struct {
- Input map[string][]byte `json:"input"`
- Position int `json:"position"`
- StatusCode int64 `json:"status"`
- ContentLength int64 `json:"length"`
- ContentWords int64 `json:"words"`
- ContentLines int64 `json:"lines"`
- RedirectLocation string `json:"redirectlocation"`
- Url string `json:"url"`
- ResultFile string `json:"resultfile"`
- Host string `json:"host"`
- HTMLColor string `json:"-"`
+ Results []ffuf.Result
}
func NewStdoutput(conf *ffuf.Config) *Stdoutput {
var outp Stdoutput
outp.config = conf
- outp.Results = []Result{}
+ outp.Results = []ffuf.Result{}
return &outp
}
func (s *Stdoutput) Banner() {
- fmt.Fprintf(os.Stderr, "%s\n v%s\n%s\n\n", BANNER_HEADER, ffuf.VERSION, BANNER_SEP)
+ version := strings.ReplaceAll(ffuf.Version(), "<3", fmt.Sprintf("%s<3%s", ANSI_RED, ANSI_CLEAR))
+ fmt.Fprintf(os.Stderr, "%s\n v%s\n%s\n\n", BANNER_HEADER, version, BANNER_SEP)
printOption([]byte("Method"), []byte(s.config.Method))
printOption([]byte("URL"), []byte(s.config.Url))
@@ -134,13 +122,28 @@
// Print matchers
for _, f := range s.config.Matchers {
- printOption([]byte("Matcher"), []byte(f.Repr()))
+ printOption([]byte("Matcher"), []byte(f.ReprVerbose()))
}
// Print filters
for _, f := range s.config.Filters {
- printOption([]byte("Filter"), []byte(f.Repr()))
+ printOption([]byte("Filter"), []byte(f.ReprVerbose()))
}
fmt.Fprintf(os.Stderr, "%s\n\n", BANNER_SEP)
+}
+
+// Reset resets the result slice
+func (s *Stdoutput) Reset() {
+ s.Results = make([]ffuf.Result, 0)
+}
+
+// GetResults returns the result slice
+func (s *Stdoutput) GetResults() []ffuf.Result {
+ return s.Results
+}
+
+// SetResults sets the result slice
+func (s *Stdoutput) SetResults(results []ffuf.Result) {
+ s.Results = results
}
func (s *Stdoutput) Progress(status ffuf.Progress) {
@@ -164,7 +167,7 @@
dur -= mins * time.Minute
secs := dur / time.Second
- fmt.Fprintf(os.Stderr, "%s:: Progress: [%d/%d] :: Job [%d/%d] :: %d req/sec :: Duration: [%d:%02d:%02d] :: Errors: %d ::", TERMINAL_CLEAR_LINE, status.ReqCount, status.ReqTotal, status.QueuePos, status.QueueTotal, reqRate, hours, mins, secs, status.ErrorCount)
+ fmt.Fprintf(os.Stderr, "%s:: Progress: [%d/%d] :: Job [%d/%d] :: %d req/sec :: Duration: [%d:%02d:%02d] :: Errors: %d ::", TERMINAL_CLEAR_LINE, status.ReqCount, status.ReqTotal, status.QueuePos, status.QueueTotal, reqRate, hours, mins, secs, status.ErrorCount)
}
func (s *Stdoutput) Info(infostring string) {
@@ -172,9 +175,9 @@
fmt.Fprintf(os.Stderr, "%s", infostring)
} else {
if !s.config.Colors {
- fmt.Fprintf(os.Stderr, "%s[INFO] %s\n", TERMINAL_CLEAR_LINE, infostring)
- } else {
- fmt.Fprintf(os.Stderr, "%s[%sINFO%s] %s\n", TERMINAL_CLEAR_LINE, ANSI_BLUE, ANSI_CLEAR, infostring)
+ fmt.Fprintf(os.Stderr, "%s[INFO] %s\n\n", TERMINAL_CLEAR_LINE, infostring)
+ } else {
+ fmt.Fprintf(os.Stderr, "%s[%sINFO%s] %s\n\n", TERMINAL_CLEAR_LINE, ANSI_BLUE, ANSI_CLEAR, infostring)
}
}
}
@@ -196,56 +199,60 @@
fmt.Fprintf(os.Stderr, "%s", warnstring)
} else {
if !s.config.Colors {
- fmt.Fprintf(os.Stderr, "%s[WARN] %s", TERMINAL_CLEAR_LINE, warnstring)
+ fmt.Fprintf(os.Stderr, "%s[WARN] %s\n", TERMINAL_CLEAR_LINE, warnstring)
} else {
fmt.Fprintf(os.Stderr, "%s[%sWARN%s] %s\n", TERMINAL_CLEAR_LINE, ANSI_RED, ANSI_CLEAR, warnstring)
}
}
}
-func (s *Stdoutput) writeToAll(config *ffuf.Config, res []Result) error {
+func (s *Stdoutput) Raw(output string) {
+ fmt.Fprintf(os.Stderr, "%s%s", TERMINAL_CLEAR_LINE, output)
+}
+
+func (s *Stdoutput) writeToAll(filename string, config *ffuf.Config, res []ffuf.Result) error {
var err error
var BaseFilename string = s.config.OutputFile
// Go through each type of write, adding
// the suffix to each output file.
- if(config.OutputCreateEmptyFile && (len(res) == 0)){
+ if config.OutputCreateEmptyFile && (len(res) == 0) {
return nil
- }
+ }
s.config.OutputFile = BaseFilename + ".json"
- err = writeJSON(s.config, s.Results)
+ err = writeJSON(filename, s.config, s.Results)
if err != nil {
s.Error(err.Error())
}
s.config.OutputFile = BaseFilename + ".ejson"
- err = writeEJSON(s.config, s.Results)
+ err = writeEJSON(filename, s.config, s.Results)
if err != nil {
s.Error(err.Error())
}
s.config.OutputFile = BaseFilename + ".html"
- err = writeHTML(s.config, s.Results)
+ err = writeHTML(filename, s.config, s.Results)
if err != nil {
s.Error(err.Error())
}
s.config.OutputFile = BaseFilename + ".md"
- err = writeMarkdown(s.config, s.Results)
+ err = writeMarkdown(filename, s.config, s.Results)
if err != nil {
s.Error(err.Error())
}
s.config.OutputFile = BaseFilename + ".csv"
- err = writeCSV(s.config, s.Results, false)
+ err = writeCSV(filename, s.config, s.Results, false)
if err != nil {
s.Error(err.Error())
}
s.config.OutputFile = BaseFilename + ".ecsv"
- err = writeCSV(s.config, s.Results, true)
+ err = writeCSV(filename, s.config, s.Results, true)
if err != nil {
s.Error(err.Error())
}
@@ -254,24 +261,33 @@
}
+// SaveFile saves the current results to a file of a given type
+func (s *Stdoutput) SaveFile(filename, format string) error {
+ var err error
+ switch format {
+ case "all":
+ err = s.writeToAll(filename, s.config, s.Results)
+ case "json":
+ err = writeJSON(filename, s.config, s.Results)
+ case "ejson":
+ err = writeEJSON(filename, s.config, s.Results)
+ case "html":
+ err = writeHTML(filename, s.config, s.Results)
+ case "md":
+ err = writeMarkdown(filename, s.config, s.Results)
+ case "csv":
+ err = writeCSV(filename, s.config, s.Results, false)
+ case "ecsv":
+ err = writeCSV(filename, s.config, s.Results, true)
+ }
+ return err
+}
+
+// Finalize gets run after all the ffuf jobs are completed
func (s *Stdoutput) Finalize() error {
var err error
if s.config.OutputFile != "" {
- if s.config.OutputFormat == "all" {
- err = s.writeToAll(s.config, s.Results)
- } else if s.config.OutputFormat == "json" {
- err = writeJSON(s.config, s.Results)
- } else if s.config.OutputFormat == "ejson" {
- err = writeEJSON(s.config, s.Results)
- } else if s.config.OutputFormat == "html" {
- err = writeHTML(s.config, s.Results)
- } else if s.config.OutputFormat == "md" {
- err = writeMarkdown(s.config, s.Results)
- } else if s.config.OutputFormat == "csv" {
- err = writeCSV(s.config, s.Results, false)
- } else if s.config.OutputFormat == "ecsv" {
- err = writeCSV(s.config, s.Results, true)
- }
+ err = s.SaveFile(s.config.OutputFile, s.config.OutputFormat)
if err != nil {
s.Error(err.Error())
}
@@ -285,29 +301,27 @@
if len(s.config.OutputDirectory) > 0 {
resp.ResultFile = s.writeResultToFile(resp)
}
+
+ inputs := make(map[string][]byte, len(resp.Request.Input))
+ for k, v := range resp.Request.Input {
+ inputs[k] = v
+ }
+ sResult := ffuf.Result{
+ Input: inputs,
+ Position: resp.Request.Position,
+ StatusCode: resp.StatusCode,
+ ContentLength: resp.ContentLength,
+ ContentWords: resp.ContentWords,
+ ContentLines: resp.ContentLines,
+ ContentType: resp.ContentType,
+ RedirectLocation: resp.GetRedirectLocation(false),
+ Url: resp.Request.Url,
+ ResultFile: resp.ResultFile,
+ Host: resp.Request.Host,
+ }
+ s.Results = append(s.Results, sResult)
// Output the result
- s.printResult(resp)
- // Check if we need the data later
- if s.config.OutputFile != "" {
- // No need to store results if we're not going to use them later
- inputs := make(map[string][]byte, len(resp.Request.Input))
- for k, v := range resp.Request.Input {
- inputs[k] = v
- }
- sResult := Result{
- Input: inputs,
- Position: resp.Request.Position,
- StatusCode: resp.StatusCode,
- ContentLength: resp.ContentLength,
- ContentWords: resp.ContentWords,
- ContentLines: resp.ContentLines,
- RedirectLocation: resp.GetRedirectLocation(false),
- Url: resp.Request.Url,
- ResultFile: resp.ResultFile,
- Host: resp.Request.Host,
- }
- s.Results = append(s.Results, sResult)
- }
+ s.PrintResult(sResult)
}
func (s *Stdoutput) writeResultToFile(resp ffuf.Response) string {
@@ -335,35 +349,35 @@
return fileName
}
-func (s *Stdoutput) printResult(resp ffuf.Response) {
+func (s *Stdoutput) PrintResult(res ffuf.Result) {
if s.config.Quiet {
- s.resultQuiet(resp)
- } else {
- if len(resp.Request.Input) > 1 || s.config.Verbose || len(s.config.OutputDirectory) > 0 {
+ s.resultQuiet(res)
+ } else {
+ if len(res.Input) > 1 || s.config.Verbose || len(s.config.OutputDirectory) > 0 {
// Print a multi-line result (when using multiple input keywords and wordlists)
- s.resultMultiline(resp)
- } else {
- s.resultNormal(resp)
- }
- }
-}
-
-func (s *Stdoutput) prepareInputsOneLine(resp ffuf.Response) string {
+ s.resultMultiline(res)
+ } else {
+ s.resultNormal(res)
+ }
+ }
+}
+
+func (s *Stdoutput) prepareInputsOneLine(res ffuf.Result) string {
inputs := ""
- if len(resp.Request.Input) > 1 {
- for k, v := range resp.Request.Input {
+ if len(res.Input) > 1 {
+ for k, v := range res.Input {
if inSlice(k, s.config.CommandKeywords) {
// If we're using external command for input, display the position instead of input
- inputs = fmt.Sprintf("%s%s : %s ", inputs, k, strconv.Itoa(resp.Request.Position))
+ inputs = fmt.Sprintf("%s%s : %s ", inputs, k, strconv.Itoa(res.Position))
} else {
inputs = fmt.Sprintf("%s%s : %s ", inputs, k, v)
}
}
} else {
- for k, v := range resp.Request.Input {
+ for k, v := range res.Input {
if inSlice(k, s.config.CommandKeywords) {
// If we're using external command for input, display the position instead of input
- inputs = strconv.Itoa(resp.Request.Position)
+ inputs = strconv.Itoa(res.Position)
} else {
inputs = string(v)
}
@@ -372,30 +386,30 @@
return inputs
}
-func (s *Stdoutput) resultQuiet(resp ffuf.Response) {
- fmt.Println(s.prepareInputsOneLine(resp))
-}
-
-func (s *Stdoutput) resultMultiline(resp ffuf.Response) {
+func (s *Stdoutput) resultQuiet(res ffuf.Result) {
+ fmt.Println(s.prepareInputsOneLine(res))
+}
+
+func (s *Stdoutput) resultMultiline(res ffuf.Result) {
var res_hdr, res_str string
res_str = "%s%s * %s: %s\n"
- res_hdr = fmt.Sprintf("%s[Status: %d, Size: %d, Words: %d, Lines: %d]", TERMINAL_CLEAR_LINE, resp.StatusCode, resp.ContentLength, resp.ContentWords, resp.ContentLines)
- res_hdr = s.colorize(res_hdr, resp.StatusCode)
+ res_hdr = fmt.Sprintf("%s[Status: %d, Size: %d, Words: %d, Lines: %d]", TERMINAL_CLEAR_LINE, res.StatusCode, res.ContentLength, res.ContentWords, res.ContentLines)
+ res_hdr = s.colorize(res_hdr, res.StatusCode)
reslines := ""
if s.config.Verbose {
- reslines = fmt.Sprintf("%s%s| URL | %s\n", reslines, TERMINAL_CLEAR_LINE, resp.Request.Url)
- redirectLocation := resp.GetRedirectLocation(false)
+ reslines = fmt.Sprintf("%s%s| URL | %s\n", reslines, TERMINAL_CLEAR_LINE, res.Url)
+ redirectLocation := res.RedirectLocation
if redirectLocation != "" {
reslines = fmt.Sprintf("%s%s| --> | %s\n", reslines, TERMINAL_CLEAR_LINE, redirectLocation)
}
}
- if resp.ResultFile != "" {
- reslines = fmt.Sprintf("%s%s| RES | %s\n", reslines, TERMINAL_CLEAR_LINE, resp.ResultFile)
- }
- for k, v := range resp.Request.Input {
+ if res.ResultFile != "" {
+ reslines = fmt.Sprintf("%s%s| RES | %s\n", reslines, TERMINAL_CLEAR_LINE, res.ResultFile)
+ }
+ for k, v := range res.Input {
if inSlice(k, s.config.CommandKeywords) {
// If we're using external command for input, display the position instead of input
- reslines = fmt.Sprintf(res_str, reslines, TERMINAL_CLEAR_LINE, k, strconv.Itoa(resp.Request.Position))
+ reslines = fmt.Sprintf(res_str, reslines, TERMINAL_CLEAR_LINE, k, strconv.Itoa(res.Position))
} else {
// Wordlist input
reslines = fmt.Sprintf(res_str, reslines, TERMINAL_CLEAR_LINE, k, v)
@@ -404,9 +418,9 @@
fmt.Printf("%s\n%s\n", res_hdr, reslines)
}
-func (s *Stdoutput) resultNormal(resp ffuf.Response) {
- res := fmt.Sprintf("%s%-23s [Status: %s, Size: %d, Words: %d, Lines: %d]", TERMINAL_CLEAR_LINE, s.prepareInputsOneLine(resp), s.colorize(fmt.Sprintf("%d", resp.StatusCode), resp.StatusCode), resp.ContentLength, resp.ContentWords, resp.ContentLines)
- fmt.Println(res)
+func (s *Stdoutput) resultNormal(res ffuf.Result) {
+ resnormal := fmt.Sprintf("%s%-23s [Status: %s, Size: %d, Words: %d, Lines: %d]", TERMINAL_CLEAR_LINE, s.prepareInputsOneLine(res), s.colorize(fmt.Sprintf("%d", res.StatusCode), res.StatusCode), res.ContentLength, res.ContentWords, res.ContentLines)
+ fmt.Println(resnormal)
}
func (s *Stdoutput) colorize(input string, status int64) string {
diff --git a/pkg/runner/simple.go b/pkg/runner/simple.go
index 2dca7e0..e13415e 100644
--- a/pkg/runner/simple.go
+++ b/pkg/runner/simple.go
@@ -104,7 +104,7 @@
// set default User-Agent header if not present
if _, ok := req.Headers["User-Agent"]; !ok {
- req.Headers["User-Agent"] = fmt.Sprintf("%s v%s", "Fuzz Faster U Fool", ffuf.VERSION)
+ req.Headers["User-Agent"] = fmt.Sprintf("%s v%s", "Fuzz Faster U Fool", ffuf.Version())
}
// Handle Go http.Request special cases