skylight 0.4.0.beta1 → 0.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b792bd9edd83c6519aa2abe19c57a5309681c1fb
-  data.tar.gz: 6c577191b4a08ecb0d2ed68bd538ada731b5bfd7
+  metadata.gz: 5c2c971886aa2187432210157c789a499aa414b3
+  data.tar.gz: 89f8c9dd4bcca24cca6f9cb58871a223bd142bbd
 SHA512:
-  metadata.gz: 4399d887807138ea93c8067f4845fe905f06128edc7cdda3525d488ff25390c2ed06bfecfd18dfa042ba4fdbc48dac109e62590fe63a9cf23dd928c3c0aa7363
-  data.tar.gz: d15a4f6cff77015930eecc7afab684ba862f5272a2fd792a9edffa0ca7e450a391212ccf1247ce571ada3b1021726cd520cc4a23ef2a5ff9ad8c6543d84d4dc9
+  metadata.gz: 006fecbbc09d50807beecb2d46dcb21ef2f7750bc719f535cee16200e368f2caf2de8bd1074de133d7e24e44ad1e27cd960bad2cdedb0fffa511fe903e29e0ec
+  data.tar.gz: e6caf8cd228af8c0e61ffd134581e9f7d9639451b3050e07996ef11aacd26ccb5520190654393a1d78772a4ab2226712c227f642824a09ba89e93cc2a65d6e65

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.4.0-d2c73cb"
+version: "0.4.0-e42cc44"
 checksums:
-  x86-linux:     "4671996cf24d012452db68a792a70c23665b6efb1454e95e4fb1544df69615c0"
-  x86_64-linux:  "51c82df086af87ea12c7aaa78c0d387ee540e93474d1df6ad8eb7db85d1841e4"
-  x86_64-darwin: "6b06223198062cce67a8c57e26e51b6907eb09baf5e53ad3ea13b3b62366d99e"
+  x86-linux:     "77c56fc8a34ae2b1a1f5af97ce177e59beeff5475410864af9aafbf130dab323"
+  x86_64-linux:  "1f16effac4b96f3b214df061927cd6332a913c07b3f1d76b3c8053e9156a5732"
+  x86_64-darwin: "5f95596ccbd720b68b98ba012b7371c18ea674712c52d45a807620e9c5c3d127"

data/lib/skylight/api.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Skylight
   # @api private
   class Api
@@ -40,6 +42,23 @@ module Skylight
       @http.authentication = token
     end
 
+    def validate_authentication
+      url = URI.parse(config[:auth_url])
+
+      res = @http.get(url.path)
+
+      case res.status
+      when 200...300
+        :ok
+      when 400...500
+        :invalid
+      else
+        :unknown
+      end
+    rescue
+      :unknown
+    end
+
     def login(email, password)
       res = http.get('/me', 'X-Email' => email, 'X-Password' => password)
 

data/lib/skylight/config.rb

@@ -81,7 +81,7 @@ module Skylight
     # Default values for Skylight configuration keys
     DEFAULTS = {
       :'version'              => VERSION,
-      :'auth_url'             => 'https://www.skylight.io/agent/authenticate',
+      :'auth_url'             => 'https://auth.skylight.io/agent',
       :'daemon.lazy_start'    => true,
       :'daemon.ssl_cert_path' => Util::SSL.ca_cert_file_or_default,
       :'daemon.ssl_cert_dir'  => Util::SSL.ca_cert_dir,
@@ -333,6 +333,9 @@ module Skylight
         end
       end
 
+      ret << "SKYLIGHT_VALIDATE_AUTHENTICATION"
+      ret << "false"
+
       ret
     end
 

data/lib/skylight/instrumenter.rb

@@ -1,5 +1,6 @@
 require 'thread'
 require 'strscan'
+require 'skylight/api'
 
 module Skylight
   # @api private
@@ -107,6 +108,11 @@ module Skylight
       t { "starting instrumenter" }
       @config.validate!
 
+      unless validate_authentication
+        warn "invalid authentication token"
+        return
+      end
+
       t { "starting native instrumenter" }
       unless native_start
         warn "failed to start instrumenter"
@@ -251,5 +257,30 @@ module Skylight
       config.key?(:ignored_endpoint) && trace.endpoint == config[:ignored_endpoint]
     end
 
+    # Validates that the provided authentication token is valid. This is done
+    # by issuing a request for a session token and checking the response
+    def validate_authentication
+      # If a session token is specified, don't bother attempting to validate
+      if config[:session_token]
+        true
+      else
+        api = Api.new(config)
+        api.authentication = config[:authentication]
+
+        case res = api.validate_authentication
+        when :ok
+          true
+        when :invalid
+          false
+        when :unknown
+          warn "unable to validate authentication token"
+          true
+        else
+          error "[BUG] unexpected validate_token result; res=%s", res
+          true
+        end
+      end
+    end
+
   end
 end

data/lib/skylight/native.rb

@@ -13,23 +13,27 @@ module Skylight
     ENV['SKYLIGHT_LIB_PATH'] || File.expand_path("../native/#{Util::Platform.tuple}", __FILE__)
   end
 
+  skylight_required = ENV.key?("SKYLIGHT_REQUIRED") && ENV['SKYLIGHT_REQUIRED'] !~ /^false$/i
+
   begin
-    unless ENV["SKYLIGHT_DISABLE_AGENT"]
+    unless ENV.key?("SKYLIGHT_DISABLE_AGENT") && ENV['SKYLIGHT_DISABLE_AGENT'] !~ /^false$/i
       lib = "#{libskylight_path}/libskylight.#{Util::Platform.libext}"
 
       if File.exist?(lib)
         # First attempt to require the native extension
-        require 'skylight_native'
+        require "skylight_native"
 
         # Attempt to link the dylib
         load_libskylight(lib)
 
         # If nothing was thrown, then the native extension is present
         @@has_native_ext = true
+      elsif skylight_required
+        raise LoadError, "Cannot find native extensions in #{libskylight_path}"
       end
     end
   rescue LoadError => e
-    raise if ENV.key?("SKYLIGHT_REQUIRED")
+    raise if skylight_required
   end
 
   unless Skylight.native?

data/lib/skylight/util.rb

@@ -7,10 +7,10 @@ module Skylight
     require 'skylight/util/hostname'
     require 'skylight/util/logging'
     require 'skylight/util/ssl'
+    require 'skylight/util/http'
 
     # Used from the CLI
     autoload :Gzip,      'skylight/util/gzip'
-    autoload :HTTP,      'skylight/util/http'
     autoload :Inflector, 'skylight/util/inflector'
   end
 end

data/lib/skylight/util/http.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'openssl'
 require 'net/http'
 require 'net/https'
+require 'skylight/util/gzip'
 require 'skylight/util/ssl'
 
 module Skylight

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.4.0-beta1'
+  VERSION = '0.4.0-beta2'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport