Merge pull request #42 from mitre/fix_41

Update to pull data csvs by relative path
mitre · Apr 7, 2020 · ef5377f · ef5377f
2 parents d89cbc7 + f781c18
commit ef5377f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/heimdall_tools/burpsuite_mapper.rb b/lib/heimdall_tools/burpsuite_mapper.rb
@@ -3,7 +3,9 @@
 require 'heimdall_tools/hdf'
 require 'utilities/xml_to_hash'
 
-CWE_NIST_MAPPING_FILE = './lib/data/cwe-nist-mapping.csv'.freeze
+RESOURCE_DIR = Pathname.new(__FILE__).join('../../data')
+
+CWE_NIST_MAPPING_FILE = File.join(RESOURCE_DIR, 'cwe-nist-mapping.csv')
 
 IMPACT_MAPPING = {
   High: 0.7,

diff --git a/lib/heimdall_tools/sonarqube_mapper.rb b/lib/heimdall_tools/sonarqube_mapper.rb
@@ -3,9 +3,11 @@
 require 'csv'
 require 'heimdall_tools/hdf'
 
+RESOURCE_DIR = Pathname.new(__FILE__).join('../../data')
+
 MAPPING_FILES = {
-  cwe: './lib/data/cwe-nist-mapping.csv'.freeze,
-  owasp: './lib/data/owasp-nist-mapping.csv'.freeze
+  cwe: File.join(RESOURCE_DIR, 'cwe-nist-mapping.csv'),
+  owasp: File.join(RESOURCE_DIR, 'owasp-nist-mapping.csv')
 }.freeze
 
 IMPACT_MAPPING = {

diff --git a/lib/heimdall_tools/zap_mapper.rb b/lib/heimdall_tools/zap_mapper.rb
@@ -4,7 +4,9 @@
 require 'heimdall_tools/hdf'
 
 
-CWE_NIST_MAPPING_FILE = './lib/data/cwe-nist-mapping.csv'.freeze
+RESOURCE_DIR = Pathname.new(__FILE__).join('../../data')
+
+CWE_NIST_MAPPING_FILE = File.join(RESOURCE_DIR, 'cwe-nist-mapping.csv')
 
 # rubocop:disable Metrics/AbcSize