symmetric-encryption 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1969d461119a5844845fdef2e8de92424d4fe736d28f3f6c4483be3705955464
-  data.tar.gz: 77e854da843dd3106693dc8dfc96d2166685f2a0396dbc6d71a200bd030acf94
+  metadata.gz: ada00eaa90ed1edb19723bfc1e0e34f3e6f8be5f060b6c2a79eaf046483f77b0
+  data.tar.gz: 0bf3ae34653d9598fc0a0be1058aa366f1e401b053bad92995ef08f00dc1fcbc
 SHA512:
-  metadata.gz: c9ad42360c3362e94b9ddd9134a22c710f21f06a4120cd1e3466574229684a54d8f29e3eefce79c4e43c988abd862da86d5998d4f3d5014b5d25bf89fe919b69
-  data.tar.gz: '069b4c136a60eb089ed4e7beaf135d16b51d90507f76d4ded33d898d988768ace7d1cc51162098fa783d7a0af56a4676ae9eaac5ed4215a789799821cf339524'
+  metadata.gz: 8299b773b5fbe49452187aeaa746343e9aff7c49a86f226142ae105a1aa9d1ad29401aa44297d19c6ae79161c2e8f0a9ad4f159e36c7191df5b36bb704367ef1
+  data.tar.gz: f9a37ecd2aa9c95eeb543e08be08de1a859bb1e0745241d9e983534e9b3df334bcc1486f6a46430ab2bfeaa5286a5902bffacaced9c9c0d53526cfe16d29b357

data/lib/symmetric_encryption/cli.rb

@@ -219,7 +219,7 @@ module SymmetricEncryption
       }
       args[:key_path]   = key_path if key_path
       args[:regions]    = regions if regions && !regions.empty?
-      cfg               = Keystore.generate_data_keys(keystore, **args)
+      cfg               = Keystore.generate_data_keys(keystore: keystore, **args)
       Config.write_file(config_file_path, cfg)
       puts "New configuration file created at: #{config_file_path}"
     end
@@ -231,7 +231,7 @@ module SymmetricEncryption
     end
 
     def run_rotate_keys
-      if keystore && KEYSTORES.include?(keystore)
+      if keystore && !KEYSTORES.include?(keystore)
         puts "Invalid keystore option: #{keystore}, must be one of #{KEYSTORES.join(', ')}"
         exit(-3)
       end

data/lib/symmetric_encryption/encoder.rb

@@ -25,11 +25,11 @@ module SymmetricEncryption
 
     class None
       def encode(binary_string)
-        binary_string
+        binary_string&.dup
       end
 
       def decode(encoded_string)
-        encoded_string
+        encoded_string&.dup
       end
     end
 

data/lib/symmetric_encryption/generator.rb

@@ -24,10 +24,10 @@ module SymmetricEncryption
         # Also updates the encrypted field with the encrypted value
         # Freeze the decrypted field value so that it is not modified directly
         def #{decrypted_name}=(value)
