heimdall_tools 1.3.40 → 1.3.45

data/lib/heimdall_tools/zap_mapper.rb

@@ -3,19 +3,17 @@ require 'nokogiri'
 require 'csv'
 require 'heimdall_tools/hdf'
 
-
 RESOURCE_DIR = Pathname.new(__FILE__).join('../../data')
 
 CWE_NIST_MAPPING_FILE = File.join(RESOURCE_DIR, 'cwe-nist-mapping.csv')
-DEFAULT_NIST_TAG = ["SA-11", "RA-5"].freeze
+DEFAULT_NIST_TAG = %w{SA-11 RA-5}.freeze
 
 # rubocop:disable Metrics/AbcSize
 
 module HeimdallTools
   class ZapMapper
-    def initialize(zap_json, name, verbose = false)
+    def initialize(zap_json, name)
       @zap_json = zap_json
-      @verbose = verbose
 
       begin
         data = JSON.parse(zap_json, symbolize_names: true)
@@ -58,7 +56,7 @@ module HeimdallTools
 
     def format_code_desc(code_desc)
       desc = ''
-      code_desc.keys.each do |key|
+      code_desc.each_key do |key|
         desc += "#{key.capitalize}: #{code_desc[key]}\n"
       end
       desc
@@ -98,7 +96,7 @@ module HeimdallTools
       dup_ids.each do |dup_id|
         index = 1
         controls.select { |x| x['id'].eql?(dup_id) }.each do |control|
-          control['id'] = control['id'] + '.' + index.to_s
+          control['id'] = "#{control['id']}.#{index}"
           index += 1
         end
       end

data/lib/utilities/xml_to_hash.rb

@@ -6,11 +6,13 @@ def xml_node_to_hash(node)
     result_hash = {}
     if node.attributes != {}
       attributes = {}
-      node.attributes.keys.each do |key|
+      node.attributes.each_key do |key|
         attributes[node.attributes[key].name] = node.attributes[key].value
       end
     end
-    if !node.children.empty?
+    if node.children.empty?
+      attributes
+    else
       node.children.each do |child|
         result = xml_node_to_hash(child)
 
@@ -36,9 +38,7 @@ def xml_node_to_hash(node)
         # if there is a collision then node content supersets attributes
         result_hash = attributes.merge(result_hash)
       end
-      return result_hash
-    else
-      return attributes
+      result_hash
     end
   else
     node.content.to_s
@@ -47,7 +47,7 @@ end
 
 def xml_to_hash(xml)
   begin
-    data = Nokogiri::XML(xml) { |config| config.strict }
+    data = Nokogiri::XML(xml, &:strict)
   rescue Nokogiri::XML::SyntaxError => e
     puts "XML Parsing caught exception: #{e}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heimdall_tools
 version: !ruby/object:Gem::Version
-  version: 1.3.40
+  version: 1.3.45
 platform: ruby
 authors:
 - Robert Thew
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-configservice
@@ -27,75 +27,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: git-lite-version-bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
-  name: json
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
-  name: csv
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -111,19 +111,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: git-lite-version-bump
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 description: Converter utils that can be included as a gem or used from the command
   line
 email:
@@ -248,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Convert Forify, Openzap and Sonarqube results to HDF