From 910be678f766b036d1b7986c10bd2d8f77650076 Mon Sep 17 00:00:00 2001 From: Tarun Koyalwar Date: Thu, 7 Mar 2024 16:27:31 +0530 Subject: [PATCH 1/4] fix tag include logic --- pkg/catalog/loader/filter/tag_filter.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/catalog/loader/filter/tag_filter.go b/pkg/catalog/loader/filter/tag_filter.go index 119b045b9d..add70e2dbe 100644 --- a/pkg/catalog/loader/filter/tag_filter.go +++ b/pkg/catalog/loader/filter/tag_filter.go @@ -408,7 +408,8 @@ func New(config *Config) (*TagFilter, error) { if _, ok := filter.allowedTags[val]; !ok { filter.allowedTags[val] = struct{}{} } - delete(filter.block, val) + // Note: only tags specified in IncludeTags should be removed from the block list + // not normal tags like config.Tags } } for _, tag := range config.IncludeTags { From 836d8e16bc116e9741a111a7dfb09bfd2862838d Mon Sep 17 00:00:00 2001 From: Tarun Koyalwar Date: Thu, 7 Mar 2024 16:33:16 +0530 Subject: [PATCH 2/4] fix unit test --- pkg/catalog/loader/filter/tag_filter_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/catalog/loader/filter/tag_filter_test.go b/pkg/catalog/loader/filter/tag_filter_test.go index ad14ddf80c..c73d654903 100644 --- a/pkg/catalog/loader/filter/tag_filter_test.go +++ b/pkg/catalog/loader/filter/tag_filter_test.go @@ -85,7 +85,7 @@ func TestTagBasedFilter(t *testing.T) { }) t.Run("match-includes", func(t *testing.T) { filter, err := New(&Config{ - Tags: []string{"fuzz"}, + IncludeTags: []string{"fuzz"}, ExcludeTags: []string{"fuzz"}, }) require.Nil(t, err) From 5598fa0ca181cb6ccea9f5638538409b322654c0 Mon Sep 17 00:00:00 2001 From: Tarun Koyalwar Date: Thu, 7 Mar 2024 16:42:02 +0530 Subject: [PATCH 3/4] remove quoting in extractor output --- pkg/output/format_screen.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/output/format_screen.go b/pkg/output/format_screen.go index e902f942d1..d468981de0 100644 --- a/pkg/output/format_screen.go +++ b/pkg/output/format_screen.go @@ -60,7 +60,7 @@ func (w *StandardWriter) formatScreen(output *ResultEvent) []byte { for i, item := range output.ExtractedResults { // trim trailing space item = strings.TrimSpace(item) - item = strconv.QuoteToASCII(item) + item = strings.ReplaceAll(item, "\n", "\\n") // only replace newlines builder.WriteString(w.aurora.BrightCyan(item).String()) if i != len(output.ExtractedResults)-1 { From 4551051d7e87c40ec7a7259987f82705148efa8c Mon Sep 17 00:00:00 2001 From: Tarun Koyalwar Date: Thu, 7 Mar 2024 17:23:35 +0530 Subject: [PATCH 4/4] remove quote in debug code command --- pkg/protocols/code/code.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/protocols/code/code.go b/pkg/protocols/code/code.go index 7a8f3b6756..b0c9b74d32 100644 --- a/pkg/protocols/code/code.go +++ b/pkg/protocols/code/code.go @@ -317,7 +317,7 @@ func interpretEnvVars(source string, vars map[string]interface{}) string { // bash mode if strings.Contains(source, "$") { for k, v := range vars { - source = strings.ReplaceAll(source, "$"+k, fmt.Sprintf("'%s'", v)) + source = strings.ReplaceAll(source, "$"+k, fmt.Sprintf("%s", v)) } } // python mode