-          v = SymmetricEncryption::Coerce.coerce(value, :#{type})
+          v = SymmetricEncryption::Coerce.coerce(value, :#{type}).freeze
           return if (@#{decrypted_name} == v) && !v.nil? && !(v == '')
-          self.#{encrypted_name} = @stored_#{encrypted_name} = ::SymmetricEncryption.encrypt(v, random_iv: #{random_iv}, compress: #{compress}, type: :#{type})
-          @#{decrypted_name} = v.freeze
+          self.#{encrypted_name} = @stored_#{encrypted_name} = ::SymmetricEncryption.encrypt(v, random_iv: #{random_iv}, compress: #{compress}, type: :#{type}).freeze
+          @#{decrypted_name} = v
         end
 
         # Returns the decrypted value for the encrypted field
@@ -35,7 +35,7 @@ module SymmetricEncryption
         # If this method is not called, then the encrypted value is never decrypted
         def #{decrypted_name}
           if !defined?(@stored_#{encrypted_name}) || (@stored_#{encrypted_name} != self.#{encrypted_name})
-            @#{decrypted_name} = ::SymmetricEncryption.decrypt(self.#{encrypted_name}, type: :#{type}).freeze
+            @#{decrypted_name} = ::SymmetricEncryption.decrypt(self.#{encrypted_name}.freeze, type: :#{type}).freeze
             @stored_#{encrypted_name} = self.#{encrypted_name}
           end
           @#{decrypted_name}

data/lib/symmetric_encryption/keystore/aws.rb

@@ -75,7 +75,8 @@ module SymmetricEncryption
                                  cipher_name:,
                                  app_name:,
                                  environment:,
-                                 key_path:)
+                                 key_path:,
+                                 **args)
 
         # TODO: Also support generating environment variables instead of files.
 

data/lib/symmetric_encryption/keystore/environment.rb

@@ -7,7 +7,7 @@ module SymmetricEncryption
       # Returns [Hash] a new keystore configuration after generating the data key.
       #
       # Increments the supplied version number by 1.
-      def self.generate_data_key(cipher_name:, app_name:, environment:, version: 0, dek: nil)
+      def self.generate_data_key(cipher_name:, app_name:, environment:, version: 0, dek: nil, **args)
         version >= 255 ? (version = 1) : (version += 1)
 
         kek   = SymmetricEncryption::Key.new(cipher_name: cipher_name)

data/lib/symmetric_encryption/keystore/file.rb

@@ -6,7 +6,7 @@ module SymmetricEncryption
       # Returns [Hash] a new keystore configuration after generating the data key.
       #
       # Increments the supplied version number by 1.
-      def self.generate_data_key(key_path:, cipher_name:, app_name:, environment:, version: 0, dek: nil)
+      def self.generate_data_key(key_path:, cipher_name:, app_name:, environment:, version: 0, dek: nil, **args)
         version >= 255 ? (version = 1) : (version += 1)
 
         dek ||= SymmetricEncryption::Key.new(cipher_name: cipher_name)

data/lib/symmetric_encryption/keystore/memory.rb

@@ -12,7 +12,7 @@ module SymmetricEncryption
       # Notes:
       # * For development and testing purposes only!!
       # * Never store the encrypted encryption key in the source code / config file.
-      def self.generate_data_key(cipher_name:, app_name:, environment:, version: 0, dek: nil)
+      def self.generate_data_key(cipher_name:, app_name:, environment:, version: 0, dek: nil, **args)
         version >= 255 ? (version = 1) : (version += 1)
 
         kek   = SymmetricEncryption::Key.new(cipher_name: cipher_name)

data/lib/symmetric_encryption/version.rb

@@ -1,3 +1,3 @@
 module SymmetricEncryption
-  VERSION = '4.1.1'.freeze
+  VERSION = '4.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -65,32 +65,6 @@ files:
 - lib/symmetric_encryption/utils/re_encrypt_files.rb
 - lib/symmetric_encryption/version.rb
 - lib/symmetric_encryption/writer.rb
-- test/active_record_test.rb
-- test/cipher_test.rb
-- test/config/database.yml
-- test/config/empty.csv
-- test/config/mongo_mapper.yml
-- test/config/mongoid.yml
-- test/config/symmetric-encryption.yml
-- test/config/test_new.iv
-- test/config/test_new.key
-- test/config/test_secondary_1.iv
-- test/config/test_secondary_1.key
-- test/encoder_test.rb
-- test/header_test.rb
-- test/key_test.rb
-- test/keystore/aws_test.rb
-- test/keystore/environment_test.rb
-- test/keystore/file_test.rb
-- test/keystore/heroku_test.rb
-- test/keystore_test.rb
-- test/mongoid_test.rb
-- test/reader_test.rb
-- test/symmetric_encryption_test.rb
-- test/test_db.sqlite3
-- test/test_helper.rb
-- test/utils/aws_test.rb
-- test/writer_test.rb
 homepage: http://rocketjob.github.io/symmetric-encryption/
 licenses:
 - Apache-2.0
@@ -111,35 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Encrypt ActiveRecord and Mongoid attributes, files and passwords in configuration
   files.
-test_files:
-- test/keystore/environment_test.rb
-- test/keystore/file_test.rb
-- test/keystore/heroku_test.rb
-- test/keystore/aws_test.rb
-- test/symmetric_encryption_test.rb
-- test/config/test_secondary_1.key
-- test/config/mongoid.yml
-- test/config/test_new.iv
-- test/config/test_secondary_1.iv
-- test/config/database.yml
-- test/config/test_new.key
-- test/config/symmetric-encryption.yml
-- test/config/empty.csv
-- test/config/mongo_mapper.yml
-- test/test_db.sqlite3
-- test/mongoid_test.rb
-- test/active_record_test.rb
-- test/keystore_test.rb
-- test/reader_test.rb
-- test/encoder_test.rb
-- test/utils/aws_test.rb
-- test/key_test.rb
-- test/header_test.rb
-- test/test_helper.rb
-- test/writer_test.rb
-- test/cipher_test.rb
+test_files: []