Feature to autocalibrate the size and word count filters (#30)

This commit is contained in:
Joona Hoikkala 2019-04-20 20:46:43 +03:00 committed by GitHub
parent 11ece7db17
commit 4d0977a7d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 115 additions and 28 deletions

View file

@ -136,6 +136,7 @@ The only dependency of ffuf is Go 1.11. No dependencies outside of Go standard l
- master - master
- New - New
- New CLI flag: -ac to autocalibrate response size and word filters based on few preset URLs.
- Changed - Changed

35
main.go
View file

@ -76,6 +76,7 @@ func main() {
flag.BoolVar(&conf.StopOnErrors, "se", false, "Stop on spurious errors") flag.BoolVar(&conf.StopOnErrors, "se", false, "Stop on spurious errors")
flag.BoolVar(&conf.StopOnAll, "sa", false, "Stop on all error cases. Implies -sf and -se") flag.BoolVar(&conf.StopOnAll, "sa", false, "Stop on all error cases. Implies -sf and -se")
flag.BoolVar(&conf.FollowRedirects, "r", false, "Follow redirects") flag.BoolVar(&conf.FollowRedirects, "r", false, "Follow redirects")
flag.BoolVar(&conf.AutoCalibration, "ac", false, "Automatically calibrate filtering options")
flag.IntVar(&conf.Threads, "t", 40, "Number of concurrent threads.") flag.IntVar(&conf.Threads, "t", 40, "Number of concurrent threads.")
flag.BoolVar(&opts.showVersion, "V", false, "Show version information.") flag.BoolVar(&opts.showVersion, "V", false, "Show version information.")
flag.Parse() flag.Parse()
@ -100,10 +101,44 @@ func main() {
flag.Usage() flag.Usage()
os.Exit(1) os.Exit(1)
} }
if conf.AutoCalibration {
// Handle the calibration
responses, err := job.CalibrateResponses()
if err != nil {
fmt.Fprintf(os.Stderr, "Error in autocalibration, exiting: %s\n", err)
os.Exit(1)
}
if len(responses) > 0 {
calibrateFilters(responses, &conf)
}
}
// Job handles waiting for goroutines to complete itself // Job handles waiting for goroutines to complete itself
job.Start() job.Start()
} }
func calibrateFilters(responses []ffuf.Response, conf *ffuf.Config) {
sizeCalib := make([]string, 0)
wordCalib := make([]string, 0)
for _, r := range responses {
if r.ContentLength > 1 {
// Only add if we have an actual size of responses
sizeCalib = append(sizeCalib, strconv.FormatInt(r.ContentLength, 10))
}
if r.ContentWords > 1 {
// Only add if we have an actual word length of response
wordCalib = append(wordCalib, strconv.FormatInt(r.ContentWords, 10))
}
}
if len(sizeCalib) > 0 {
addFilter(conf, "size", strings.Join(sizeCalib, ","))
}
if len(wordCalib) > 0 {
addFilter(conf, "word", strings.Join(wordCalib, ","))
}
}
func prepareJob(conf *ffuf.Config) (*ffuf.Job, error) { func prepareJob(conf *ffuf.Config) (*ffuf.Job, error) {
errs := ffuf.NewMultierror() errs := ffuf.NewMultierror()
// TODO: implement error handling for runnerprovider and outputprovider // TODO: implement error handling for runnerprovider and outputprovider

View file

@ -33,6 +33,7 @@ type Config struct {
StopOnErrors bool StopOnErrors bool
StopOnAll bool StopOnAll bool
FollowRedirects bool FollowRedirects bool
AutoCalibration bool
Delay optRange Delay optRange
Filters []FilterProvider Filters []FilterProvider
Matchers []FilterProvider Matchers []FilterProvider

View file

@ -26,5 +26,5 @@ type OutputProvider interface {
Progress(status string) Progress(status string)
Error(errstring string) Error(errstring string)
Warning(warnstring string) Warning(warnstring string)
Result(resp Response) bool Result(resp Response)
} }

View file

@ -137,6 +137,62 @@ func (j *Job) updateProgress() {
j.Output.Progress(progString) j.Output.Progress(progString)
} }
//Calibrate runs a self-calibration task for filtering options, requesting random resources and acting accordingly
func (j *Job) CalibrateResponses() ([]Response, error) {
cInputs := make([]string, 0)
cInputs = append(cInputs, "admin"+randomString(16)+"/")
cInputs = append(cInputs, ".htaccess"+randomString(16))
cInputs = append(cInputs, randomString(16)+"/")
cInputs = append(cInputs, randomString(16))
results := make([]Response, 0)
for _, input := range cInputs {
req, err := j.Runner.Prepare([]byte(input))
if err != nil {
j.Output.Error(fmt.Sprintf("Encountered an error while preparing request: %s\n", err))
j.incError()
return results, err
}
resp, err := j.Runner.Execute(&req)
if err != nil {
return results, err
}
// Only calibrate on responses that would be matched otherwise
if j.isMatch(resp) {
results = append(results, resp)
}
}
return results, nil
}
func (j *Job) isMatch(resp Response) bool {
matched := false
for _, m := range j.Config.Matchers {
match, err := m.Filter(&resp)
if err != nil {
continue
}
if match {
matched = true
}
}
// The response was not matched, return before running filters
if !matched {
return false
}
for _, f := range j.Config.Filters {
fv, err := f.Filter(&resp)
if err != nil {
continue
}
if fv {
return false
}
}
return true
}
func (j *Job) runTask(input []byte, retried bool) { func (j *Job) runTask(input []byte, retried bool) {
req, err := j.Runner.Prepare(input) req, err := j.Runner.Prepare(input)
if err != nil { if err != nil {
@ -162,7 +218,8 @@ func (j *Job) runTask(input []byte, retried bool) {
j.inc403() j.inc403()
} }
} }
if j.Output.Result(resp) { if j.isMatch(resp) {
j.Output.Result(resp)
// Refresh the progress indicator as we printed something out // Refresh the progress indicator as we printed something out
j.updateProgress() j.updateProgress()
} }

16
pkg/ffuf/util.go Normal file
View file

@ -0,0 +1,16 @@
package ffuf
import (
"math/rand"
)
//used for random string generation in calibration function
var chars = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
func randomString(n int) string {
s := make([]rune, n)
for i := range s {
s[i] = chars[rand.Intn(len(chars))]
}
return string(s)
}

View file

@ -103,32 +103,10 @@ func (s *Stdoutput) Finalize() error {
return nil return nil
} }
func (s *Stdoutput) Result(resp ffuf.Response) bool { func (s *Stdoutput) Result(resp ffuf.Response) {
matched := false // Output the result
for _, m := range s.config.Matchers {
match, err := m.Filter(&resp)
if err != nil {
continue
}
if match {
matched = true
}
}
// The response was not matched, return before running filters
if !matched {
return false
}
for _, f := range s.config.Filters {
fv, err := f.Filter(&resp)
if err != nil {
continue
}
if fv {
return false
}
}
// Response survived the filtering, output the result
s.printResult(resp) s.printResult(resp)
// Check if we need the data later
if s.config.OutputFile != "" { if s.config.OutputFile != "" {
// No need to store results if we're not going to use them later // No need to store results if we're not going to use them later
sResult := Result{ sResult := Result{
@ -139,7 +117,6 @@ func (s *Stdoutput) Result(resp ffuf.Response) bool {
} }
s.Results = append(s.Results, sResult) s.Results = append(s.Results, sResult)
} }
return true
} }
func (s *Stdoutput) printResult(resp ffuf.Response) { func (s *Stdoutput) printResult(resp ffuf.Response) {