CR fixes

Author: kohend

lib/fluent/plugin/filter_masking.rb

@@ -17,14 +17,15 @@ def maskRecord(record)
         maskedRecord = record
         excludedFields = []
         @fieldsToExcludeJSONPathsArray.each do | field |
-          if record.dig(*field.split(".")) != nil
-            excludedFields = excludedFields + record.dig(*field.split(".")).split(',')
+          field_value = record.dig(*field)
+          if  field_value != nil
+            excludedFields = excludedFields + field_value.split(',')
           end
         end
         begin 
           recordStr = record.to_s
           @fields_to_mask_regex.each do | fieldToMaskRegex, fieldToMaskRegexStringReplacement |
-            if (excludedFields.length == 0 || !(excludedFields.include? @fields_to_mask_keys[fieldToMaskRegex]))
+            if !(excludedFields.include? @fields_to_mask_keys[fieldToMaskRegex])
               recordStr = recordStr.gsub(fieldToMaskRegex, fieldToMaskRegexStringReplacement) 
             end
           end
@@ -53,7 +54,10 @@ def configure(conf)
         fieldsToExcludeJSONPaths = conf['fieldsToExcludeJSONPaths']
 
         if fieldsToExcludeJSONPaths != nil && fieldsToExcludeJSONPaths.size() > 0 
-          @fieldsToExcludeJSONPathsArray = fieldsToExcludeJSONPaths.split(",")
+          fieldsToExcludeJSONPaths.split(",").each do | field |
+            # To save splits we'll save the path as an array
+            @fieldsToExcludeJSONPathsArray.push(field.split("."))
+          end
         end
 
         File.open(fieldsToMaskFilePath, "r") do |f|

test/test_filter_masking.rb

@@ -17,7 +17,7 @@ def setup
   # default configuration for tests
   CONFIG = %[
     fieldsToMaskFilePath test/fields-to-mask
-    fieldsToExcludeJSONPaths excludeMaskFields,exclude.excludeMaskFields
+    fieldsToExcludeJSONPaths excludedField,exclude.path.nestedExcludedField
   ]
 
   # configuration for tests without exclude parameter
@@ -102,21 +102,32 @@ def filter(config, messages)
     test 'mask field in hash object with exclude' do
       conf = CONFIG
       messages = [
-        {:not_masked_field=>"mickey-the-dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "excludeMaskFields"=>"first_name"}
+        {:not_masked_field=>"mickey-the-dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "excludedField"=>"first_name"}
       ]
       expected = [
-        {:not_masked_field=>"mickey-the-dog", :email=>MASK_STRING, :first_name=>"Micky", "excludeMaskFields"=>"first_name"}
+        {:not_masked_field=>"mickey-the-dog", :email=>MASK_STRING, :first_name=>"Micky", "excludedField"=>"first_name"}
       ]
       filtered_records = filter(conf, messages)
       assert_equal(expected, filtered_records)
     end
     test 'mask field in hash object with nested exclude' do
       conf = CONFIG
       messages = [
-        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky",  "exclude"=>{"excludeMaskFields"=>"first_name,last_name"}}
+        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky",  "exclude"=>{"path"=>{"nestedExcludedField"=>"first_name,last_name"}}}
       ]
       expected = [
-        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", "exclude"=>{"excludeMaskFields"=>"first_name,last_name"}}
+        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", "exclude"=>{"path"=>{"nestedExcludedField"=>"first_name,last_name"}}}
+      ]
+      filtered_records = filter(conf, messages)
+      assert_equal(expected, filtered_records)
+    end
+    test 'mask field in hash object with base and nested exclude' do
+      conf = CONFIG
+      messages = [
+        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "excludedField"=>"first_name", "exclude"=>{"path"=>{"nestedExcludedField"=>"last_name"}}}
+      ]
+      expected = [
+        {:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", "excludedField"=>"first_name", "exclude"=>{"path"=>{"nestedExcludedField"=>"last_name"}}}
       ]
       filtered_records = filter(conf, messages)
       assert_equal(expected, filtered_records)