chamber 2.8.0 → 2.9.0

data/lib/chamber/filters/encryption_filter.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
 require 'openssl'
 require 'base64'
 require 'hashie/mash'
 require 'yaml'
+require 'chamber/encryption_methods/public_key'
+require 'chamber/encryption_methods/ssl'
+require 'chamber/encryption_methods/none'
 
 module    Chamber
 module    Filters
 class     EncryptionFilter
-  SECURE_KEY_TOKEN      = /\A_secure_/
-  BASE64_STRING_PATTERN = %r{\A[A-Za-z0-9\+\/]{342}==\z}
+  SECURE_KEY_TOKEN          = /\A_secure_/
+  BASE64_STRING_PATTERN     = %r{\A[A-Za-z0-9\+\/]{342}==\z}
+  LARGE_DATA_STRING_PATTERN = %r{\A([A-Za-z0-9\+\/#]*\={0,2})#([A-Za-z0-9\+\/#]*\={0,2})#([A-Za-z0-9\+\/#]*\={0,2})\z} # rubocop:disable Metrics/LineLength
 
   def initialize(options = {})
     self.encryption_key = options.fetch(:encryption_key, nil)
@@ -15,7 +20,7 @@ class     EncryptionFilter
   end
 
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected
@@ -27,17 +32,13 @@ class     EncryptionFilter
     settings = Hashie::Mash.new
 
     raw_data.each_pair do |key, value|
-      if value.respond_to? :each_pair
-        value = execute(value)
-      elsif key.match(SECURE_KEY_TOKEN)
-        unless value.respond_to?(:match) && value.match(BASE64_STRING_PATTERN)
-          serialized_value = YAML.dump(value)
-          encrypted_string = encryption_key.public_encrypt(serialized_value)
-          value            = Base64.strict_encode64(encrypted_string)
-        end
-      end
-
-      settings[key] = value
+      settings[key] = if value.respond_to? :each_pair
+                        execute(value)
+                      elsif key.match(SECURE_KEY_TOKEN)
+                        encryption_method(value).encrypt(key, value, encryption_key)
+                      else
+                        value
+                      end
     end
 
     settings
@@ -54,6 +55,20 @@ class     EncryptionFilter
 
     @encryption_key = OpenSSL::PKey::RSA.new(key_content)
   end
+
+  def encryption_method(value)
+    if value.respond_to?(:match) && value.match(BASE64_STRING_PATTERN)
+      EncryptionMethods::None
+    else
+      serialized_value = YAML.dump(value)
+
+      if serialized_value.length <= 128
+        EncryptionMethods::PublicKey
+      else
+        EncryptionMethods::Ssl
+      end
+    end
+  end
 end
 end
 end

data/lib/chamber/filters/environment_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chamber/environmentable'
 
 module  Chamber
@@ -54,7 +55,7 @@ class   EnvironmentFilter
   #
   #
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected

data/lib/chamber/filters/failed_decryption_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chamber/errors/decryption_failure'
 
 module  Chamber
@@ -11,7 +12,7 @@ class   FailedDecryptionFilter
   end
 
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected
@@ -30,7 +31,7 @@ class   FailedDecryptionFilter
 
         fail Chamber::Errors::DecryptionFailure,
              "Failed to decrypt #{key} (with an encrypted value of '#{value}') " \
-             'in your settings.'
+             "in your settings."
       end
     end
 

data/lib/chamber/filters/insecure_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hashie/mash'
 require 'chamber/filters/secure_filter'
 

data/lib/chamber/filters/namespace_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hashie/mash'
 
 module  Chamber
@@ -9,7 +10,7 @@ class   NamespaceFilter
   end
 
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected

data/lib/chamber/filters/secure_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hashie/mash'
 
 module  Chamber
@@ -10,7 +11,7 @@ class   SecureFilter
   end
 
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected

data/lib/chamber/filters/translate_secure_keys_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hashie/mash'
 
 module  Chamber
@@ -10,7 +11,7 @@ class   TranslateSecureKeysFilter
   end
 
   def self.execute(options = {})
-    new(options).send(:execute)
+    new(options).__send__(:execute)
   end
 
   protected

data/lib/chamber/instance.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'chamber/configuration'
 require 'chamber/file_set'
 

data/lib/chamber/namespace_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 
 ###
@@ -83,7 +84,7 @@ class   NamespaceSet
     namespaces.to_a
   end
 
-  alias_method :to_a, :to_ary
+  alias to_a to_ary
 
   ###
   # Internal: Determines whether a NamespaceSet is equal to another array-like
@@ -102,8 +103,8 @@ class   NamespaceSet
   # Returns a Boolean
   #
   def eql?(other)
-    other.is_a?(NamespaceSet)  &&
-    namespaces  == other.namespaces
+    other.is_a?(NamespaceSet) &&
+    namespaces == other.namespaces
   end
 
   protected

data/lib/chamber/rails.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'chamber/rails/railtie' if defined?(::Rails)

data/lib/chamber/rails/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'socket'
 
 module  Chamber
@@ -7,7 +8,8 @@ class   Railtie < ::Rails::Railtie
     Chamber.load(basepath:   ::Rails.root.join('config'),
                  namespaces: {
                    environment: -> { ::Rails.env },
-                   hostname:    -> { Socket.gethostname } })
+                   hostname:    -> { Socket.gethostname },
+                 })
   end
 end
 end

data/lib/chamber/rubinius_fix.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 unless Pathname.instance_methods.include?(:write)

data/lib/chamber/settings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hashie/mash'
 require 'chamber/namespace_set'
 require 'chamber/filters/namespace_filter'
@@ -22,16 +23,16 @@ class   Settings
     self.raw_data         = options[:settings]        ||  {}
     self.decryption_key   = options[:decryption_key]
     self.encryption_key   = options[:encryption_key]
-    self.pre_filters      = options[:pre_filters]     ||  [
-      Filters::NamespaceFilter,
-    ]
-    self.post_filters     = options[:post_filters]    ||  [
-      Filters::DecryptionFilter,
-      Filters::EnvironmentFilter,
-      Filters::FailedDecryptionFilter,
-      Filters::BooleanConversionFilter,
-      Filters::TranslateSecureKeysFilter,
-    ]
+    self.pre_filters  = options[:pre_filters]  || [
+                                                    Filters::NamespaceFilter,
+                                                  ]
+    self.post_filters = options[:post_filters] || [
+                                                    Filters::DecryptionFilter,
+                                                    Filters::EnvironmentFilter,
+                                                    Filters::FailedDecryptionFilter,
+                                                    Filters::BooleanConversionFilter,
+                                                    Filters::TranslateSecureKeysFilter,
+                                                  ]
   end
 
   ###
@@ -186,7 +187,8 @@ class   Settings
       encryption_key: encryption_key || other_settings.encryption_key,
       decryption_key: decryption_key || other_settings.decryption_key,
       namespaces:     (namespaces + other_settings.namespaces),
-      settings:       raw_data.merge(other_settings.raw_data))
+      settings:       raw_data.merge(other_settings.raw_data),
+    )
   end
 
   ###
