opscode-pushy-client 2.3.0 → 2.4.11

data/lib/pushy_client/job_runner.rb

@@ -214,6 +214,9 @@ class PushyClient
       user = @opts['user']
       dir = @opts['dir']
       env = @opts['env'] || {}
+      unless client.allowed_overwritable_env_vars.nil?
+        env = env.map{|k,v| client.allowed_overwritable_env_vars.include?(k) ? [k,v] : ["CHEF_PUSH_ENV_#{k}",v]}.to_h
+      end
       capture = @opts['capture'] || false
       path = extract_file
       env.merge!({'CHEF_PUSH_JOB_FILE' => path}) if path

data/lib/pushy_client/periodic_reconfigurer.rb

@@ -18,8 +18,13 @@
 class PushyClient
   class PeriodicReconfigurer
     SPLAY = 0.10
+    POLL_INTERVAL = 5 # seconds
+    
     def initialize(client)
+      @prng = Random.new
       @client = client
+      @lock = Mutex.new
+      @reconfigure_deadline = nil
     end
 
     attr_reader :client
@@ -29,16 +34,34 @@ class PushyClient
       client.node_name
     end
 
+    def reconfigure_deadline
+      @lock.synchronize do
+        @reconfigure_deadline
+      end
+    end
+    
+    # set the reconfigure deadline to some future number of seconds (with a splay applied)
+    def update_reconfigure_deadline(delay)
+      @lock.synchronize do
+        @reconfigure_deadline = Time.now + delay * (1 - @prng.rand(SPLAY))
+        Chef::Log.info "[#{node_name}] Setting reconfigure deadline to #{@reconfigure_deadline}"
+      end
+    end
+    
     def start
       @lifetime = client.config['lifetime']
-      prng = Random.new
+
       @reconfigure_thread = Thread.new do
         Chef::Log.info "[#{node_name}] Starting reconfigure thread.  Will reconfigure / reload keys after #{@lifetime} seconds, less up to splay #{SPLAY}."
         while true
           begin
-            @delay = @lifetime * (1 - prng.rand(SPLAY))
-            sleep(@delay)
-            Chef::Log.info "[#{node_name}] Config is now #{@delay} seconds old.  Reconfiguring / reloading keys ..."
+            update_reconfigure_deadline(@lifetime)
+            while Time.now < reconfigure_deadline do
+              # could also check the config file for updates here and
+              # resolve a long standing wishlist item from customers.
+              sleep(POLL_INTERVAL)
+            end
+            Chef::Log.info "[#{node_name}] Reconfigure deadline of #{reconfigure_deadline} is now past. Reconfiguring / reloading keys ..."
             client.trigger_reconfigure
           rescue
             client.log_exception("Error in reconfigure thread", $!)

data/lib/pushy_client/protocol_handler.rb

@@ -15,8 +15,12 @@
 # under the License.
 #
 
-require 'ffi-rzmq'
-require 'ffi-rzmq-core'
+if RUBY_PLATFORM =~ /aix/
+  require 'rbzmq/zmq'
+else
+  require 'ffi-rzmq'
+  require 'ffi-rzmq-core'
+end
 require 'json'
 require 'time'
 require 'resolv'
@@ -469,22 +473,40 @@ class PushyClient
         json[:sequence] = @command_socket_outgoing_seq
         message = JSON.generate(json)
         if @command_socket
-          ProtocolHandler::send_signed_message(@command_socket, method, @client_private_key, @session_key, message)
+          ProtocolHandler::send_signed_message(@command_socket, method, @client_private_key, @session_key, message, @client)
         else
           Chef::Log.warn("[#{node_name}] Dropping packet because client was stopped: #{message}")
         end
       end
     end
 
-    def self.send_signed_message(socket, method, client_private_key, session_key, message)
+    def self.send_signed_message(socket, method, client_private_key, session_key, message, client)
       auth = case method
              when :rsa2048_sha1
                make_header_rsa(message, client_private_key)
              when :hmac_sha256
                make_header_hmac(message, session_key)
              end
-      socket.send_string(auth, ZMQ::SNDMORE)
-      socket.send_string(message)
+      # https://github.com/chuckremes/ffi-rzmq/blob/master/lib/ffi-rzmq/socket.rb
+      # send_string
+      #
+      # +flags+ may be ZMQ::DONTWAIT and ZMQ::SNDMORE.
+      #
+      # Returns 0 when the message was successfully enqueued.
+      # Returns -1 under two conditions.
+      # 1. The message could not be enqueued
+      # 2. When +flags+ is set with ZMQ::DONTWAIT and the socket returned EAGAIN.
+      #
+      # With a -1 return code, the user must check ZMQ::Util.errno to determine the
+      # cause.
+
+      socket.send_string(auth, ZMQ::SNDMORE | ZMQ::DONTWAIT)
+      rc = socket.send_string(message, ZMQ::DONTWAIT)
+      if rc == -1
+        Chef::Log.info("[#{client.node_name}] ZMQ socket enqueue error #{ZMQ::Util.errno}. Triggering reconfigure")
+        # we don't immediately reconfigure because this is likely to amplify any stampedes.
+        client.update_reconfigure_deadline(60)
+      end
     end
 
     def self.load_key(key_path)

data/lib/pushy_client/version.rb

@@ -18,6 +18,6 @@
 # Note: the version must also be updated in
 # omnibus/config/projects/push-jobs-client.rb
 class PushyClient
-  VERSION = "2.3.0"
+  VERSION = "2.4.11"
   PROTOCOL_VERSION = "2.0"
 end

data/lib/pushy_client/windows_service.rb

@@ -19,7 +19,6 @@
 require 'chef/application'
 require 'chef/config'
 require 'chef/log'
-require 'chef/rest'
 require 'mixlib/cli'
 require 'win32/daemon'
 require_relative '../pushy_client'
@@ -217,14 +216,7 @@ class PushyClient
       begin
         case config[:config_file]
         when /^(http|https):\/\//
-          begin
-            # First we will try Chef::HTTP::SimpleJSON as preference to Chef::REST
-            require 'chef/http/simple_json'
-            Chef::HTTP::SimpleJSON.new("").streaming_request(config[:config_file]) { |f| apply_config(f.path) }
-          rescue LoadError
-            require 'chef/rest'
-            Chef::REST.new("", nil, nil).fetch(config[:config_file]) { |f| apply_config(f.path) }
-          end
+          load_remote_config(config[:config_file])
         else
           ::File::open(config[:config_file]) { |f| apply_config(f.path) }
         end
@@ -243,6 +235,16 @@ class PushyClient
       end
     end
 
+    def load_remote_config(url)
+      # Prefer chef/http which works in Chef 13 + Chef 12
+      require 'chef/http/simple_json'
+      Chef::HTTP::SimpleJSON.new("").streaming_request(url) { |f| apply_config(f.path) }
+    rescue LoadError
+      # Try chef/rest which exists on older chef versions
+      require 'chef/rest'
+      Chef::REST.new("", nil, nil).fetch(url) { |f| apply_config(f.path) }
+    end
+
   end
 end
 

data/omnibus/Gemfile.lock

@@ -1,24 +1,24 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 69e7fd212b293795c9a1abf7e2aed3be89ac6d06
+  revision: 768e24c53c0af3f3e8e9ca4a551166dd9b286e5e
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
-      omnibus (>= 5.5.0)
+      omnibus (>= 5.6.1)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 433220e0b7c434dbc4a36daaa1fecbdb1bf7231d
+  revision: 7e9c9a6a71c1ada2d7f42484f13074e1ec6b7cd3
   specs:
-    omnibus (5.5.0)
+    omnibus (5.6.12)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
-      license_scout
+      license_scout (~> 1.0)
       mixlib-shellout (~> 2.0)
       mixlib-versioning
-      ohai (~> 8.0)
+      ohai (>= 8.6.0.alpha.1, < 15)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
@@ -26,38 +26,33 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.8.1)
-    awesome_print (1.7.0)
-    aws-sdk (2.8.14)
-      aws-sdk-resources (= 2.8.14)
-    aws-sdk-core (2.8.14)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    awesome_print (1.8.0)
+    aws-sdk (2.11.33)
+      aws-sdk-resources (= 2.11.33)
+    aws-sdk-core (2.11.33)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.8.14)
-      aws-sdk-core (= 2.8.14)
-    aws-sigv4 (1.0.0)
-    berkshelf (5.6.4)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 2.0.2, < 4.0)
+    aws-sdk-resources (2.11.33)
+      aws-sdk-core (= 2.11.33)
+    aws-sigv4 (1.0.2)
+    berkshelf (6.3.2)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 1.0)
+      chef (>= 12.7.2, < 14.0)
       cleanroom (~> 1.0)
+      concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
       mixlib-archive (~> 0.4)
+      mixlib-shellout (~> 2.0)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
-      solve (> 2.0, < 4.0)
+      solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (3.0.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      ridley (>= 4.5, < 6.0)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -72,70 +67,168 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.19.36)
+    chef (13.8.5)
+      addressable
+      bundler (>= 1.10)
+      chef-config (= 13.8.5)
+      chef-zero (>= 13.0)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      iso8601 (~> 0.9.1)
+      mixlib-archive (~> 0.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.7)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 13.0)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+    chef (13.8.5-universal-mingw32)
+      addressable
+      bundler (>= 1.10)
+      chef-config (= 13.8.5)
+      chef-zero (>= 13.0)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      iniparse (~> 1.4)
+      iso8601 (~> 0.9.1)
+      mixlib-archive (~> 0.4)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.7)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-sftp (~> 2.1, >= 2.1.2)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-multi (~> 1.2, >= 1.2.1)
+      ohai (~> 13.0)
+      plist (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+      win32-api (~> 1.5.3)
+      win32-dir (~> 0.5.0)
+      win32-event (~> 0.6.1)
+      win32-eventlog (= 0.6.3)
+      win32-mmap (~> 0.4.1)
+      win32-mutex (~> 0.4.2)
+      win32-process (~> 0.8.2)
+      win32-service (~> 0.8.7)
+      windows-api (~> 0.4.4)
+      wmi-lite (~> 1.0)
+    chef-config (13.8.5)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-sugar (3.4.0)
+      tomlrb (~> 1.2)
+    chef-sugar (3.6.0)
+    chef-zero (13.1.0)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack (~> 2.0)
+      uuidtools (~> 2.1)
+    citrus (3.0.2)
     cleanroom (1.0.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
     erubis (2.7.0)
-    faraday (0.9.2)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
-    ffi-yajl (2.3.0)
+    ffi (1.9.23)
+    ffi (1.9.23-x64-mingw32)
+    ffi (1.9.23-x86-mingw32)
+    ffi-win32-extensions (1.0.3)
+      ffi
+    ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.5)
-    hitimes (1.2.4)
+    hashie (3.5.7)
+    highline (1.7.10)
+    hitimes (1.2.6)
+    hitimes (1.2.6-x86-mingw32)
     httpclient (2.8.3)
+    iniparse (1.4.4)
     iostruct (0.0.4)
     ipaddress (0.8.3)
-    jmespath (1.3.1)
-    json (2.0.3)
-    kitchen-vagrant (1.0.2)
+    iso8601 (0.9.1)
+    jmespath (1.4.0)
+    json (2.1.0)
+    kitchen-vagrant (1.3.1)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
-    license_scout (0.1.3)
+    license_scout (1.0.2)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
+      toml-rb (~> 1.0)
     little-plugger (1.1.4)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
-      artifactory
+    mixlib-config (2.2.6)
+      tomlrb
+    mixlib-install (3.9.3)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-versioning (1.1.0)
-    molinillo (0.5.7)
-    multi_json (1.12.1)
+    mixlib-shellout (2.3.2)
+    mixlib-shellout (2.3.2-universal-mingw32)
+      win32-process (~> 0.8.2)
+      wmi-lite (~> 1.0)
+    mixlib-versioning (1.2.2)
+    molinillo (0.6.5)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (2.0.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
+    nio4r (2.3.0)
     nori (2.6.0)
-    octokit (4.6.2)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.23.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (13.9.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -152,11 +245,13 @@ GEM
       multipart-post (~> 2.0.0)
       progressbar
       zhexdump (>= 0.0.2)
-    plist (3.2.0)
-    progressbar (1.8.2)
-    public_suffix (2.0.5)
+    plist (3.4.0)
+    progressbar (1.9.0)
+    proxifier (1.0.3)
+    public_suffix (3.0.2)
+    rack (2.0.4)
     retryable (2.0.4)
-    ridley (5.1.0)
+    ridley (5.1.1)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
@@ -166,7 +261,7 @@ GEM
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
       erubis
-      faraday (~> 0.9.0)
+      faraday (~> 0.9)
       hashie (>= 2.0.2, < 4.0.0)
       httpclient (~> 2.7)
       json (>= 1.7.7)
@@ -174,33 +269,89 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    ruby-progressbar (1.8.1)
-    rubyntlm (0.6.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    ruby-progressbar (1.9.0)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
-    safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    solve (3.1.0)
-      molinillo (>= 0.5)
+    serverspec (2.41.3)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.72)
+    sfl (2.3)
+    solve (4.0.0)
+      molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
+    specinfra (2.73.3)
+      net-scp
+      net-ssh (>= 2.7, < 5.0)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.16.0)
-      mixlib-install (>= 1.2, < 3.0)
+    test-kitchen (1.21.1)
+      mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    toml-rb (1.1.1)
+      citrus (~> 3.0, > 3.0)
+    tomlrb (1.2.6)
+    uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
-    winrm (2.1.3)
+    win32-api (1.5.3-universal-mingw32)
+    win32-dir (0.5.1)
+      ffi (>= 1.0.0)
+    win32-event (0.6.3)
+      win32-ipc (>= 0.6.0)
+    win32-eventlog (0.6.3)
+      ffi
+    win32-ipc (0.7.0)
+      ffi
+    win32-mmap (0.4.2)
+      ffi
+    win32-mutex (0.4.3)
+      win32-ipc (>= 0.6.0)
+    win32-process (0.8.3)
+      ffi (>= 1.0.0)
+    win32-service (0.8.10)
+      ffi
+      ffi-win32-extensions
+    windows-api (0.4.4)
+      win32-api (>= 1.4.5)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -209,7 +360,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.0.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.2.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -219,6 +373,8 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
+  x86-mingw32
 
 DEPENDENCIES
   berkshelf
@@ -229,4 +385,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.14.6
+   1.16.1