From bc8cfa9b5417e61493e2fe3f31f4e61330912151 Mon Sep 17 00:00:00 2001 From: Rachael Korinek Date: Mon, 22 Oct 2018 15:28:38 -0500 Subject: [PATCH 1/2] Deal properly with dashed lists in source files --- lib/dradis/plugins/nessus/field_processor.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/dradis/plugins/nessus/field_processor.rb b/lib/dradis/plugins/nessus/field_processor.rb index 952c68f..d7fe0ca 100644 --- a/lib/dradis/plugins/nessus/field_processor.rb +++ b/lib/dradis/plugins/nessus/field_processor.rb @@ -28,7 +28,7 @@ def value(args={}) else output = @nessus_object.try(name) || 'n/a' - if field == 'report_item.description' && output =~ /^ -/ + if fields_with_lists.include?(field) format_bullet_point_lists(output) else output @@ -37,10 +37,16 @@ def value(args={}) end private + def fields_with_lists + ['report_item.description', 'report_item.solution'] + end + def format_bullet_point_lists(input) input.split("\n").map do |paragraph| if paragraph =~ /^ - (.*)$/m '* ' + $1.gsub(/ /, '').gsub(/\n/, ' ') + elsif paragraph =~ /^- (.*)$/m + '* ' + $1.gsub(/ /, '').gsub(/\n/, ' ') else paragraph end From 3ad959a15e9db180c564543966be1c24eb023b29 Mon Sep 17 00:00:00 2001 From: Rachael Korinek Date: Thu, 1 Nov 2018 14:37:19 -0500 Subject: [PATCH 2/2] Combine regex into one line --- lib/dradis/plugins/nessus/field_processor.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/dradis/plugins/nessus/field_processor.rb b/lib/dradis/plugins/nessus/field_processor.rb index d7fe0ca..80b59cf 100644 --- a/lib/dradis/plugins/nessus/field_processor.rb +++ b/lib/dradis/plugins/nessus/field_processor.rb @@ -43,9 +43,7 @@ def fields_with_lists def format_bullet_point_lists(input) input.split("\n").map do |paragraph| - if paragraph =~ /^ - (.*)$/m - '* ' + $1.gsub(/ /, '').gsub(/\n/, ' ') - elsif paragraph =~ /^- (.*)$/m + if paragraph =~ /^ *- (.*)$/m '* ' + $1.gsub(/ /, '').gsub(/\n/, ' ') else paragraph