crypt_keeper 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73363a22fbcc6bdbe4ecb9be144d088cc99348a7
-  data.tar.gz: 25c86e1d17a14f387db29b85e1f88fe4b96f0bcb
+  metadata.gz: 3297d5e1a03266d6b1d74f5e9fee1fbba49dd295
+  data.tar.gz: f7621fbc63a9e94341105919bc839d8917d3f37b
 SHA512:
-  metadata.gz: 3d04d80a51df14a595006ca5824d5e561be8b325cf1f390deb4b8952ec53d5b716cb029e13b30b74a485270cea83134bdf6605b1f16f54179599d2a96ff5acc8
-  data.tar.gz: 1e1b123878d3f9fd77337d9df4b6d30ac13de7bdfb2b2a2420cebefb03965bec58a931cb394ecf24657b712c117fe460f97da4c1c7accbab85620af14f5732d8
+  metadata.gz: 2de5ef53aaa8f9d2e255f3c9b68c2996dae3eb2f49919ecceeb335fefbaaaa4ca98b1b0aa0ffb71aaf672ad2f7e0b6ed4edcbc721201f411cf6e8ba368984ab2
+  data.tar.gz: 82a701bd3b4c2a56394fdb205ecc0e24bb856028d0ccdbc61867ae0184b76967de02de7ddd07927fd00e16a6ad0d670f2d5442fc37ad408152ccc5eac900b574

data/gemfiles/activerecord_4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    crypt_keeper (0.20.0)
+    crypt_keeper (0.21.0)
       activerecord (>= 3.1, < 4.3)
       activesupport (>= 3.1, < 4.3)
       aes (~> 0.5.0)
@@ -117,4 +117,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.4
+   1.12.5

data/gemfiles/activerecord_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    crypt_keeper (0.20.0)
+    crypt_keeper (0.21.0)
       activerecord (>= 3.1, < 4.3)
       activesupport (>= 3.1, < 4.3)
       aes (~> 0.5.0)
@@ -117,4 +117,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.4
+   1.12.5

data/lib/crypt_keeper.rb

@@ -13,7 +13,10 @@ require 'crypt_keeper/provider/postgres_pgp_public_key'
 module CryptKeeper
   class << self
     attr_accessor :stub_encryption
-    alias_method :stub_encryption?, :stub_encryption 
+    alias_method :stub_encryption?, :stub_encryption
+
+    attr_accessor :silence_logs
+    alias_method :silence_logs?, :silence_logs
   end
 end
 

data/lib/crypt_keeper/log_subscriber/mysql_aes.rb

@@ -16,6 +16,8 @@ module CryptKeeper
         payload = event.payload[:sql]
           .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
 
+        return if CryptKeeper.silence_logs? && payload =~ filter
+
         event.payload[:sql] = payload.gsub(filter) do |_|
           "#{$1}([FILTERED])"
         end

data/lib/crypt_keeper/log_subscriber/postgres_pgp.rb

@@ -16,6 +16,8 @@ module CryptKeeper
         payload = event.payload[:sql]
           .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
 
+        return if CryptKeeper.silence_logs? && payload =~ filter
+
         event.payload[:sql] = payload.gsub(filter) do |_|
           "#{$~[:operation]}([FILTERED])"
         end

data/lib/crypt_keeper/version.rb

@@ -1,3 +1,3 @@
 module CryptKeeper
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/spec/log_subscriber/mysql_aes_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 module CryptKeeper::LogSubscriber
   describe MysqlAes do
+    before do
+      CryptKeeper.silence_logs = false
+    end
+
     use_mysql
 
     context "AES encryption" do
@@ -56,6 +60,14 @@ module CryptKeeper::LogSubscriber
         string_encoding_query = "SELECT aes_encrypt('hi \255', 'test')"
         subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: string_encoding_query }))
       end
+
+      it "skips logging if CryptKeeper.silence_logs is set" do
+        CryptKeeper.silence_logs = true
+
+        subject.should_not_receive(:sql_without_mysql_aes)
+
+        subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: input_query }))
+      end
     end
   end
 end

data/spec/log_subscriber/postgres_pgp_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 module CryptKeeper::LogSubscriber
   describe PostgresPgp do
+    before do
+      CryptKeeper.silence_logs = false
+    end
+
     use_postgres
 
     context "Symmetric encryption" do
@@ -56,6 +60,14 @@ module CryptKeeper::LogSubscriber
         string_encoding_query = "SELECT pgp_sym_encrypt('hi \255', 'test')"
         subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: string_encoding_query }))
       end
+
+      it "skips logging if CryptKeeper.silence_logs is set" do
+        CryptKeeper.silence_logs = true
+
+        subject.should_not_receive(:sql_without_postgres_pgp)
+
+        subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: input_query }))
+      end
     end
 
     context "Public key encryption" do
@@ -98,6 +110,14 @@ module CryptKeeper::LogSubscriber
 
         subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: input_query.downcase }))
       end
+
+      it "skips logging if CryptKeeper.silence_logs is set" do
+        CryptKeeper.silence_logs = true
+
+        subject.should_not_receive(:sql_without_postgres_pgp)
+
+        subject.sql(ActiveSupport::Notifications::Event.new(:sql, 1, 1, 1, { sql: input_query }))
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypt_keeper
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord