symmetric-encryption 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5499f0c6e33fc5eee0a2295623edd3bf35a247e1a6263a3e93f2c4e57219f22
-  data.tar.gz: ea3495cf8f5fe6b388725cd424ed13dc8b982c4ad225e78c7056f8d0f0d70cab
+  metadata.gz: 860217558341999072c177c7d848fa6315667a7fcb12d9e1d9a518ecda43a2c4
+  data.tar.gz: f0aa6a3419a15edfba8fcc37b72a1282057efbbe09653a7a04ff4687dcc87bd6
 SHA512:
-  metadata.gz: a8a920045c6b813bb55e8a518727ffdaf03b0b5857f5326d8b6003946d81fb162f28eea69617934622626de66cbfbeaf27b464c5d7baa21e07332e2c7098f7e4
-  data.tar.gz: bb2a832909e3a81b1e357a4ec650e7f1fd93e81ab08a0a0f3664b586bc0bf60f1a821c26831f456138e77a7a29575bc976890f608ac10461a51e5fd86dbd2699
+  metadata.gz: 870814f9d0d82dbd3edb405da82017c1d3533c4c7402e7ed0f9ac5e797a3c5e98500ac81912926076c84ddb90e3f287c097db65e5ff5202a22e5b053cfd83ba5
+  data.tar.gz: eba6e94c5ed7755795ac8bbfcf83cd0a08d6206888bcfbdc30d33bcc61dcb7403ae7afe0c6d187608cf02550f0a3bce6eeefeb464ac860b1b1d64282e4d047be

data/lib/symmetric_encryption/active_record/attr_encrypted.rb

@@ -51,7 +51,7 @@ module SymmetricEncryption
           random_iv = true if random_iv.nil? && SymmetricEncryption.randomize_iv?
 
           if random_iv.nil?
-            warn("attr_encrypted() no longer allows a default value for option `random_iv`. Add `random_iv: false` if it is required.")
+            warn('attr_encrypted() no longer allows a default value for option `random_iv`. Add `random_iv: false` if it is required.')
           end
 
           attributes.each do |attribute|

data/lib/symmetric_encryption/keystore.rb

@@ -202,7 +202,7 @@ module SymmetricEncryption
     def self.camelize(term)
       string = term.to_s
       string = string.sub(/^[a-z\d]*/, &:capitalize)
-      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }
+      string.gsub!(%r{(?:_|(/))([a-z\d]*)}i) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }
       string.gsub!('/'.freeze, '::'.freeze)
       string
     end

data/lib/symmetric_encryption/keystore/aws.rb

@@ -77,7 +77,7 @@ module SymmetricEncryption
                                  app_name:,
                                  environment:,
                                  key_path:,
-                                 **args)
+                                 **_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, **args)
+      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

@@ -8,7 +8,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, **args)
+      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)
@@ -47,11 +47,15 @@ module SymmetricEncryption
 
       # Returns the Encryption key in the clear.
       def read
-        raise(SymmetricEncryption::ConfigError,
-              "Symmetric Encryption key file: '#{file_name}' not found") unless ::File.exists?(file_name)
-        raise(SymmetricEncryption::ConfigError,
-              "Symmetric Encryption key file '#{file_name}' has the wrong "\
-              "permissions: #{::File.stat(file_name).mode.to_s(8)}. Expected 100600 or 100400.") unless correct_permissions?
+        unless ::File.exist?(file_name)
+          raise(SymmetricEncryption::ConfigError,
+                "Symmetric Encryption key file: '#{file_name}' not found")
+        end
+        unless correct_permissions?
+          raise(SymmetricEncryption::ConfigError,
+                "Symmetric Encryption key file '#{file_name}' has the wrong "\
+                "permissions: #{::File.stat(file_name).mode.to_s(8)}. Expected 100600 or 100400.")
+        end
 
         data = read_from_file(file_name)
         key_encrypting_key ? key_encrypting_key.decrypt(data) : data
@@ -71,7 +75,7 @@ module SymmetricEncryption
       def correct_permissions?
         stat = ::File.stat(file_name)
 
-        stat.owned? && %w(100600 100400).include?(stat.mode.to_s(8))
+        stat.owned? && %w[100600 100400].include?(stat.mode.to_s(8))
       end
     end
   end

data/lib/symmetric_encryption/keystore/gcp.rb

@@ -1,4 +1,4 @@
-require "google/cloud/kms/v1"
+require 'google/cloud/kms/v1'
 
 module SymmetricEncryption
   module Keystore
@@ -8,9 +8,9 @@ module SymmetricEncryption
       def self.generate_data_key(version: 0, cipher_name:, app_name:, environment:, key_path:)
         version >= 255 ? (version = 1) : (version += 1)
 
-        dek      = SymmetricEncryption::Key.new(cipher_name: cipher_name)
+        dek       = SymmetricEncryption::Key.new(cipher_name: cipher_name)
         file_name = "#{key_path}/#{app_name}_#{environment}_v#{version}.encrypted_key"
