Skip to content

Commit bf97131

Browse files
rx294rx294
authored
Merge pull request #91 from mitre/remove_verbose_parameter
2 parents cca97c9 + 3258fca commit bf97131

File tree

11 files changed

+22
-49
lines changed

11 files changed

+22
-49
lines changed

‎lib/heimdall_tools/aws_config_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#
1919
module HeimdallTools
2020
class AwsConfigMapper
21-
def initialize(custom_mapping, endpoint = nil, verbose = false)
22-
@verbose = verbose
21+
def initialize(custom_mapping, endpoint = nil)
2322
@default_mapping = get_rule_mapping(AWS_CONFIG_MAPPING_FILE)
2423
@custom_mapping = custom_mapping.nil? ? {} : get_rule_mapping(custom_mapping)
2524
if endpoint.nil?

‎lib/heimdall_tools/burpsuite_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020

2121
module HeimdallTools
2222
class BurpSuiteMapper
23-
def initialize(burps_xml, _name = nil, verbose = false)
23+
def initialize(burps_xml, _name = nil)
2424
@burps_xml = burps_xml
25-
@verbose = verbose
2625

2726
begin
2827
@cwe_nist_mapping = parse_mapper

‎lib/heimdall_tools/cli.rb‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ class CLI < Command
66
long_desc Help.text(:fortify_mapper)
77
option :fvdl, required: true, aliases: '-f'
88
option :output, required: true, aliases: '-o'
9-
option :verbose, type: :boolean, aliases: '-V'
109
def fortify_mapper
1110
hdf = HeimdallTools::FortifyMapper.new(File.read(options[:fvdl])).to_hdf
1211
File.write(options[:output], hdf)
@@ -17,7 +16,6 @@ def fortify_mapper
1716
option :json, required: true, aliases: '-j'
1817
option :name, required: true, aliases: '-n'
1918
option :output, required: true, aliases: '-o'
20-
option :verbose, type: :boolean, aliases: '-V'
2119
def zap_mapper
2220
hdf = HeimdallTools::ZapMapper.new(File.read(options[:json]), options[:name]).to_hdf
2321
File.write(options[:output], hdf)
@@ -29,7 +27,6 @@ def zap_mapper
2927
option :api_url, required: true, aliases: '-u'
3028
option :auth, type: :string, required: false
3129
option :output, required: true, aliases: '-o'
32-
option :verbose, type: :boolean, aliases: '-V'
3330
def sonarqube_mapper
3431
hdf = HeimdallTools::SonarQubeMapper.new(options[:name], options[:api_url], options[:auth]).to_hdf
3532
File.write(options[:output], hdf)
@@ -39,7 +36,6 @@ def sonarqube_mapper
3936
long_desc Help.text(:burpsuite_mapper)
4037
option :xml, required: true, aliases: '-x'
4138
option :output, required: true, aliases: '-o'
42-
option :verbose, type: :boolean, aliases: '-V'
4339
def burpsuite_mapper
4440
hdf = HeimdallTools::BurpSuiteMapper.new(File.read(options[:xml])).to_hdf
4541
File.write(options[:output], hdf)
@@ -49,7 +45,6 @@ def burpsuite_mapper
4945
long_desc Help.text(:nessus_mapper)
5046
option :xml, required: true, aliases: '-x'
5147
option :output_prefix, required: true, aliases: '-o'
52-
option :verbose, type: :boolean, aliases: '-V'
5348
def nessus_mapper
5449
hdfs = HeimdallTools::NessusMapper.new(File.read(options[:xml])).to_hdf
5550

@@ -64,7 +59,6 @@ def nessus_mapper
6459
long_desc Help.text(:snyk_mapper)
6560
option :json, required: true, aliases: '-j'
6661
option :output_prefix, required: true, aliases: '-o'
67-
option :verbose, type: :boolean, aliases: '-V'
6862
def snyk_mapper
6963
hdfs = HeimdallTools::SnykMapper.new(File.read(options[:json]), options[:name]).to_hdf
7064
puts "\r\HDF Generated:\n"
@@ -78,7 +72,6 @@ def snyk_mapper
7872
long_desc Help.text(:nikto_mapper)
7973
option :json, required: true, aliases: '-j'
8074
option :output, required: true, aliases: '-o'
81-
option :verbose, type: :boolean, aliases: '-V'
8275
def nikto_mapper
8376
hdf = HeimdallTools::NiktoMapper.new(File.read(options[:json])).to_hdf
8477
File.write(options[:output], hdf)
@@ -90,7 +83,6 @@ def nikto_mapper
9083
long_desc Help.text(:jfrog_xray_mapper)
9184
option :json, required: true, aliases: '-j'
9285
option :output, required: true, aliases: '-o'
93-
option :verbose, type: :boolean, aliases: '-V'
9486
def jfrog_xray_mapper
9587
hdf = HeimdallTools::JfrogXrayMapper.new(File.read(options[:json])).to_hdf
9688
File.write(options[:output], hdf)
@@ -102,7 +94,6 @@ def jfrog_xray_mapper
10294
long_desc Help.text(:dbprotect_mapper)
10395
option :xml, required: true, aliases: '-x'
10496
option :output, required: true, aliases: '-o'
105-
option :verbose, type: :boolean, aliases: '-V'
10697
def dbprotect_mapper
10798
hdf = HeimdallTools::DBProtectMapper.new(File.read(options[:xml])).to_hdf
10899
File.write(options[:output], hdf)
@@ -114,7 +105,6 @@ def dbprotect_mapper
114105
long_desc Help.text(:aws_config_mapper)
115106
# option :custom_mapping, required: false, aliases: '-m'
116107
option :output, required: true, aliases: '-o'
117-
option :verbose, type: :boolean, aliases: '-V'
118108
def aws_config_mapper
119109
hdf = HeimdallTools::AwsConfigMapper.new(options[:custom_mapping]).to_hdf
120110
File.write(options[:output], hdf)
@@ -126,7 +116,6 @@ def aws_config_mapper
126116
long_desc Help.text(:netsparker_mapper)
127117
option :xml, required: true, aliases: '-x'
128118
option :output, required: true, aliases: '-o'
129-
option :verbose, type: :boolean, aliases: '-V'
130119
def netsparker_mapper
131120
hdf = HeimdallTools::NetsparkerMapper.new(File.read(options[:xml])).to_hdf
132121
File.write(options[:output], hdf)

