fluent-plugin-masking 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af98b34958dbe69aded48cc35ea83ebeada5e020773f041dcf0f787ce70dfdf
-  data.tar.gz: 7a19b3898868e5bc8d6118419287c59f777be1d56cf177aa059df29c4d13edaa
+  metadata.gz: 1be0dc52a39ffef703c1248c3c382216c6d403eadeadbc3867dfc8a258c32c92
+  data.tar.gz: cdec0b9f6dc0df77666fe108508f9e46da1b2e2157701daa5923eb966aa20680
 SHA512:
-  metadata.gz: 874630b83c4dc1131521af3444c3f3bc1d1638a929e73049817cfdacfb55353587c8d1bfa424ebee4b3669d3c488ee38a5ae74b88ec545ef1e64d92a963ffd5f
-  data.tar.gz: 8574105ab4603323527e4d5d000043dd0c201990530afec23634f3195b815cacd6853748d60c0855eadbf26baafd718a0f3239b5289e0b906353c6be06063b86
+  metadata.gz: 89056249c1728a23e8e97830b929e104266f92c24963afcc562ccad2f2d4b15fdab248475bdb64edbac646d5921fcbaa19532f24ebd9e9db0985003a1f898b96
+  data.tar.gz: c3457ebd0f9e07d3eaa11e117f987b98bc00757d32f02bcc6c0650365f5876eb098fc816ad659195181240a979251968c2bec65c6a3b6443c9a96b58dc31907d

data/lib/fluent/plugin/filter_masking.rb

@@ -21,7 +21,7 @@ module Fluent
           recordStr = record.to_s
           @fields_to_mask.each do | fieldToMask |
             recordStr = recordStr.gsub(/(?::#{fieldToMask}=>")(.*?)(?:")/m, ":#{fieldToMask}=>\"#{MASK_STRING}\"") # mask element in hash object
-            recordStr = recordStr.gsub(/\\+"#{fieldToMask}\\+":\\+.+?((?=(}\\+",)|,( *|)(\s|\\+)\")|(?=}"$))/m, "\\\"#{fieldToMask}\\\":\\\"#{MASK_STRING}\\\"") # mask element in json string
+            recordStr = recordStr.gsub(/\\+"#{fieldToMask}\\+":\\+.+?((?=(})|,( *|)(\s|\\+)\")|(?=}"$))/m, "\\\"#{fieldToMask}\\\":\\\"#{MASK_STRING}\\\"") # mask element in json string
           end
 
           maskedRecord = strToHash(recordStr)

data/lib/fluent/plugin/version.rb

@@ -1,3 +1,3 @@
 module FilterMasking
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
 end 

data/test/fields-to-mask

@@ -2,4 +2,5 @@ email
 first_name
 last_name
 street
-number
+number
+password

data/test/test_filter_masking.rb

@@ -58,6 +58,18 @@ class YourOwnFilterTest < Test::Unit::TestCase
       assert_equal(expected, filtered_records)
     end
 
+    test 'mask field in hash object and in json string' do
+      conf = CONFIG
+      messages = [
+        { :msg=>"sup", :email=>"mickey-the-dog@zooz.com", :body => "{\"first_name\":\"mickey\", \"type\":\"puggle\", \"last_name\":\"the-dog\"}", :status_code=>201, :password=>"d0g!@"}
+      ]
+      expected = [
+        { :msg=>"sup", :email=>MASK_STRING, :body => "{\"first_name\":\"*******\", \"type\":\"puggle\", \"last_name\":\"*******\"}", :status_code=>201, :password=>MASK_STRING }
+      ]
+      filtered_records = filter(conf, messages)
+      assert_equal(expected, filtered_records)
+    end
+
     test 'mask field in nested json string' do
       conf = CONFIG
       messages = [
@@ -70,7 +82,7 @@ class YourOwnFilterTest < Test::Unit::TestCase
       assert_equal(expected, filtered_records)
     end
 
-    test 'mask field in nested json escaped strubg' do
+    test 'mask field in nested json escaped string' do
       conf = CONFIG
       messages = [
         { :body => "{\"first_name\":\"mickey\",\"last_name\":\"the-dog\",\"address\":\"{\\\"street\":\\\"Austin\\\",\\\"number\":\\\"89\\\"}\", \"type\":\"puggle\"}" } 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-masking
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Shai Moria