bosh-monitor 1.2671.0 → 1.2681.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791956fdc8180c70ff4d723a4eba66aeb5563e57
-  data.tar.gz: 197132c5bbb993ef4370dbc19cfe3a11597058ef
+  metadata.gz: efd7f59aa1217707b0e778857eaa6e501c7bfd91
+  data.tar.gz: 7836f292481fe3282ef5d61ce6f3fc6f4d7c381b
 SHA512:
-  metadata.gz: dc662594e8dafae25ceb5d37a2f9b6e54e9473fba8feaea57e15f691f3165996e1e7003369317c38c8dddac8bf8cfef930f8655463617e22e29c001067a7a322
-  data.tar.gz: 7572fb18db5b1d0f2338c7f18a041d3cfd866bc90248fc8e4febaa45796ad1e34e1efec792037493d685a0004c1ec00ddda5c5c931e8df946372bf7a49f56967
+  metadata.gz: aa5ab8bff1c45ebffa9705801e5dceda7eb547d975fc2c8d17690ef657449e932565f6561e3c68cf0c7c7995897da85313e274e076b441fa0dcaab4c1fa90a20
+  data.tar.gz: 1f965f07790e1d8d598262e3145335079eab762cc7c15c2d2802a203f228971cfaa5a8898282b7af191de6079b92ae7d8c6735998b42d38daaa9172d8dc1dfa5

data/lib/bosh/monitor/api_controller.rb

@@ -8,11 +8,28 @@ module Bosh::Monitor
       set(:dump_errors, false)
     end
 
+    helpers do
+      def protected!
+        return if authorized?
+        headers['WWW-Authenticate'] = ''
+        halt 401, 'Unauthorized'
+      end
+
+      def authorized?
+        @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+        @auth.provided? and @auth.basic? and @auth.credentials and @auth.credentials == [Bhm.http_user, Bhm.http_password]
+      end
+    end
+
     get "/varz" do
+      protected!
       content_type(:json)
       Yajl::Encoder.encode(Bhm.varz, :terminator => "\n")
     end
 
+    get "/healthz" do
+      200
+    end
   end
 
 end

data/lib/bosh/monitor/runner.rb

@@ -85,9 +85,6 @@ module Bosh::Monitor
       @logger.info "HTTP server is starting on port #{Bhm.http_port}..."
       @http_server = Thin::Server.new("0.0.0.0", Bhm.http_port, :signals => false) do
         Thin::Logging.silent = true
-        use Rack::Auth::Basic do |user, password|
-          [ user, password ] == [ Bhm.http_user, Bhm.http_password ]
-        end
         map "/" do
           run Bhm::ApiController.new
         end

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.2671.0'
+    VERSION = '1.2681.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.2671.0
+  version: 1.2681.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -138,7 +138,7 @@ dependencies:
         version: 1.6.0
 description: |-
   BOSH Health Monitor
-  03191d
+  c8f6a2
 email: support@cloudfoundry.com
 executables:
 - bosh-monitor-console