symmetric-encryption 4.0.0.beta3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbba00171b0bbc9ced7ad733f3f26b58001d1d76
-  data.tar.gz: a1382fc5cac466532424653bf8b9780a90c577ca
+  metadata.gz: 1e1b5ae57f5d8cdffd7543b690a8dc1c56e3d3d2
+  data.tar.gz: 8243a0f27600f82f27b098199292938b36c64f34
 SHA512:
-  metadata.gz: ad6026a01681ec99c28c30b3e9cc0fc7b351ae10101e1f9a14605dff4952983b9b7490fdab82d051b705f2595f4bf08a544eb81923177b0ca9881b53bd80e6b2
-  data.tar.gz: 7dd9a71d0420eaab460217c1845233efa2f4eb35e8fed21986aae3f27188ee09ab1ab41b0da0f7d8f575b952f965539b0f980ec13f51d664bba6aa2ae317209b
+  metadata.gz: 51199eae1a22f24db637e403b774ac501c9e5f10635cabde7fb65e42517dace89c6badbe7de2649c6fc9ea8fec4f0f7f9544892b288000c31aa3a73ef0908b12
+  data.tar.gz: 8a912faebf87253678af05880029114dfe433edff0168207d200d9aefbffff9c3c1807d290904c1d1e22c9417ca0200849b77122bec26efc011dd82837753800

data/lib/symmetric_encryption/keystore.rb

@@ -73,15 +73,16 @@ module SymmetricEncryption
 
         config = cfg[:ciphers].first
 
+        # Only generate new keys for keystore's that have a key encrypting key
+        next unless config[:key_encrypting_key]
+
         version = config.delete(:version) || 1
         version -= 1
-        config.delete(:always_add_header)
-        config.delete(:encoding)
 
-        Key.migrate_config!(config)
+        always_add_header = config.delete(:always_add_header)
+        encoding          = config.delete(:encoding)
 
-        # Only generate new keys for keystore's that have a key encrypting key
-        next unless config[:key_encrypting_key]
+        Key.migrate_config!(config)
 
         # The current data encrypting key without any of the key encrypting keys.
         key            = Key.from_config(config)
@@ -96,7 +97,8 @@ module SymmetricEncryption
             Keystore::Memory.new_key_config(cipher_name: cipher_name, app_name: app_name, version: version, environment: environment, dek: key)
           end
 
-        new_key_config
+        new_key_config[:always_add_header] = always_add_header
+        new_key_config[:encoding]          = encoding
 
         # Replace existing config entry
         cfg[:ciphers].shift

data/lib/symmetric_encryption/utils/re_encrypt_files.rb

@@ -6,7 +6,7 @@
 #   * The search looks for the header and then replaces the encrypted value.
 #
 # Example:
-#   re_encrypt = SymmetricEncryption::Utils::ReEncryptConfigFiles.new(version: 4)
+#   re_encrypt = SymmetricEncryption::Utils::ReEncryptFiles.new(version: 4)
 #   re_encrypt.process_directory('../../**/*.yml')
 #
 # Notes:
@@ -72,13 +72,10 @@ module SymmetricEncryption
               line
             end
         end
-        if hits
+        if hits > 0
           File.open(file_name, 'wb') { |file| file.write(output_lines) }
         end
         hits
-      rescue
-        puts "Failed re-encrypting the file contents of: #{file_name}"
-        raise
       end
 
       # Re Encrypt an entire file
@@ -112,8 +109,12 @@ module SymmetricEncryption
               re_encrypt_file(file_name)
             end
           else
-            count = re_encrypt_contents(file_name)
-            puts "Re-encrypted #{count} encrypted value(s) in: #{file_name}" if count > 0
+            begin
+              count = re_encrypt_contents(file_name)
+              puts "Re-encrypted #{count} encrypted value(s) in: #{file_name}" if count > 0
+            rescue StandardError => exc
+              puts "Failed re-encrypting the file contents of: #{file_name}. #{exc.class.name}: #{exc.message}"
+            end
           end
         end
       end
@@ -121,7 +122,7 @@ module SymmetricEncryption
       private
 
       def regexp
-        @regexp ||= /#{SymmetricEncryption.cipher.encoded_magic_header}([A-Za-z0-9+\/]+=+[\\n]*)/
+        @regexp ||= /#{SymmetricEncryption.cipher.encoded_magic_header}([A-Za-z0-9+\/]+[=\\n]*)/
       end
 
       # Returns [Integer] encrypted file key version.

data/lib/symmetric_encryption/version.rb

@@ -1,3 +1,3 @@
 module SymmetricEncryption #:nodoc
-  VERSION = '4.0.0.beta3'
+  VERSION = '4.0.0'
 end

data/test/key_test.rb

@@ -2,6 +2,15 @@ require_relative 'test_helper'
 
 class KeyTest < Minitest::Test
   describe SymmetricEncryption::Key do
+    before do
+      Dir.mkdir('tmp') unless Dir.exist?('tmp')
+    end
+
+    after do
+      # Cleanup generated encryption key files.
+      `rm tmp/dek_tester* 2> /dev/null`
+    end
+
     let :random_key do
       SymmetricEncryption::Key.new
     end
@@ -112,7 +121,7 @@ class KeyTest < Minitest::Test
       end
 
       let :dek_file_name do
-        'tmp/tester_dek.encrypted_key'
+        'tmp/dek_tester_dek.encrypted_key'
       end
 
       describe 'key' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -101,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11