Add Fallback Logic for Unrecognized Idents #222 (#227)

- added fallback logic for unrecognized idents, using legacy behaviors - added unit testing for the new Ident constructor * Cleanup Ident test to use hash instead of array Signed-off-by: Jarod Neuner <[email protected]> Signed-off-by: Robert Clark <[email protected]> Co-authored-by: Robert Clark <[email protected]>
mitre · Apr 23, 2021 · bad8481 · bad8481
1 parent d4ee848
commit bad8481
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/lib/happy_mapper_tools/benchmark.rb b/lib/happy_mapper_tools/benchmark.rb
@@ -67,11 +67,17 @@ class Ident
       content :ident, String
       def initialize(ident_str)
         @ident = ident_str
-	if ident_str =~ /^(CCI-[0-9]{6})$/
+        if ident_str =~ /^(CCI-[0-9]{6})$/
+          # Match CCI IDs; e.g. CCI-123456
           @system = 'http://cyber.mil/cci'
-	else
+        elsif ident_str =~ /^(S?V-[0-9]{5})$/
+          # Match SV- IDs; e.g. SV-12345
+          # Match V- IDs; e.g. V-12345
           @system = 'http://cyber.mil/legacy'
-	end
+        else
+          # for all other ident_str, use the old identifier
+          @system = 'https://public.cyber.mil/stigs/cci/'
+        end
       end
     end
 

diff --git a/test/unit/inspec_tools/happymapper_test.rb b/test/unit/inspec_tools/happymapper_test.rb
@@ -0,0 +1,21 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+describe "HappyMapperTools::Benchmark::Ident correctly determines the system for each identifier" do
+  # test values (tv); tv[0] == identifier, tv[1] == system
+  tvList = {
+    'CCI-000213' => 'http://cyber.mil/cci',
+    'V-72859' =>    'http://cyber.mil/legacy',
+    'SV-87511' =>   'http://cyber.mil/legacy',
+    'CCI-00213' =>  'https://public.cyber.mil/stigs/cci/',
+    'CCI-0000213' =>  'https://public.cyber.mil/stigs/cci/',
+  }
+
+  tvList.each do |identifier, system|
+    it identifier do
+      # Ident.new automatically determines ident.system
+      ident = HappyMapperTools::Benchmark::Ident.new identifier
+      assert_equal(system, ident.system)
+    end
+  end
+end