-        keystore = new(
+        keystore  = new(
           key_file:    file_name,
           app_name:    app_name,
           environment: environment
@@ -18,21 +18,21 @@ module SymmetricEncryption
         keystore.write(dek.key)
 
         {
-          keystore:         :gcp,
-          cipher_name:      dek.cipher_name,
-          version:          version,
-          key_file:         file_name,
-          iv:               dek.iv,
-          crypto_key:       keystore.crypto_key
+          keystore:    :gcp,
+          cipher_name: dek.cipher_name,
+          version:     version,
+          key_file:    file_name,
+          iv:          dek.iv,
+          crypto_key:  keystore.crypto_key
         }
       end
 
       def initialize(key_file:, app_name: nil, environment: nil, key_encrypting_key: nil, crypto_key: nil, project_id: nil, credentials: nil, location_id: nil)
-        @crypto_key = crypto_key
-        @app_name = app_name
+        @crypto_key  = crypto_key
+        @app_name    = app_name
         @environment = environment
-        @file_name = key_file
-        @project_id = project_id
+        @file_name   = key_file
+        @project_id  = project_id
         @credentials = credentials
         @location_id = location_id
       end
@@ -68,19 +68,21 @@ module SymmetricEncryption
       end
 
       def project_id
-        @project_id ||= ENV["GOOGLE_CLOUD_PROJECT"]
+        @project_id ||= ENV['GOOGLE_CLOUD_PROJECT']
         raise 'GOOGLE_CLOUD_PROJECT must be set' if @project_id.nil?
+
         @project_id
       end
 
       def credentials
         @credentials ||= ENV['GOOGLE_CLOUD_KEYFILE']
         raise 'GOOGLE_CLOUD_KEYFILE must be set' if @credentials.nil?
+
         @credentials
       end
 
       def location_id
-        @location_id ||= ENV["GOOGLE_CLOUD_LOCATION"] || 'global'
+        @location_id ||= ENV['GOOGLE_CLOUD_LOCATION'] || 'global'
       end
     end
   end

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, **args)
+      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/railtie.rb

@@ -29,7 +29,8 @@ module SymmetricEncryption #:nodoc:
     config.before_configuration do
       # Check if already configured
       unless ::SymmetricEncryption.cipher?
-        app_name    = Rails::Application.subclasses.first.parent.to_s.underscore
+        parent_method = Module.method_defined?(:module_parent) ? 'module_parent' : 'parent'
+        app_name    = Rails::Application.subclasses.first.send(parent_method).to_s.underscore
         env_var     = ENV['SYMMETRIC_ENCRYPTION_CONFIG']
         config_file =
           if env_var
@@ -41,11 +42,11 @@ module SymmetricEncryption #:nodoc:
         if config_file.file?
           begin
             ::SymmetricEncryption::Config.load!(file_name: config_file, env: ENV['SYMMETRIC_ENCRYPTION_ENV'] || Rails.env)
-          rescue ArgumentError => exc
+          rescue ArgumentError => e
             puts "\nSymmetric Encryption not able to read keys."
-            puts "#{exc.class.name} #{exc.message}"
+            puts "#{e.class.name} #{e.message}"
             puts "To generate a new config file and key files: symmetric-encryption --generate --app-name #{app_name}\n\n"
-            raise(exc)
+            raise(e)
           end
         end
 

data/lib/symmetric_encryption/symmetric_encryption.rb

@@ -301,5 +301,5 @@ module SymmetricEncryption
   @cipher            = nil
   @secondary_ciphers = []
   @select_cipher     = nil
-  @random_iv         = false
+  @randomize_iv      = false
 end

data/lib/symmetric_encryption/utils/aws.rb

@@ -98,8 +98,6 @@ module SymmetricEncryption
 
       private
 
-      attr_reader :client
-
       def whoami
         @whoami ||= `whoami`.strip
       rescue StandardError

data/lib/symmetric_encryption/utils/files.rb

@@ -31,7 +31,7 @@ module SymmetricEncryption
         key_path = ::File.dirname(file_name)
         ::FileUtils.mkdir_p(key_path) unless ::File.directory?(key_path)
         ::File.rename(file_name, "#{file_name}.#{Time.now.to_i}") if ::File.exist?(file_name)
-        ::File.open(file_name, 'wb', 0600) { |file| file.write(data) }
+        ::File.open(file_name, 'wb', 0o600) { |file| file.write(data) }
       end
 
       # Read from the file, raising an exception if it is not found

data/lib/symmetric_encryption/utils/re_encrypt_files.rb

@@ -117,8 +117,8 @@ module SymmetricEncryption
             begin
               count = re_encrypt_contents(file_name)
               puts "Re-encrypted #{count} encrypted value(s) in: #{file_name}" if count.positive?
-            rescue StandardError => exc
-              puts "Failed re-encrypting the file contents of: #{file_name}. #{exc.class.name}: #{exc.message}"
+            rescue StandardError => e
+              puts "Failed re-encrypting the file contents of: #{file_name}. #{e.class.name}: #{e.message}"
             end
           end
         end
@@ -127,7 +127,7 @@ module SymmetricEncryption
       private
 
       def regexp
-        @regexp ||= /#{SymmetricEncryption.cipher.encoded_magic_header}([A-Za-z0-9+\/]+[=\\n]*)/
+        @regexp ||= %r{#{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
-  VERSION = '4.3.0'.freeze
+  VERSION = '4.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible