symmetric-encryption 4.3.1 → 4.3.2

data/lib/symmetric_encryption/utils/files.rb

@@ -6,7 +6,7 @@ module SymmetricEncryption
       attr_reader :file_name
 
       def read_file_and_decode(file_name)
-        raise(SymmetricEncryption::ConfigError, 'file_name is mandatory for each key_file entry') unless file_name
+        raise(SymmetricEncryption::ConfigError, "file_name is mandatory for each key_file entry") unless file_name
 
         raise(SymmetricEncryption::ConfigError, "File #{file_name} could not be found") unless ::File.exist?(file_name)
 
@@ -31,12 +31,12 @@ 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', 0o600) { |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
       def read_from_file(file_name)
-        ::File.open(file_name, 'rb', &:read)
+        ::File.open(file_name, "rb", &:read)
       rescue Errno::ENOENT
         raise(SymmetricEncryption::ConfigError, "Symmetric Encryption key file: '#{file_name}' not found or readable")
       end

data/lib/symmetric_encryption/utils/re_encrypt_files.rb

@@ -55,21 +55,21 @@ 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)
+              encrypted = result[0]
+              new_value = re_encrypt(encrypted)
               if new_value != encrypted
                 hits += 1
                 line.gsub(encrypted, new_value)
@@ -133,7 +133,7 @@ module SymmetricEncryption
       # 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.3.1'.freeze
+  VERSION = "4.3.2".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,7 +49,7 @@ 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?
@@ -97,15 +97,21 @@ 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 +164,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 +174,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Encrypt ActiveRecord and Mongoid attributes, files and passwords in configuration