mirror of
https://github.com/ffuf/ffuf
synced 2024-11-10 06:04:17 +00:00
Fix linter workflow and autocalibration for lines & words match (#614)
* Fix autocalibration for lines & words match * Fix golangci-lint workflow
This commit is contained in:
parent
5c489aea78
commit
3328a284d2
3 changed files with 13 additions and 8 deletions
7
.github/workflows/golangci-lint.yml
vendored
7
.github/workflows/golangci-lint.yml
vendored
|
@ -11,9 +11,12 @@ jobs:
|
||||||
name: lint
|
name: lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/setup-go@v3
|
||||||
|
with:
|
||||||
|
go-version: 1.17
|
||||||
|
- uses: actions/checkout@v3
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v2
|
uses: golangci/golangci-lint-action@v3
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
version: v1.29
|
version: v1.29
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
- master
|
- master
|
||||||
- New
|
- New
|
||||||
- Changed
|
- Changed
|
||||||
|
- Fixed issue with autocalibration of line & words filter
|
||||||
|
|
||||||
- v1.5.0
|
- v1.5.0
|
||||||
- New
|
- New
|
||||||
|
|
|
@ -54,7 +54,7 @@ func (j *Job) calibrationRequest(inputs map[string][]byte) (Response, error) {
|
||||||
return resp, fmt.Errorf("Response wouldn't be matched")
|
return resp, fmt.Errorf("Response wouldn't be matched")
|
||||||
}
|
}
|
||||||
|
|
||||||
//CalibrateForHost runs autocalibration for a specific host
|
// CalibrateForHost runs autocalibration for a specific host
|
||||||
func (j *Job) CalibrateForHost(host string, baseinput map[string][]byte) error {
|
func (j *Job) CalibrateForHost(host string, baseinput map[string][]byte) error {
|
||||||
if j.Config.MatcherManager.CalibratedForDomain(host) {
|
if j.Config.MatcherManager.CalibratedForDomain(host) {
|
||||||
return nil
|
return nil
|
||||||
|
@ -86,7 +86,7 @@ func (j *Job) CalibrateForHost(host string, baseinput map[string][]byte) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//CalibrateResponses returns slice of Responses for randomly generated filter autocalibration requests
|
// CalibrateResponses returns slice of Responses for randomly generated filter autocalibration requests
|
||||||
func (j *Job) Calibrate(input map[string][]byte) error {
|
func (j *Job) Calibrate(input map[string][]byte) error {
|
||||||
if j.Config.MatcherManager.Calibrated() {
|
if j.Config.MatcherManager.Calibrated() {
|
||||||
return nil
|
return nil
|
||||||
|
@ -112,8 +112,9 @@ func (j *Job) Calibrate(input map[string][]byte) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//CalibrateIfNeeded runs a self-calibration task for filtering options (if needed) by requesting random resources and
|
// CalibrateIfNeeded runs a self-calibration task for filtering options (if needed) by requesting random resources and
|
||||||
// configuring the filters accordingly
|
//
|
||||||
|
// configuring the filters accordingly
|
||||||
func (j *Job) CalibrateIfNeeded(host string, input map[string][]byte) error {
|
func (j *Job) CalibrateIfNeeded(host string, input map[string][]byte) error {
|
||||||
j.calibMutex.Lock()
|
j.calibMutex.Lock()
|
||||||
defer j.calibMutex.Unlock()
|
defer j.calibMutex.Unlock()
|
||||||
|
@ -192,7 +193,7 @@ func (j *Job) calibrateFilters(responses []Response, perHost bool) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ = j.Config.MatcherManager.AddFilter("word", strconv.FormatInt(baselineSize, 10), false)
|
_ = j.Config.MatcherManager.AddFilter("word", strconv.FormatInt(baselineWords, 10), false)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -226,7 +227,7 @@ func (j *Job) calibrateFilters(responses []Response, perHost bool) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ = j.Config.MatcherManager.AddFilter("line", strconv.FormatInt(baselineSize, 10), false)
|
_ = j.Config.MatcherManager.AddFilter("line", strconv.FormatInt(baselineLines, 10), false)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue