knife-bastion 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a201e08855df9b35ea48ed9cc65c177ca07dd1
-  data.tar.gz: 847d377d8e45f2ac6bde7b605959016f0c0753fb
+  metadata.gz: 1b24716fc37c04b006176389326e4ec86c082c96
+  data.tar.gz: a5846efa9fdc348f6362ce22bcedc8a225509c4d
 SHA512:
-  metadata.gz: 4ce9362c97eb7d2797f7bdf338e68c6f0be78893ae1b262f25439cb48c19e47238674f3417b2c8cfd9597d43e14f934bf8a0b6bcbe9017a3461aa0bfcb3e7d2a
-  data.tar.gz: 5caf485251fefc458c98f0ce7cb77e5605d5e491e0d3e637c6057907d3f64c74ac9a52d52b4b7e0906e052e72abbf2971de6d38bde76e18bcad113f8cc0b6c82
+  metadata.gz: cd0ba2173642ef7a4d657a3526a5ed68d6106f572868c6e5e882071a4f9ea07b427b07fa54b3e52c0439642e63cbe607746d1587a35861a51e9d576260232ef3
+  data.tar.gz: a497fc9cd48866a20663ff1e097ef04857c5add9936c212e509869c428cd804dcbec61ae71c4c098585c0c79298a469a063edc2311124c6170e705999f0c86bc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0 (Development)
+
+Features:
+  - Berkshelf now supports bastion (`berks upload`)
+
 ## 1.1.1 (September 27, 2016)
 
 Bugfixes:

data/lib/knife-bastion/activate.rb

@@ -1,4 +1,9 @@
-# Only activate socks proxy for Knife
+# Activate socks proxy for Knife
 if defined?(Chef::Application::Knife)
   require_relative 'chef_socks_proxy'
 end
+
+# Activate socks proxy for Berkshelf
+if defined?(Berkshelf)
+  require_relative 'berkshelf_socks_proxy'
+end

data/lib/knife-bastion/base_socks_proxy.rb

@@ -0,0 +1,10 @@
+require_relative 'client_proxy'
+
+# Load socksify gem, required to make Chef work with SOCKS proxy
+begin
+  require 'socksify'
+rescue LoadError
+  puts HighLine.color("FATAL:", [:bold, :red]) + " Failed to load #{HighLine.color("socksify", [:bold, :magenta])} gem. Please run #{HighLine.color("bundle install", [:bold, :magenta])} to continue"
+  # Hard exit to skip Chef exception reporting
+  exit! 1
+end

data/lib/knife-bastion/berkshelf_socks_proxy.rb

@@ -0,0 +1,18 @@
+require_relative 'base_socks_proxy'
+
+# Override `ridley_connection` method in `Berkshelf` to enable Socks proxy
+# for the connection.
+Berkshelf.module_eval do
+  class << self
+    alias_method :ridley_connection_without_bastion, :ridley_connection
+
+    def ridley_connection(*args, &block)
+      options = {
+        local_port: ::ChefConfig::Config[:knife][:bastion_local_port],
+        server_type: 'Chef',
+      }
+      proxy = ::KnifeBastion::ClientProxy.new(Berkshelf, options)
+      proxy.ridley_connection_without_bastion(*args, &block)
+    end
+  end
+end

data/lib/knife-bastion/chef_socks_proxy.rb

@@ -1,13 +1,4 @@
-require_relative 'client_proxy'
-
-# Load socksify gem, required to make Chef work with SOCKS proxy
-begin
-  require 'socksify'
-rescue LoadError
-  puts HighLine.color("FATAL:", [:bold, :red]) + " Failed to load #{HighLine.color("socksify", [:bold, :magenta])} gem. Please run #{HighLine.color("bundle install", [:bold, :magenta])} to continue"
-  # Hard exit to skip Chef exception reporting
-  exit! 1
-end
+require_relative 'base_socks_proxy'
 
 # Override `http_client` method in `Chef::HTTP` to return proxy object instead
 # of normal client object.
@@ -21,12 +12,7 @@ Chef::HTTP.class_eval do
     client = http_client_without_bastion(*args)
     options = {
       local_port: ::Chef::Config[:knife][:bastion_local_port],
-      error_handler: -> (_) {
-        puts ::HighLine.color("WARNING:", [:bold, :red]) + " Failed to contact Chef server!"
-        puts "You might need to start bastion connection with #{::HighLine.color("knife bastion start", [:bold, :magenta])} to access Chef."
-        puts
-        raise
-      }
+      server_type: 'Chef',
     }
     KnifeBastion::ClientProxy.new(client, options)
   end

data/lib/knife-bastion/client_proxy.rb

@@ -15,7 +15,8 @@ module KnifeBastion
       ::Errno::ECONNREFUSED,
       ::Timeout::Error,
       ::OpenSSL::SSL::SSLError,
-    ].freeze
+      defined?(::Berkshelf::ChefConnectionError) ? ::Berkshelf::ChefConnectionError : nil,
+    ].compact.freeze
 
     # Initializes an instance of the generic client proxy which sends all the
     #   network traffic through the SOCKS proxy.
@@ -31,9 +32,14 @@ module KnifeBastion
       @client = client
 
       @local_port = options[:local_port] || 4443
+
+      server_type = ::HighLine.color("#{options[:server_type]} ", [:bold, :cyan]) if options[:server_type]
       @network_errors_handler = options[:error_handler] || -> (_) {
-        ::Kernel.puts ::HighLine.color("WARNING:", [:bold, :red]) + " Failed to contact server!"
+        ::Kernel.puts
+        ::Kernel.puts '-' * 80
+        ::Kernel.puts ::HighLine.color("WARNING:", [:bold, :red]) + " Failed to contact #{server_type}server!"
         ::Kernel.puts "You might need to start bastion connection with #{::HighLine.color("knife bastion start", [:bold, :magenta])} to access server."
+        ::Kernel.puts '-' * 80
         ::Kernel.puts
         ::Kernel.raise
       }

data/lib/knife-bastion/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Bastion
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-bastion
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmytro Shteflyuk
@@ -30,7 +30,7 @@ cert_chain:
   DHSQkPQADqf52XlDQ7I6fBAn6E2bH38Wvwpu593AvE02KRKqaK8XEtBBldE4d/It
   2ysZ/sPJras9LFb2MpjJNRCdXr3z2ed6QwuLnsyEfuk=
   -----END CERTIFICATE-----
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -125,6 +125,8 @@ files:
 - lib/chef/knife/bastion_status.rb
 - lib/chef/knife/bastion_stop.rb
 - lib/knife-bastion/activate.rb
+- lib/knife-bastion/base_socks_proxy.rb
+- lib/knife-bastion/berkshelf_socks_proxy.rb
 - lib/knife-bastion/chef_socks_proxy.rb
 - lib/knife-bastion/client_proxy.rb
 - lib/knife-bastion/version.rb
@@ -148,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Access Chef securely via bastion server.

metadata.gz.sig

@@ -1 +1,2 @@
-��N�6���~[�R�k��rʕ���B��>�NS*8�����l7���������,��,������Җr�W���d�X�1~�CGhy�FN��W~��NF��=l/K�!i�.kߖ��@��Qc*ʝ����.8�	�QMw�ۨiҜG?��@Ɵ�4!�WEh�l��(d�h`�o��sL��A(%�ga!P��V'2�Yy�=nKT@��v�ç��Τ��ivm�F!U���Ԕ���r��S?��5�:���T)�L
+}�-T5Z/6 �
+�׬V�D�^,�M�J�F�}���D�w�#�����Qns�W�rEgƛ{����,��~_��?�S+�����o��͈7���P�O� �Z�
q=u�`}���(��{�ʕ	P��E�E��A�|����p�E���7�,��t�[	f��~