daffainfo
/
nuclei
mirror of https://github.com/daffainfo/nuclei.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed exclude filter for tags

dev
Ice3man543 2021-07-01 21:09:33 +05:30
parent 6c77d891cd
commit cddb0cb8af
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
v2/pkg/catalog/loader/filter.go
View File

@ -72,12 +72,11 @@ func (config *Config) createTagFilter() *tagFilter {
block: make(map[string]struct{}),
matchAllows: make(map[string]struct{}),
}
for _, tag := range config.Tags {
for _, tag := range config.ExcludeTags {
for _, val := range splitCommaTrim(tag) {
if _, ok := filter.allowedTags[val]; !ok {
filter.allowedTags[val] = struct{}{}
if _, ok := filter.block[val]; !ok {
filter.block[val] = struct{}{}
}
delete(filter.block, val)
}
}
for _, tag := range config.Severities {
@ -94,11 +93,12 @@ func (config *Config) createTagFilter() *tagFilter {
}
}
}
for _, tag := range config.ExcludeTags {
for _, tag := range config.Tags {
for _, val := range splitCommaTrim(tag) {
if _, ok := filter.block[val]; !ok {
filter.block[val] = struct{}{}
if _, ok := filter.allowedTags[val]; !ok {
filter.allowedTags[val] = struct{}{}
}
delete(filter.block, val)
}
}
for _, tag := range config.IncludeTags {

11
v2/pkg/catalog/loader/filter_test.go
View File

@ -22,7 +22,6 @@ func TestTagBasedFilter(t *testing.T) {
})
t.Run("not-match-excludes", func(t *testing.T) {
config := &Config{
Tags: []string{"cves", "dos"},
ExcludeTags: []string{"dos"},
}
filter := config.createTagFilter()
@ -42,6 +41,16 @@ func TestTagBasedFilter(t *testing.T) {
require.Nil(t, err, "could not get match")
require.True(t, matched, "could not get correct match")
})
t.Run("match-includes", func(t *testing.T) {
config := &Config{
Tags: []string{"fuzz"},
ExcludeTags: []string{"fuzz"},
}
filter := config.createTagFilter()
matched, err := filter.match("fuzz", "pdteam", "low")
require.Nil(t, err, "could not get match")
require.True(t, matched, "could not get correct match")
})
t.Run("match-author", func(t *testing.T) {
config := &Config{
Authors: []string{"pdteam"},