symmetric-encryption 4.2.1 → 4.4.0

data/lib/symmetric_encryption/utils/re_encrypt_files.rb

@@ -55,26 +55,26 @@ module SymmetricEncryption
         lines              = File.read(file_name)
         hits, output_lines = re_encrypt_lines(lines)
 
-        File.open(file_name, 'wb') { |file| file.write(output_lines) } if hits.positive?
+        File.open(file_name, "wb") { |file| file.write(output_lines) } if hits.positive?
         hits
       end
 
       # Replaces instances of encrypted data within lines of text with re-encrypted values
       def re_encrypt_lines(lines)
         hits         = 0
-        output_lines = ''
+        output_lines = ""
         r            = regexp
         lines.each_line do |line|
           line.force_encoding(SymmetricEncryption::UTF8_ENCODING)
           output_lines <<
             if line.valid_encoding? && (result = line.match(r))
-              encrypted                        = result[0]
-              new_value                        = re_encrypt(encrypted)
-              if new_value != encrypted
+              encrypted = result[0]
+              new_value = re_encrypt(encrypted)
+              if new_value == encrypted
+                line
+              else
                 hits += 1
                 line.gsub(encrypted, new_value)
-              else
-                line
               end
             else
               line
@@ -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,13 +127,13 @@ 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.
       # Returns [nil] if the file is not encrypted or does not have a header.
       def encrypted_file_version(file_name)
-        ::File.open(file_name, 'rb') do |file|
+        ::File.open(file_name, "rb") do |file|
           reader = SymmetricEncryption::Reader.new(file)
           reader.version if reader.header_present?
         end

data/lib/symmetric_encryption/version.rb

@@ -1,3 +1,3 @@
 module SymmetricEncryption
-  VERSION = '4.2.1'.freeze
+  VERSION = "4.4.0".freeze
 end

data/lib/symmetric_encryption/writer.rb

@@ -1,4 +1,4 @@
-require 'openssl'
+require "openssl"
 
 module SymmetricEncryption
   # Write to encrypted files and other IO streams.
@@ -49,10 +49,10 @@ module SymmetricEncryption
     #  end
     def self.open(file_name_or_stream, compress: nil, **args)
       if file_name_or_stream.is_a?(String)
-        file_name_or_stream = ::File.open(file_name_or_stream, 'wb')
+        file_name_or_stream = ::File.open(file_name_or_stream, "wb")
         compress            = !(/\.(zip|gz|gzip|xls.|)\z/i === file_name_or_stream) if compress.nil?
-      else
-        compress = true if compress.nil?
+      elsif compress.nil?
+        compress = true
       end
 
       begin
@@ -97,15 +97,22 @@ module SymmetricEncryption
     def initialize(ios, version: nil, cipher_name: nil, header: true, random_key: true, random_iv: true, compress: false)
       # Compress is only used at this point for setting the flag in the header
       @ios = ios
-      raise(ArgumentError, 'When :random_key is true, :random_iv must also be true') if random_key && !random_iv
-      raise(ArgumentError, 'Cannot supply a :cipher_name unless both :random_key and :random_iv are true') if cipher_name && !random_key && !random_iv
+      raise(ArgumentError, "When :random_key is true, :random_iv must also be true") if random_key && !random_iv
+      if cipher_name && !random_key && !random_iv
+        raise(ArgumentError, "Cannot supply a :cipher_name unless both :random_key and :random_iv are true")
+      end
 
       # Cipher to encrypt the random_key, or the entire file
       cipher = SymmetricEncryption.cipher(version)
-      raise(SymmetricEncryption::CipherError, "Cipher with version:#{version} not found in any of the configured SymmetricEncryption ciphers") unless cipher
+      unless cipher
+        raise(SymmetricEncryption::CipherError,
+              "Cipher with version:#{version} not found in any of the configured SymmetricEncryption ciphers")
+      end
 
       # Force header if compressed or using random iv, key
-      header = Header.new(version: cipher.version, compress: compress, cipher_name: cipher_name) if (header == true) || compress || random_key || random_iv
+      if (header == true) || compress || random_key || random_iv
+        header = Header.new(version: cipher.version, compress: compress, cipher_name: cipher_name)
+      end
 
       @stream_cipher = ::OpenSSL::Cipher.new(cipher_name || cipher.cipher_name)
       @stream_cipher.encrypt
@@ -158,8 +165,8 @@ module SymmetricEncryption
       def write(data)
         return unless data
 
-        bytes   = data.to_s
-        @size  += bytes.size
+        bytes = data.to_s
+        @size += bytes.size
         partial = @stream_cipher.update(bytes)
         @ios.write(partial) unless partial.empty?
         data.length
@@ -168,9 +175,9 @@ module SymmetricEncryption
       def write(data)
         return unless data
 
-        bytes   = data.to_s
-        @size  += bytes.size
-        partial = @stream_cipher.update(bytes, @cipher_buffer ||= ''.b)
+        bytes = data.to_s
+        @size += bytes.size
+        partial = @stream_cipher.update(bytes, @cipher_buffer ||= "".b)
         @ios.write(partial) unless partial.empty?
         data.length
       end

data/lib/symmetric_encryption.rb

@@ -1,24 +1,28 @@
-require 'symmetric_encryption/core'
+require "symmetric_encryption/core"
 
 # Add extensions. Gems are no longer order dependent.
 begin
-  require 'rails'
-  require 'symmetric_encryption/railtie'
+  require "rails"
+  require "symmetric_encryption/railtie"
 rescue LoadError
 end
 
 begin
-  require 'active_support'
+  require "active_support"
   ActiveSupport.on_load(:active_record) do
-    require 'symmetric_encryption/railties/attr_encrypted'
-    require 'symmetric_encryption/railties/symmetric_encryption_validator'
+    require "symmetric_encryption/active_record/attr_encrypted"
+    require "symmetric_encryption/railties/symmetric_encryption_validator"
 
-    ActiveRecord::Base.include(SymmetricEncryption::Railties::AttrEncrypted)
+    if ActiveRecord.version >= Gem::Version.new("5.0.0")
+      ActiveRecord::Type.register(:encrypted, SymmetricEncryption::ActiveRecord::EncryptedAttribute)
+    end
+
+    ActiveRecord::Base.include(SymmetricEncryption::ActiveRecord::AttrEncrypted)
   end
 
   ActiveSupport.on_load(:mongoid) do
-    require 'symmetric_encryption/railties/mongoid_encrypted'
-    require 'symmetric_encryption/railties/symmetric_encryption_validator'
+    require "symmetric_encryption/railties/mongoid_encrypted"
+    require "symmetric_encryption/railties/symmetric_encryption_validator"
   end
 rescue LoadError
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Reid Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -24,9 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: 
+description:
 email:
-- reidmo@gmail.com
 executables:
 - symmetric-encryption
 extensions: []
@@ -38,6 +37,8 @@ files:
 - bin/symmetric-encryption
 - lib/symmetric-encryption.rb
 - lib/symmetric_encryption.rb
+- lib/symmetric_encryption/active_record/attr_encrypted.rb
+- lib/symmetric_encryption/active_record/encrypted_attribute.rb
 - lib/symmetric_encryption/cipher.rb
 - lib/symmetric_encryption/cli.rb
 - lib/symmetric_encryption/coerce.rb
@@ -56,7 +57,6 @@ files:
 - lib/symmetric_encryption/keystore/heroku.rb
 - lib/symmetric_encryption/keystore/memory.rb
 - lib/symmetric_encryption/railtie.rb
-- lib/symmetric_encryption/railties/attr_encrypted.rb
 - lib/symmetric_encryption/railties/mongoid_encrypted.rb
 - lib/symmetric_encryption/railties/symmetric_encryption_validator.rb
 - lib/symmetric_encryption/reader.rb
@@ -67,11 +67,11 @@ files:
 - lib/symmetric_encryption/utils/re_encrypt_files.rb
 - lib/symmetric_encryption/version.rb
 - lib/symmetric_encryption/writer.rb
-homepage: http://rocketjob.github.io/symmetric-encryption/
+homepage: https://encryption.rocketjob.io
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Encrypt ActiveRecord and Mongoid attributes, files and passwords in configuration
   files.