data/cacert.pem data/gpl-2.0.txt data/lgpl-2.1.txt @@ -1,2 +1,5 @@ +.DS_Store +**/.DS_Store + doc pkg .gitignore @@ -1,3 +1,10 @@ +== 3.2.3 + +* Upgraded to JSON 1.1.6 +* Upgraded to RestClient 1.0 for improved SSL support +* +* Fixed a bug where certain API requests could die with a networking Exception + == 3.2.2 * Fixed a bug where older versions of the standard timeout library could kill CHANGELOG @@ -23,7 +23,8 @@ SA_SPEC = Gem::Specification.new do |spec| spec.test_files = %w[test/ts_all.rb] spec.files = Dir.glob("{bin,lib,test}/**/*.rb") + - %w[Rakefile setup.rb] + %w[ Rakefile setup.rb data/cacert.pem + data/gpl-2.0.txt data/lgpl-2.1.txt ] spec.executables = %w[scout_agent] spec.has_rdoc = true @@ -36,8 +37,8 @@ SA_SPEC = Gem::Specification.new do |spec| spec.add_dependency("arrayfields", "=4.7.3") # fix Amalgalite's results spec.add_dependency("amalgalite", "=0.9.0") - spec.add_dependency("rest-client", "=0.9.2") - spec.add_dependency("json", "=1.1.4") + spec.add_dependency("rest-client", "=1.0") + spec.add_dependency("json", "=1.1.6") spec.add_dependency("xmpp4r", "=0.4") spec.add_dependency("elif", "=0.1.0") # used by some plugins Rakefile @@ -27,9 +27,9 @@ require "scout_agent/dispatcher" require "scout_agent/api" # require gems -require_lib_or_gem "json", "=1.1.4" +require_lib_or_gem "json", "=1.1.6" require_lib_or_gem "amalgalite", "=0.9.0" -require_lib_or_gem "rest_client", "=0.9.2" +require_lib_or_gem "rest_client", "=1.0" require_lib_or_gem "xmpp4r", "=0.4" require_lib_or_gem "xmpp4r/roster" # loads from xmpp4r's version @@ -92,7 +92,7 @@ module ScoutAgent end # The version of this agent. - VERSION = "3.2.2".freeze + VERSION = "3.2.3".freeze # A Pathname reference to the agent code directory, used in dynamic loading. LIB_DIR = Pathname.new(File.dirname(__FILE__)) + agent_name end lib/scout_agent.rb @@ -14,7 +14,7 @@ rescue LoadError # library not found begin require "rubygems" begin - gem("json", "=1.1.4") + gem("json", "=1.1.6") rescue NoMethodError abort "Please upgrade RubyGems as the gem() method is required." end lib/scout_agent/api.rb @@ -15,8 +15,12 @@ module ScoutAgent @log = log @rest_client = RestClient::Resource.new( Plan.agent_url, - :headers => { :client_version => ScoutAgent::VERSION, - :accept_encoding => "gzip" } + :headers => { :client_version => ScoutAgent::VERSION, + :accept_encoding => "gzip" }, + :ssl_ca_file => File.join( File.dirname(__FILE__), + *%w[.. .. data cacert.pem] ), + :verify_ssl => OpenSSL::SSL::VERIFY_PEER | + OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT ) # make sure proxy is set, if needed RestClient.proxy = Plan.proxy_url @@ -47,6 +51,9 @@ module ScoutAgent rescue RestClient::NotModified log.info("Plan was not modified.") "" # empty plan + rescue OpenSSL::SSL::SSLError + log.warn("SSL verification failed. The plan could not be trusted.") + nil # cannot trust any plan we received rescue Exception => error # networking problem log.warn("Plan could not be retrieved: #{error.class}.") nil # failed to retrieve plan @@ -81,6 +88,10 @@ module ScoutAgent log.warn( "Check-in was returned as a failure code: " + "#{error.http_code}." ) false + rescue OpenSSL::SSL::SSLError + log.warn( "SSL verification failed. " + + "Could not send check-in to untrusted server." ) + false # cannot trust server rescue Exception => error # networking problem log.warn("Check-in could not be sent: #{error.class}.") false # we failed to send and will retry later @@ -103,7 +114,11 @@ module ScoutAgent log.warn( "Log upload was returned as a failure code: " + "#{error.http_code}." ) false - rescue Errno::ECONNREFUSED, RestClient::Exception # networking problem + rescue OpenSSL::SSL::SSLError + log.warn( "SSL verification failed. " + + "Could not send log to untrusted server." ) + false # cannot trust server + rescue Exception => error # networking problem log.warn("Log could not be sent: #{error.class}.") false # could not send log end lib/scout_agent/server.rb 4cbc0c01578258d0bcc98662efcbcc564ffd35c5 James Edward Gray II james@graysoftinc.com http://github.com/highgroove/scout_agent/commit/f9a8d9e014cf484badcd12d13bad42749adbad4b f9a8d9e014cf484badcd12d13bad42749adbad4b 2009-05-29T09:35:40-07:00 2009-05-29T09:35:40-07:00 Adding SSL certificate verification. 02f0f8cb9214a94a1a7e028322033184cc64c34d James Edward Gray II james@graysoftinc.com