appsignal 1.3.4 → 1.3.5.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8cdb9e1b2db95bc735c3d64eea9665be837d19
-  data.tar.gz: 7021aa04820c7db059b86f6296bc6502fb771001
+  metadata.gz: c3a75a284960b4d62fbe5a44bb0d8874ea659d26
+  data.tar.gz: 9b0c5a85331cf63415a8d06d5f167fd51001e71d
 SHA512:
-  metadata.gz: ad08fc277a7215b444c1298da267eebdf6a93435d001d4d6807701b1529107206907ed024c1715148a97ad51576827a4116f8f4530f337c29cbfd72312a0dd46
-  data.tar.gz: 55fc2789cc506ee33d748dda6a78f38a188ca75b373a4b3459a45d9ba73da483cb73a1901adfe11ad341a5cc2e3c040c3d91aa4abfa4f461cc5fb7b900405787
+  metadata.gz: 5bc51d6d2696d1c9e3187bdc0542cffe1ac5c68c3bb6739ae720a54c5021891e8ec5897d0dfe03dbdf0eb81475e1688ea9cf11a482c370bfc7171c7d788563bd
+  data.tar.gz: 21fb5d5806e5f224960991fdc402ba6ef24dc8abf76af0835960935e39c4c72e96039d9e7412482a2b1f9dee1c95e5c6c7ada5bae5944ccc83b5ca32859fa714

data/.travis.yml

@@ -1,5 +1,10 @@
 sudo: false
 
+branches:
+  only:
+    - "master"
+    - "develop"
+
 language: ruby
 cache: bundler
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.5
+
+- Fix SSL certificate config in appsignal-agent. PR #151
+
 # 1.3.4
 
 * Fix argument order for `record_event` in the AppSignal extension

data/ext/agent.yml

@@ -1,18 +1,18 @@
 ---
-version: 7d8fcfa
+version: f0c15da
 triples:
   x86_64-linux:
-    checksum: 9b11cbd3828f15fb79314459458877fc24b3cb5fb3b14ab4703def6136de77d3
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/7d8fcfa/appsignal-x86_64-linux-all-static.tar.gz
+    checksum: 2af2810c660b7b1ad38f5962db00a81965dcf0be07b101ff87f182d1699165b5
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-linux-all-static.tar.gz
   i686-linux:
-    checksum: 005d901b2097e0dc00327bfdffb34b5259bd93eb77b2da71436bd34b97062660
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/7d8fcfa/appsignal-i686-linux-all-static.tar.gz
+    checksum: a96f492f08bcccb0e66347fb0920b56d3d5c2958776469a241bf4357cfb4c1a0
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-i686-linux-all-static.tar.gz
   x86-linux:
-    checksum: 005d901b2097e0dc00327bfdffb34b5259bd93eb77b2da71436bd34b97062660
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/7d8fcfa/appsignal-i686-linux-all-static.tar.gz
+    checksum: a96f492f08bcccb0e66347fb0920b56d3d5c2958776469a241bf4357cfb4c1a0
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-i686-linux-all-static.tar.gz
   x86_64-darwin:
-    checksum: 1d2dbd22ad0fe22d9838022533df4debc2fbb9daa2519beed75d7e057b62e980
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/7d8fcfa/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 0bbfdf50c06f1b3759ccac1a5b9bed8ebe42859144a045404ce258b3a2a93a4a
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-darwin-all-static.tar.gz
   universal-darwin:
-    checksum: 1d2dbd22ad0fe22d9838022533df4debc2fbb9daa2519beed75d7e057b62e980
-    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/7d8fcfa/appsignal-x86_64-darwin-all-static.tar.gz
+    checksum: 0bbfdf50c06f1b3759ccac1a5b9bed8ebe42859144a045404ce258b3a2a93a4a
+    download_url: https://appsignal-agent-releases.global.ssl.fastly.net/f0c15da/appsignal-x86_64-darwin-all-static.tar.gz

data/lib/appsignal/config.rb

@@ -23,7 +23,8 @@ module Appsignal
       :running_in_container           => false,
       :enable_host_metrics            => true,
       :enable_minutely_probes         => false,
-      :hostname                       => ::Socket.gethostname
+      :hostname                       => ::Socket.gethostname,
+      :ca_file_path                   => File.expand_path(File.join('../../../resources/cacert.pem'), __FILE__)
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -50,7 +51,8 @@ module Appsignal
       'APPSIGNAL_WORKING_DIR_PATH'               => :working_dir_path,
       'APPSIGNAL_ENABLE_HOST_METRICS'            => :enable_host_metrics,
       'APPSIGNAL_ENABLE_MINUTELY_PROBES'         => :enable_minutely_probes,
-      'APPSIGNAL_HOSTNAME'                       => :hostname
+      'APPSIGNAL_HOSTNAME'                       => :hostname,
+      'APPSIGNAL_CA_FILE_PATH'                   => :ca_file_path
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
@@ -127,6 +129,7 @@ module Appsignal
       ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES']       = config_hash[:enable_minutely_probes].to_s
       ENV['APPSIGNAL_HOSTNAME']                     = config_hash[:hostname].to_s
       ENV['APPSIGNAL_PROCESS_NAME']                 = $0
+      ENV['APPSIGNAL_CA_FILE_PATH']                 = config_hash[:ca_file_path].to_s
     end
 
     protected
@@ -175,7 +178,7 @@ module Appsignal
       # Configuration with string type
       %w(APPSIGNAL_PUSH_API_KEY APPSIGNAL_APP_NAME APPSIGNAL_PUSH_API_ENDPOINT
          APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH APPSIGNAL_HTTP_PROXY APPSIGNAL_LOG_PATH
-         APPSIGNAL_WORKING_DIR_PATH APPSIGNAL_HOSTNAME).each do |var|
+         APPSIGNAL_WORKING_DIR_PATH APPSIGNAL_HOSTNAME APPSIGNAL_CA_FILE_PATH).each do |var|
         if env_var = ENV[var]
           config[ENV_TO_KEY_MAPPING[var]] = env_var
         end

data/lib/appsignal/transmitter.rb

@@ -8,7 +8,6 @@ module Appsignal
   class Transmitter
     CONTENT_TYPE = 'application/json; charset=UTF-8'.freeze
     CONTENT_ENCODING = 'gzip'.freeze
-    CA_FILE_PATH = File.expand_path(File.join(__FILE__, '../../../resources/cacert.pem'))
 
     HTTP_ERRORS = [
       EOFError,
@@ -42,7 +41,7 @@ module Appsignal
     end
 
     def transmit(payload)
-      Appsignal.logger.debug "Transmitting payload to #{uri}"
+      config.logger.debug "Transmitting payload to #{uri}"
       http_client.request(http_post(payload)).code
     end
 
@@ -71,7 +70,14 @@ module Appsignal
           http.use_ssl     = true
           http.ssl_version = :TLSv1
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          http.ca_file     = CA_FILE_PATH
+
+          ca_file = config[:ca_file_path]
+          if ca_file && File.exist?(ca_file) && File.readable?(ca_file)
+            http.ca_file = ca_file
+          else
+            config.logger.warn "Ignoring non-existing or unreadable "\
+              "`ca_file_path`: #{ca_file}"
+          end
         end
       end
     end

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.3.4'
+  VERSION = '1.3.5.beta.1'
 end

data/spec/lib/appsignal/config_spec.rb

@@ -35,7 +35,8 @@ describe Appsignal::Config do
         :running_in_container           => false,
         :enable_host_metrics            => true,
         :enable_minutely_probes         => false,
-        :hostname                       => Socket.gethostname
+        :hostname                       => Socket.gethostname,
+        :ca_file_path                   => File.join(resources_dir, 'cacert.pem')
       })
     end
 
@@ -130,6 +131,7 @@ describe Appsignal::Config do
         ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES'].should       eq 'false'
         ENV['APPSIGNAL_HOSTNAME'].should                     eq 'app1.local'
         ENV['APPSIGNAL_PROCESS_NAME'].should                 include 'rspec'
+        ENV['APPSIGNAL_CA_FILE_PATH'].should                 eq File.join(resources_dir, "cacert.pem")
       end
 
       context "if working_dir_path is set" do

data/spec/lib/appsignal/integrations/webmachine_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 if webmachine_present?
 
   require 'appsignal/integrations/webmachine'

data/spec/lib/appsignal/transmitter_spec.rb

@@ -1,11 +1,14 @@
 describe Appsignal::Transmitter do
   let(:config) { project_fixture_config }
   let(:action) { 'action' }
+  let(:log) { StringIO.new }
   let(:instance) { Appsignal::Transmitter.new(action, config) }
+  before do
+    config.config_hash[:hostname] = 'app1.local'
+    config.logger = Logger.new(log)
+  end
 
   describe "#uri" do
-    before { ENV['APPSIGNAL_HOSTNAME'] = 'app1.local' }
-
     subject { instance.uri.to_s }
 
     it { should include 'https://push.appsignal.com/1/action?' }
@@ -20,7 +23,9 @@ describe Appsignal::Transmitter do
     before do
       stub_request(
         :post,
-        "https://push.appsignal.com/1/action?api_key=abc&environment=production&gem_version=#{Appsignal::VERSION}&hostname=#{Socket.gethostname}&name=TestApp"
+        "https://push.appsignal.com/1/action?api_key=abc"\
+          "&environment=production&gem_version=#{Appsignal::VERSION}"\
+          "&hostname=#{config.config_hash[:hostname]}&name=TestApp"
       ).with(
         :body => Zlib::Deflate.deflate("{\"the\":\"payload\"}", Zlib::BEST_SPEED),
         :headers => {
@@ -31,10 +36,51 @@ describe Appsignal::Transmitter do
         :status => 200
       )
     end
-
     subject { instance.transmit(:the => :payload) }
 
     it { should eq '200' }
+
+    context "with ca_file_path config option set" do
+      context "when not existing file" do
+        before do
+          config.config_hash[:ca_file_path] = File.join(resources_dir, "cacert.pem")
+        end
+
+        it "ignores the config and logs a warning" do
+          expect(subject).to eq '200'
+          expect(log.string).to_not include "Ignoring non-existing or unreadable " \
+            "`ca_file_path`: #{config[:ca_file_path]}"
+        end
+      end
+
+      context "when not existing file" do
+        before do
+          config.config_hash[:ca_file_path] = File.join(tmp_dir, "ca_file_that_does_not_exist")
+        end
+
+        it "ignores the config and logs a warning" do
+          expect(subject).to eq '200'
+          expect(log.string).to include "Ignoring non-existing or unreadable " \
+            "`ca_file_path`: #{config[:ca_file_path]}"
+        end
+      end
+
+      context "when not readable file" do
+        let(:file) { File.join(tmp_dir, "ca_file") }
+        before do
+          config.config_hash[:ca_file_path] = file
+          File.open(file, "w") { |f| f.chmod 0000 }
+        end
+
+        it "ignores the config and logs a warning" do
+          expect(subject).to eq '200'
+          expect(log.string).to include "Ignoring non-existing or unreadable " \
+            "`ca_file_path`: #{config[:ca_file_path]}"
+        end
+
+        after { File.delete file }
+      end
+    end
   end
 
   describe "#http_post" do
@@ -53,13 +99,6 @@ describe Appsignal::Transmitter do
     end
   end
 
-  describe ".CA_FILE_PATH" do
-    subject { Appsignal::Transmitter::CA_FILE_PATH }
-
-    it { should include('resources/cacert.pem') }
-    it("should exist") { File.exist?(subject).should be_true }
-  end
-
   describe "#http_client" do
     subject { instance.send(:http_client) }
 
@@ -78,7 +117,7 @@ describe Appsignal::Transmitter do
       its(:proxy?) { should be_false }
       its(:use_ssl?) { should be_true }
       its(:verify_mode) { should eq OpenSSL::SSL::VERIFY_PEER }
-      its(:ca_file) { Appsignal::Transmitter::CA_FILE_PATH }
+      its(:ca_file) { should eq config[:ca_file_path] }
     end
 
     context "with a proxy" do

data/spec/support/helpers/directory_helper.rb

@@ -1,4 +1,8 @@
 module DirectoryHelper
+  def project_dir
+    @project_dir ||= File.expand_path('..', spec_dir)
+  end
+
   def spec_dir
     APPSIGNAL_SPEC_DIR
   end
@@ -14,4 +18,8 @@ module DirectoryHelper
   def fixtures_dir
     @fixtures_dir ||= File.join(support_dir, 'fixtures')
   end
+
+  def resources_dir
+    @resources_dir ||= File.join(project_dir, 'resources')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -313,9 +313,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1