spamtrap 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc68536b7186bc9fac9249043e7bd3d0713b77070fab4611c08a8ba5fb1bfc1
-  data.tar.gz: 91c9ae78401af26537bc45c7c1ea17fac4245c264e1a6ee421fb6a9fd86af2d0
+  metadata.gz: c77cdc3c296d9d7add4208780853b77a22cc7e3df72c2fe86dc38371394f8d42
+  data.tar.gz: e1edf13f46c1e64c38bca0a1b1d31f5a7dd41419f8f45cba7b29a580e1761f5d
 SHA512:
-  metadata.gz: 5985f1e8600a0f2d361b94ede13e567ea8b09d8e9ff3d7b4b0c2be99987d50d85bf5271dcea1bf3a0b5cc128a0fc066d6395b8ebf0be53dbc25970333e8ddab0
-  data.tar.gz: 5adec9413ed191d8de06866db16da6b68b65ead9509749a535fe416964540da1751037f44e52a688461cd828cbe82826d4714c40d08c06fdafa8f68e0b2f07da
+  metadata.gz: 34d2069dd9f92c0c36e56a0b20940c1cae6382cc94cd0c6b54c6609136f58a5ca3e3a26d469111a0527dfed0d5ccfa82d776ae1c2b6464fa91c88898f0d87d49
+  data.tar.gz: 249c2fa24da70d78a0a697194cad3a0c0e493b3285199e608ce3fb3667e6cb665078bf27e684cf0d9a18482b76c6501a8f913c688c15465266af37ac0164b9a2

data/lib/spamtrap/crypto.rb

@@ -9,6 +9,8 @@ module Spamtrap
     NONCE_LEN = 12
     TAG_LEN   = 16
 
+    TOKEN_DRAWS = 8 # see spamtrap_encrypt_field
+
     class << self
       # HKDF-derives {mutation:, nonce:} keys, memoised per secret at module level so each
       # request doesn't re-derive them; previous_secret_key_base is what keeps a rotation from
@@ -52,8 +54,20 @@ module Spamtrap
       context.nil? ? timestamp.to_s : "#{timestamp}:#{context}"
     end
 
-    # aad binds the token to the render timestamp so it can't be replayed under a different one.
+    # A token the app's filter_parameters match as it stands (one containing otp or cvv, say) is
+    # masked in the log before the real name is checked: 0.38% of draws per field under Rails'
+    # generated list. So draw again. Capped because a filter matching every token would never stop.
     def spamtrap_encrypt_field(field_name, aad)
+      token = nil
+      TOKEN_DRAWS.times do
+        token = spamtrap_encrypt_field_once(field_name, aad)
+        break unless defined?(Spamtrap::ParameterFilter) && Spamtrap::ParameterFilter.masks_token?(token)
+      end
+      token
+    end
+
+    # aad binds the token to the render timestamp so it can't be replayed under a different one.
+    def spamtrap_encrypt_field_once(field_name, aad)
       cipher = OpenSSL::Cipher.new(CIPHER)
       cipher.encrypt
       cipher.key = Spamtrap::Crypto.keys_for(Spamtrap.secret_key_base)[:mutation]

data/lib/spamtrap/parameter_filter.rb

@@ -21,7 +21,19 @@ module Spamtrap
       value.replace(masked) if masked
     end
 
+    # Stands in for a field's value when asking whether the app's filters would mask a token.
+    PROBE = 'spamtrap'.freeze
+
     class << self
+      # Whether the app's filters mask a value by the token itself. Rails checks key filters before
+      # calling any block, so such a token hides its field whatever the real name. Leaf only, so a
+      # dotted filter such as "comment.otp" goes unchecked; it can match only a token's first letters.
+      def masks_token?(token)
+        return false unless Spamtrap.filter_parameters && defined?(Rails.application) && Rails.application
+
+        app_filter.filter(token => PROBE)[token] != PROBE
+      end
+
       # What the app's filters turn value into at the field's real path, or nil if they leave it.
       # Only leaf names are mutated, so the containers above the token give the real path. A token
       # shared by fields_for children has several parents; masking if any path would is the safe side.

data/lib/spamtrap/version.rb

@@ -1,5 +1,5 @@
 module Spamtrap
 
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spamtrap
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Cedric Howe
@@ -139,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Simple spamtrap for spambots.
 test_files: []