‎lib/heimdall_tools/dbprotect_mapper.rb‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@
1212

1313
module HeimdallTools
1414
class DBProtectMapper
15-
def initialize(xml, _name = nil, verbose = false)
16-
@verbose = verbose
17-
18-
begin
19-
dataset = xml_to_hash(xml)
20-
@entries = compile_findings(dataset['dataset'])
21-
rescue StandardError => e
22-
raise "Invalid DBProtect XML file provided Exception: #{e};\nNote that XML must be of kind `Check Results Details`."
23-
end
15+
def initialize(xml, _name = nil)
16+
dataset = xml_to_hash(xml)
17+
@entries = compile_findings(dataset['dataset'])
18+
rescue StandardError => e
19+
raise "Invalid DBProtect XML file provided Exception: #{e};\nNote that XML must be of kind `Check Results Details`."
2420
end
2521

2622
def to_hdf

‎lib/heimdall_tools/fortify_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88
module HeimdallTools
99
class FortifyMapper
10-
def initialize(fvdl, verbose = false)
10+
def initialize(fvdl)
1111
@fvdl = fvdl
12-
@verbose = verbose
1312

1413
begin
1514
data = xml_to_hash(fvdl)

‎lib/heimdall_tools/jfrog_xray_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727

2828
module HeimdallTools
2929
class JfrogXrayMapper
30-
def initialize(xray_json, _name = nil, verbose = false)
30+
def initialize(xray_json, _name = nil)
3131
@xray_json = xray_json
32-
@verbose = verbose
3332

3433
begin
3534
@cwe_nist_mapping = parse_mapper

‎lib/heimdall_tools/nessus_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939

4040
module HeimdallTools
4141
class NessusMapper
42-
def initialize(nessus_xml, verbose = false)
42+
def initialize(nessus_xml)
4343
@nessus_xml = nessus_xml
44-
@verbose = verbose
4544
read_cci_xml
4645
begin
4746
@cwe_nist_mapping = parse_mapper

‎lib/heimdall_tools/netsparker_mapper.rb‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,15 @@
2121

2222
module HeimdallTools
2323
class NetsparkerMapper
24-
def initialize(xml, _name = nil, verbose = false)
25-
@verbose = verbose
26-
27-
begin
28-
@cwe_nist_mapping = parse_mapper(CWE_NIST_MAPPING_FILE)
29-
@owasp_nist_mapping = parse_mapper(OWASP_NIST_MAPPING_FILE)
30-
data = xml_to_hash(xml)
31-
32-
@vulnerabilities = data['netsparker-enterprise']['vulnerabilities']['vulnerability']
33-
@scan_info = data['netsparker-enterprise']['target']
34-
rescue StandardError => e
35-
raise "Invalid Netsparker XML file provided Exception: #{e}"
36-
end
24+
def initialize(xml, _name = nil)
25+
@cwe_nist_mapping = parse_mapper(CWE_NIST_MAPPING_FILE)
26+
@owasp_nist_mapping = parse_mapper(OWASP_NIST_MAPPING_FILE)
27+
data = xml_to_hash(xml)
28+
29+
@vulnerabilities = data['netsparker-enterprise']['vulnerabilities']['vulnerability']
30+
@scan_info = data['netsparker-enterprise']['target']
31+
rescue StandardError => e
32+
raise "Invalid Netsparker XML file provided Exception: #{e}"
3733
end
3834

3935
def to_hdf

‎lib/heimdall_tools/nikto_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626

2727
module HeimdallTools
2828
class NiktoMapper
29-
def initialize(nikto_json, _name = nil, verbose = false)
29+
def initialize(nikto_json, _name = nil)
3030
@nikto_json = nikto_json
31-
@verbose = verbose
3231

3332
begin
3433
@nikto_nist_mapping = parse_mapper

‎lib/heimdall_tools/snyk_mapper.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929

3030
module HeimdallTools
3131
class SnykMapper
32-
def initialize(synk_json, _name = nil, verbose = false)
32+
def initialize(synk_json, _name = nil)
3333
@synk_json = synk_json
34-
@verbose = verbose
3534

3635
begin
3736
@cwe_nist_mapping = parse_mapper

0 commit comments

Comments
 (0)