deploy-agent 1.2.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ef182af99f1a1dafc375cd5e1b744a626e4f023dc5c04b8d88140a0243568a9
-  data.tar.gz: eb44700f80e225332e68ffe055ce462bf0b0e234fe435d2ca73c226921371dd4
+  metadata.gz: 55068c8f22a5ef2219f05df92bea4a61f61b7fe50d6913bde0370e0ee57636de
+  data.tar.gz: 69c43ca34010ef2087ebb64159b6bdd65088ed73adfa5b36927e5ff10a8d9750
 SHA512:
-  metadata.gz: cb906670bef6ab1ef210df73c47c6ca34d0f08f521e30229a0cb88e4603aa1dfbb9871541dd596279e7b0d83b1c85b938ef3b41b16b8011456d5703c33717db8
-  data.tar.gz: 870c8c2838a691f2ebee07bb964a2348730f80b2f4a49adc60de09628300945ff6368c3a769987619034aa37340b31babc8a3fad8bfc21fc23988190b84ff738
+  metadata.gz: b461ee04ef850bdf398ce0cf37ac1f888778d997d36f111fe78c0b886b1b44b7a7f26902f4bc8cecbacd2879d1fcacbed84464e2e4e9de0c9e2f89dbfd9126ba
+  data.tar.gz: c26dab5b3ccd5b9a4f65849321c4c2873c81071b38dd6bf5ac41e51e235e986cdacf925e80628c61b51900c8d1b6e68521324d8e41e6d0bc466222b7165873c1

data/bin/deploy-agent

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-$:.unshift(File.expand_path('../../lib', __FILE__))
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require 'deploy_agent'
 
 DeployAgent::CLI.new.dispatch(ARGV)

data/deploy-agent.gemspec

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |s|
+  s.name        = 'deploy-agent'
+  s.version     = '1.3.3'
+  s.required_ruby_version = '>= 2.7'
+  s.summary     = 'The DeployHQ Agent'
+  s.description = 'This gem allows you to configure a secure proxy through which DeployHQ can forward connections'
+  s.authors     = ['Charlie Smurthwaite']
+  s.email       = ['support@deployhq.com']
+  s.files       = Dir.glob('{lib,bin}/**/*')
+  s.files       << 'ca.crt'
+  s.files       << 'deploy-agent.gemspec'
+  s.homepage    = 'https://www.deployhq.com/'
+  s.bindir      = 'bin'
+  s.executables << 'deploy-agent'
+
+  s.add_dependency 'nio4r', '2.1.0'
+  s.add_dependency 'rb-readline', '0.5.5'
+  s.add_dependency 'timers', '4.1.2'
+end

data/lib/deploy_agent/agent.rb

@@ -6,6 +6,10 @@ require 'logger'
 
 module DeployAgent
   class Agent
+    def initialize(options = {})
+      @retries = 0
+      @options = options
+    end
 
     def run
       nio_selector = NIO::Selector.new
@@ -21,22 +25,40 @@ module DeployAgent
           monitor.value.tx_data if monitor.writeable?
         end
         timers.fire
+
+        @retries = 0
+      end
+    rescue OpenSSL::SSL::SSLError => e
+      @retries += 1
+
+      if @retries == 4
+        raise e
+      else
+        retry
       end
     rescue ServerConnection::ServerDisconnected
       retry
+    rescue Interrupt, SignalException => e
+      logger.info("Stopping")
+    rescue Exception => e
+      logger.debug("#{e.class}: #{e.message}")
+      raise e
     end
 
     def logger
       @logger ||= begin
         if $background
           logger = Logger.new(LOG_PATH, 5, 10240)
-          logger.level = Logger::INFO
-          logger
         else
-          Logger.new(STDOUT)
+          logger = Logger.new(STDOUT)
         end
+        logger.level = @options[:verbose] ? Logger::DEBUG : Logger::INFO
+        logger
       end
     end
 
+    private
+
+    attr_reader :options
   end
 end

data/lib/deploy_agent/cli.rb

@@ -1,10 +1,20 @@
 require 'ipaddr'
+require 'optparse'
 
 module DeployAgent
   class CLI
 
     def dispatch(arguments)
       methods = self.public_methods(false).delete_if { |n| n == :dispatch }.sort
+
+      @options = {}
+
+      OptionParser.new do |opts|
+        opts.on('-v', '--verbose', 'Log extra debug information') do
+          @options[:verbose] = true
+        end
+      end.parse!
+
       if arguments[0] && methods.include?(arguments[0].to_sym)
         public_send(arguments[0])
       else
@@ -62,7 +72,7 @@ module DeployAgent
 
     def run
       ensure_configured
-      Agent.new.run
+      Agent.new(@options).run
     end
 
     def accesslist
@@ -79,6 +89,10 @@ module DeployAgent
       puts "To edit the list of allowed servers, please modify " + ACCESS_PATH
     end
 
+    def version
+      puts DeployAgent::VERSION
+    end
+
     private
 
     def ensure_configured
@@ -109,7 +123,7 @@ module DeployAgent
 
     def write_pid
       File.open(PID_PATH, 'w') { |f| f.write Process.pid.to_s }
-      at_exit { File.delete(PID_PATH) if File.exists?(PID_PATH) }
+      at_exit { File.delete(PID_PATH) if File.exist?(PID_PATH) }
     end
 
   end

data/lib/deploy_agent/destination_connection.rb

@@ -79,7 +79,7 @@ module DeployAgent
         # Nothing more to send, wait for inbound data only
         @nio_monitor.interests = :r
       end
-    rescue Errno::ECONNRESET
+    rescue Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENETRESET
       # The backend has closed the connection. Inform the Deploy server.
       @server_connection.send_connection_close(@id)
       # Ensure everything is tidied up
@@ -91,7 +91,7 @@ module DeployAgent
       data = @tcp_socket.readpartial(10240)
       @agent.logger.debug "[#{@id}] #{data.bytesize} bytes received from destination"
       @server_connection.send_data(@id, data)
-    rescue EOFError, Errno::ECONNRESET
+    rescue EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENETRESET
       @agent.logger.info "[#{@id}] Destination closed connection"
       # The backend has closed the connection. Inform the Deploy server.
       @server_connection.send_connection_close(@id)

data/lib/deploy_agent/server_connection.rb

@@ -54,10 +54,17 @@ module DeployAgent
     # Receive and process packets from the control server
     def rx_data
       # Ensure all received data is read
-      @rx_buffer << @socket.readpartial(10240)
-      while(@socket.pending > 0)
-        @rx_buffer << @socket.readpartial(10240)
+      loop do
+        begin
+          data = @socket.read_nonblock(10240)
+          raise EOFError if data.nil?
+
+          @rx_buffer << data
+        rescue IO::WaitReadable, IO::WaitWritable
+          break # nothing more to read
+        end
       end
+
       # Wait until we have a complete packet of data
       while @rx_buffer.bytesize >=2 && @rx_buffer.bytesize >= @rx_buffer[0,2].unpack('n')[0]
         length = @rx_buffer.slice!(0,2).unpack('n')[0]
@@ -106,7 +113,7 @@ module DeployAgent
           close
         end
       end
-    rescue EOFError, Errno::ECONNRESET
+    rescue EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENETRESET
       close
     end
 
@@ -144,7 +151,9 @@ module DeployAgent
 
     # Called by event loop to send all waiting packets to the Deploy server
     def tx_data
+      @agent.logger.debug('Writing to socket')
       bytes_sent = @socket.write_nonblock(@tx_buffer[0,1024])
+      @agent.logger.debug('Writing to socket completed')
       # Send as much data as possible
       if bytes_sent >= @tx_buffer.bytesize
         @tx_buffer = String.new.force_encoding('BINARY')
@@ -154,7 +163,7 @@ module DeployAgent
         # the remaining data in the send buffer
         @tx_buffer.slice!(0, bytes_sent)
       end
-    rescue EOFError, Errno::ECONNRESET
+    rescue EOFError, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENETRESET
       close
     end
 

data/lib/deploy_agent/version.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+
+module DeployAgent
+  VERSION_FILE_PATH = File.expand_path('../../../VERSION', __FILE__)
+  SPEC_FILE_PATH    = File.expand_path('../../../deploy-agent.gemspec', __FILE__)
+
+  if File.file?(VERSION_FILE_PATH)
+    VERSION = File.read(VERSION_FILE_PATH).strip.sub(/\Av/, '')
+  elsif File.file?(SPEC_FILE_PATH)
+    VERSION = Gem::Specification::load(SPEC_FILE_PATH).version.to_s
+  else
+    puts __FILE__
+
+    VERSION = '0.0.0.dev'
+  end
+
+end

data/lib/deploy_agent.rb

@@ -1,3 +1,4 @@
+require 'deploy_agent/version'
 require 'deploy_agent/configuration_generator'
 require 'deploy_agent/server_connection'
 require 'deploy_agent/destination_connection'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: deploy-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.3
 platform: ruby
 authors:
-- aTech Media
-autorequire: 
+- Charlie Smurthwaite
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -24,20 +23,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: timers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -53,20 +38,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.5
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: 4.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
-description: This gem allows you to configure a secure proxy through which Deploy
+        version: 4.1.2
+description: This gem allows you to configure a secure proxy through which DeployHQ
   can forward connections
 email:
 - support@deployhq.com
@@ -77,16 +62,17 @@ extra_rdoc_files: []
 files:
 - bin/deploy-agent
 - ca.crt
+- deploy-agent.gemspec
 - lib/deploy_agent.rb
 - lib/deploy_agent/agent.rb
 - lib/deploy_agent/cli.rb
 - lib/deploy_agent/configuration_generator.rb
 - lib/deploy_agent/destination_connection.rb
 - lib/deploy_agent/server_connection.rb
+- lib/deploy_agent/version.rb
 homepage: https://www.deployhq.com/
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -94,16 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
-summary: The Deploy agent
+summary: The DeployHQ Agent
 test_files: []