spaux 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466f15ee386ce8a4828c78c2ddd79d237abba028
-  data.tar.gz: 33f63a81f23e5b16a956be021578a8cf104d044a
+  metadata.gz: 25b35334b5af6f97d6fdf422c36fba87ab5cf4c3
+  data.tar.gz: 5d3a2f29f7c8a7501df38f6233020db1506cc4aa
 SHA512:
-  metadata.gz: 490e90f25221c3c7e3d36527ecc7a92b542253912aafa2958d09fab7a4d568f326032101f00fb9c83387e4ec890257bec5888c6fb4a49c4c92a8f2258ac8f0df
-  data.tar.gz: c73694ab180b60e7f51f367e3004b4057345aafc5500471e2ec721810d4d830d8ec73b5d89086f2654fb9e7825914719a3d767390419227c254bae4a1bd754eb
+  metadata.gz: c907c4687140a18a489c8ddd1152d6d792f49c0f25975a765bfe189e64fb201de41eb0d8ea1a4d488622217dbb93da7fd323108a5060c28d435b7867dcd3a100
+  data.tar.gz: 2fe8afcdcdc69b3b13d6e5943cf84768edb376be38dd33f44e901ca0c5a7c9ce3e7754b0f0e9e933f92ea7ff0971bff9c8bdf5cc21d97a851eef3ee8c288ce5c

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in spaux.gemspec
 gemspec
-
-# https://github.com/opscode/chef-provisioning/issues/241
-gem 'chef-provisioning', :github => 'nomadium/chef-provisioning',
-  :branch => 'feature/set-no-lazy-load-true-in-chef-config'

data/lib/spaux/chef/key.rb

@@ -1,5 +1,7 @@
 require 'octokit'
 require 'net/ssh'
+require 'yaml'
+require 'rbnacl'
 
 class Spaux
   class Chef
@@ -22,44 +24,49 @@ class Spaux
         configuration = eval(::File.read(config_file))
       end
       def get_raw_key
-        key_filename = 'encrypted.rb'
-        key_file = ::File.join(@work_dir, key_filename)
+        msg_filename = 'message.yml'
+        msg_file = ::File.join(@work_dir, msg_filename)
 
-        if !::File.exists?(key_file)
-          key = retrieve_key_from_gist(@config[:chef_private_key_gist_id])
+        if !::File.exists?(msg_file)
+          msg = retrieve_msg_from_gist(@config[:chef_private_key_gist_id])
           begin
-            ::File.write(key_file, key)
+            ::IO.write(msg_file, msg)
           rescue Exception => e
             puts e.message
           end
         else
-          key = ::File.read(key_file)
+          msg = ::IO.read(msg_file)
         end
 
-        key_hash = eval(key)
-        raw_key = decrypt_key(key_hash, @config[:private_key])
+        message = YAML.safe_load(msg)
+        key = decrypt_message(message, @config[:private_key])
       end
 
-      def retrieve_key_from_gist(gist)
+      def retrieve_msg_from_gist(gist_id)
         client = Octokit::Client.new
-        key_gist = client.gist(gist)
-        key_filename = key_gist[:files].fields.first
-        key_resource = key_gist[:files][key_filename]
-        key_data = key_resource[:content]
+        gist = client.gist(gist_id)
+        filename = gist[:files].fields.first
+        resource = gist[:files][filename]
+        data = resource[:content]
       end
 
-      def decrypt_key(key_data, rsa_key_filename)
+      def decrypt_message(message, rsa_key_filename)
         rsa_key = Net::SSH::KeyFactory.load_private_key(rsa_key_filename)
-        iv = Base64.decode64(key_data[:iv])
-        sym_key = Base64.decode64(key_data[:key])
-        data = Base64.decode64(key_data[:data])
+        recipients = message['recipients']
+        box_key = nil
 
-        decipher = OpenSSL::Cipher::AES.new(@config[:aes_key_size],
-                                            @config[:aes_cipher_mode])
-        decipher.decrypt
-        decipher.iv = rsa_key.private_decrypt(iv)
-        decipher.key = rsa_key.private_decrypt(sym_key)
-        key = decipher.update(data) + decipher.final
+        recipients.each do |r|
+          begin
+            box_key = rsa_key.private_decrypt(Base64.decode64(r))
+          rescue OpenSSL::PKey::RSAError => e
+            next if e.message.eql?('padding check failed')
+          end
+        end
+
+        raise ArgumentError, 'Unable to decrypt message!' if box_key.nil?
+
+        box = ::RbNaCl::SimpleBox.from_secret_key(box_key)
+        clear_message = box.decrypt(Base64.decode64(message['data']))
       end
     end
   end

data/lib/spaux/chef/knife.rb

@@ -6,32 +6,21 @@ class Spaux
   class Chef
     class Knife < ::Chef::Application::Knife
 
-      DEFAULT_KNIFE_CONFIG = {
-        config_file: {
-          flags: %w(--config -c),
-          value: ::File.join('@work_dir', 'knife.rb')
-        }
-      }
-
       attr_accessor :work_dir
       attr_accessor :args
 
       def initialize(work_dir, args)
         @work_dir = work_dir
         @args = args
+        @extra_options = {}
+        @extra_options[:config_file] = ::File.join(@work_dir, 'knife.rb')
 
-        DEFAULT_KNIFE_CONFIG.each do |_,v|
-          v[:value].is_a?(String) && v[:value].gsub!(/@work_dir/, @work_dir)
-        end
-
-        cf_flags = DEFAULT_KNIFE_CONFIG[:config_file][:flags]
-        unless @args.include?(cf_flags.first) || @args.include?(cf_flags.last)
-          @args << DEFAULT_KNIFE_CONFIG[:config_file][:flags].first
-          @args << DEFAULT_KNIFE_CONFIG[:config_file][:value]
-        end
+        raw_key = Spaux::Chef::Key.new.raw_key
+        redefine_chef_http_authenticator raw_key
 
-        config_file = DEFAULT_KNIFE_CONFIG[:config_file][:value]
-        FileUtils.touch config_file
+        # to avoid warnings about missing configuration
+        @args << '--config' << '/dev/null'
+        FileUtils.touch @extra_options[:config_file]
       end
 
       def run
@@ -42,11 +31,20 @@ class Spaux
         knife = ::Chef::Application::Knife.new
         options = knife.options
         begin
-          ::Chef::Knife.run(@args, options)
+          ::Chef::Knife.run(@args, options, @extra_options)
         rescue SystemExit => e
           # just ignore the exit of knife tool
         end
       end
+
+      private
+      def redefine_chef_http_authenticator(key)
+        ::Chef::HTTP::Authenticator.send(:define_method,
+          'load_signing_key') do |signing_key_filename, raw_key|
+          @raw_key = key
+          @key = OpenSSL::PKey::RSA.new(@raw_key)
+        end
+      end
     end
   end
 end

data/lib/spaux/chef/monkey_patches/knife.rb

@@ -1,9 +1,12 @@
 class Chef
   class Knife
-   def configure_spaux
-     config.merge!(Spaux::default_chef_config(:knife))
+   def configure_spaux(extra_config)
+     config_file = extra_config[:config_file]
+     default_config = Spaux::default_chef_config(:knife)
+     Chef::Config.merge! default_config.merge(extra_config)
+     Chef::Config.from_file config_file
    end
-   def self.run(args, options={})
+   def self.run(args, options={}, extra_settings={})
       # Fallback debug logging. Normally the logger isn't configured until we
       # read the config, but this means any logging that happens before the
       # config file is read may be lost. If the KNIFE_DEBUG variable is set, we
@@ -19,7 +22,7 @@ class Chef
       subcommand_class.options = options.merge!(subcommand_class.options)
       subcommand_class.load_deps
       instance = subcommand_class.new(args)
-      instance.configure_spaux
+      instance.configure_spaux(extra_settings)
       instance.configure_chef
       instance.run_with_pretty_exceptions
     end

data/lib/spaux/config.rb

@@ -1,6 +1,4 @@
 {
   chef_private_key_gist_id: '16b65a73953427ce9c40',
-  private_key:              '~/.ssh/id_rsa',
-  aes_key_size:             256,
-  aes_cipher_mode:          :CBC
+  private_key:              '~/.ssh/id_rsa'
 }

data/lib/spaux/version.rb

@@ -1,3 +1,3 @@
 class Spaux
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spaux.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "chef", '>= 12.0.0.rc.0'
   spec.add_dependency "octokit", '~> 3.5.2'
   spec.add_dependency "net-ssh", '~> 2.9.1'
-  spec.add_dependency 'chef-provisioning', '~> 0.16.1'
+  spec.add_dependency 'chef-provisioning', '~> 0.16'
   spec.add_dependency 'chef-provisioning-fog', '~> 0.11'
   spec.add_dependency 'chef-vault', '~> 2.3.0'
+  spec.add_dependency 'rbnacl', '~> 3.1.2'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaux
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Miguel Landaeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: chef-provisioning-fog
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Spaux automation tasks