@@ -205,29 +207,32 @@ class   Settings
   # Returns a Boolean
   #
   def eql?(other)
-    other.is_a?(Chamber::Settings)  &&
-    data        == other.data          &&
+    other.is_a?(Chamber::Settings) &&
+    data        == other.data &&
     namespaces  == other.namespaces
   end
 
   def securable
     Settings.new(metadata.merge(
                     settings:    raw_data,
-                    pre_filters: [Filters::SecureFilter]))
+                    pre_filters: [Filters::SecureFilter],
+    ))
   end
 
   def secure
     Settings.new(metadata.merge(
                     settings:     raw_data,
                     pre_filters:  [Filters::EncryptionFilter],
-                    post_filters: [Filters::TranslateSecureKeysFilter]))
+                    post_filters: [Filters::TranslateSecureKeysFilter],
+    ))
   end
 
   def insecure
     Settings.new(metadata.merge(
                     settings:     raw_data,
                     pre_filters:  [Filters::InsecureFilter],
-                    post_filters: [Filters::TranslateSecureKeysFilter]))
+                    post_filters: [Filters::TranslateSecureKeysFilter],
+    ))
   end
 
   protected
@@ -247,14 +252,14 @@ class   Settings
   end
 
   def raw_data
-    @filtered_raw_data ||= pre_filters.reduce(@raw_data) do |filtered_data, filter|
+    @filtered_raw_data ||= pre_filters.inject(@raw_data) do |filtered_data, filter|
       filter.execute({ data: filtered_data }.
                      merge(metadata))
     end
   end
 
   def data
-    @data ||= post_filters.reduce(raw_data) do |filtered_data, filter|
+    @data ||= post_filters.inject(raw_data) do |filtered_data, filter|
       filter.execute({ data: filtered_data }.
                      merge(metadata))
     end

data/lib/chamber/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Chamber
-  VERSION = '2.8.0'
+  VERSION = '2.9.0'.freeze
 end

data/spec/lib/chamber/commands/files_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/files'
 
@@ -6,8 +7,10 @@ module    Commands
 describe  Files do
   let(:rootpath) { ::File.expand_path('./spec/fixtures') }
   let(:options)  do
-    {  basepath: rootpath,
-       rootpath: rootpath }
+    {
+      basepath: rootpath,
+      rootpath: rootpath,
+    }
   end
 
   it 'can return values formatted as environment variables' do

data/spec/lib/chamber/commands/heroku/clear_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/heroku/clear'
 

data/spec/lib/chamber/commands/heroku/compare_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/heroku/compare'
 

data/spec/lib/chamber/commands/heroku/pull_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/heroku/pull'
 

data/spec/lib/chamber/commands/heroku/push_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/heroku/push'
 

data/spec/lib/chamber/commands/secure_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/secure'
 require 'fileutils'
@@ -9,10 +10,12 @@ describe  Secure do
   let(:settings_directory) { rootpath + 'settings' }
   let(:settings_filename)  { settings_directory + 'unencrypted.yml' }
   let(:options)            do
-    { basepath:       rootpath,
+    {
+      basepath:       rootpath,
       rootpath:       rootpath,
       encryption_key: rootpath + '../spec_key',
-      shell:          double.as_null_object }
+      shell:          double.as_null_object,
+    }
   end
 
   before(:each) do

data/spec/lib/chamber/commands/show_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/commands/show'
 

data/spec/lib/chamber/context_resolver_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/context_resolver'
 
@@ -34,7 +35,7 @@ describe  ContextResolver do
     options = ContextResolver.resolve(rootpath:   './app',
                                       namespaces: 'ns')
 
-    expect(options[:basepath].to_s).to  eql './app'
+    expect(options[:basepath].to_s).to eql './app'
   end
 
   it 'always sets the basepath to a Pathname even if it is passed in as a String' do
@@ -46,8 +47,10 @@ describe  ContextResolver do
   it 'sets the default files if none are passed in' do
     options = ContextResolver.resolve(basepath: './app')
 
-    expect(options[:files].map(&:to_s)).to eql ['./app/settings*.yml',
-                                                './app/settings']
+    expect(options[:files].map(&:to_s)).to eql [
+                                                 './app/settings*.yml',
+                                                 './app/settings',
+                                               ]
   end
 
   it 'can handle if keys are passed as strings' do
@@ -64,13 +67,13 @@ describe  ContextResolver do
 
     options = ContextResolver.resolve
 
-    expect(options[:rootpath].to_s).to  eql 'my_dir'
+    expect(options[:rootpath].to_s).to eql 'my_dir'
   end
 
   it 'sets the encryption key to the default if not passed in' do
     options = ContextResolver.resolve(rootpath: rails_3_path)
 
-    expect(options[:encryption_key].to_s).to  include 'rails-3-test/.chamber.pub.pem'
+    expect(options[:encryption_key].to_s).to include 'rails-3-test/.chamber.pub.pem'
   end
 
   it 'sets the decryption key to the default if not passed in' do

data/spec/lib/chamber/file_set_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rspectacular'
 require 'chamber/file_set'
 require 'fileutils'
@@ -16,10 +17,10 @@ describe  FileSet do
 
     file_set = FileSet.new files: '/tmp/settings'
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings/another_settings_file.yml',
-      '/tmp/settings/some_settings_file.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings/another_settings_file.yml',
+                                        '/tmp/settings/some_settings_file.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings')
   end
@@ -30,10 +31,10 @@ describe  FileSet do
 
     file_set = FileSet.new files: '/tmp/settings/*.yml'
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings/another_settings_file.yml',
-      '/tmp/settings/some_settings_file.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings/another_settings_file.yml',
+                                        '/tmp/settings/some_settings_file.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings')
   end
@@ -44,10 +45,10 @@ describe  FileSet do
 
     file_set = FileSet.new files: '/tmp/settings'
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings/another_settings_file.yml.erb',
-      '/tmp/settings/some_settings_file.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings/another_settings_file.yml.erb',
+                                        '/tmp/settings/some_settings_file.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings')
   end
@@ -59,8 +60,8 @@ describe  FileSet do
                            namespaces: ['blue']
 
     expect(file_set.filenames).to eql [
-      '/tmp/settings/settings-blue.yml',
-    ]
+                                        '/tmp/settings/settings-blue.yml',
+                                      ]
 
     ::FileUtils.rm_f('/tmp/settings/settings-blue.yml')
   end
@@ -85,8 +86,8 @@ describe  FileSet do
                            namespaces: ['blue']
 
     expect(file_set.filenames).to eql [
-      '/tmp/dash-set/settings.yml',
-    ]
+                                        '/tmp/dash-set/settings.yml',
+                                      ]
 
     ::FileUtils.rm_r('/tmp/dash-set/settings.yml')
   end
@@ -95,13 +96,13 @@ describe  FileSet do
     ::File.new('/tmp/settings.yml', 'w+')
 
     file_set = FileSet.new files: [
-      '/tmp/settings.yml',
-      '/tmp/settings.yml',
-    ]
+                                    '/tmp/settings.yml',
+                                    '/tmp/settings.yml',
+                                  ]
 
     expect(file_set.filenames).to eql [
-      '/tmp/settings.yml',
-    ]
+                                        '/tmp/settings.yml',
+                                      ]
 
     ::FileUtils.rm_f('/tmp/settings.yml')
   end
@@ -111,14 +112,14 @@ describe  FileSet do
     ::File.new('/tmp/settings/new_file.yml', 'w+')
 
     file_set = FileSet.new files: [
-      '/tmp/settings.yml',
-      '/tmp/settings/*.yml',
-    ]
+                                    '/tmp/settings.yml',
+                                    '/tmp/settings/*.yml',
+                                  ]
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings.yml',
-      '/tmp/settings/new_file.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings.yml',
+                                        '/tmp/settings/new_file.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings*')
   end
@@ -128,9 +129,9 @@ describe  FileSet do
 
     file_set = FileSet.new files: '/tmp/settings.yml'
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings*')
   end
@@ -143,17 +144,17 @@ describe  FileSet do
                            namespaces: %w{blue green}
 
     expect(file_set.filenames).to eql  [
-      '/tmp/settings/settings-blue.yml',
-      '/tmp/settings/settings-green.yml',
-    ]
+                                         '/tmp/settings/settings-blue.yml',
+                                         '/tmp/settings/settings-green.yml',
+                                       ]
 
     file_set = FileSet.new files:      '/tmp/settings/settings*.yml',
                            namespaces: %w{green blue}
 
     expect(file_set.filenames).to eql  [
-      '/tmp/settings/settings-green.yml',
-      '/tmp/settings/settings-blue.yml',
-    ]
+                                         '/tmp/settings/settings-green.yml',
+                                         '/tmp/settings/settings-blue.yml',
+                                       ]
 
     ::FileUtils.rm_f('/tmp/settings/settings*.yml')
   end
@@ -166,9 +167,9 @@ describe  FileSet do
                            namespaces: ['blue']
 
     expect(file_set.filenames).to eql  [
-      '/tmp/settings.yml',
-      '/tmp/settings-blue.yml',
-    ]
+                                         '/tmp/settings.yml',
+                                         '/tmp/settings-blue.yml',
+                                       ]
 
     ::FileUtils.rm_f('/tmp/settings*.yml')
   end
@@ -181,9 +182,9 @@ describe  FileSet do
                            namespaces: ['blue']
 
     expect(file_set.filenames).to eql  [
-      '/tmp/settings.yml',
-      '/tmp/settings-blue.yml',
-    ]
+                                         '/tmp/settings.yml',
+                                         '/tmp/settings-blue.yml',
+                                       ]
 
     ::FileUtils.rm_f('/tmp/settings*.yml')
   end
@@ -194,14 +195,16 @@ describe  FileSet do
     ::File.new('/tmp/settings/credentials-development.yml', 'w+')
     ::File.new('/tmp/settings/settings.yml', 'w+')
 
-    file_set = FileSet.new files:      ['/tmp/settings/credentials*.yml',
-                                        '/tmp/settings/settings*.yml'],
+    file_set = FileSet.new files:      [
+                                         '/tmp/settings/credentials*.yml',
+                                         '/tmp/settings/settings*.yml',
+                                       ],
                            namespaces: ['development']
 
     expect(file_set.filenames).to eql [
-      '/tmp/settings/credentials-development.yml',
-      '/tmp/settings/settings.yml',
-    ]
+                                        '/tmp/settings/credentials-development.yml',
+                                        '/tmp/settings/settings.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings')
   end
@@ -212,10 +215,10 @@ describe  FileSet do
 
     file_set = FileSet.new files: '/tmp/settings/*.yml'
 
-    expect(file_set.filenames).to eql  [
-      '/tmp/settings/another_settings_file.yml',
-      '/tmp/settings/some_settings_file.yml',
-    ]
+    expect(file_set.filenames).to eql [
+                                        '/tmp/settings/another_settings_file.yml',
+                                        '/tmp/settings/some_settings_file.yml',
+                                      ]
 
     ::FileUtils.rm_rf('/tmp/settings')
   end