sensu 0.9.5.beta.1 → 0.9.5.beta.2

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.5.beta.1"
+  VERSION = "0.9.5.beta.2"
 end

data/lib/sensu/api.rb

@@ -40,6 +40,19 @@ module Sensu
       $logger.debug('[setup] -- connecting to rabbitmq')
       $rabbitmq = AMQP.connect($settings.rabbitmq.to_hash.symbolize_keys)
       $amq = AMQP::Channel.new($rabbitmq)
+      if $settings.api.user && $settings.api.password
+        use Rack::Auth::Basic do |user, password|
+          user == $settings.api.user && password == $settings.api.password
+        end
+      end
+    end
+
+    configure do
+      disable :protection
+    end
+
+    not_found do
+      ''
     end
 
     before do

data/lib/sensu/config.rb

@@ -127,6 +127,19 @@ module Sensu
       end
     end
 
+    def validate_api_settings
+      if @settings.api.key?('user')
+        unless @settings.api.user.is_a?(String)
+          invalid_config('api user must be a string')
+        end
+      end
+      if @settings.api.key?('password')
+        unless @settings.api.password.is_a?(String)
+          invalid_config('api password must be a string')
+        end
+      end
+    end
+
     def validate_client_settings
       unless @settings.client.name.is_a?(String)
         invalid_config('client must have a name')
@@ -155,12 +168,14 @@ module Sensu
       when 'rake'
         has_keys(%w[redis api handlers client])
         validate_server_settings
+        validate_api_settings
         validate_client_settings
       when 'sensu-server'
-        has_keys(%w[redis handlers])
+        has_keys(%w[handlers])
         validate_server_settings
       when 'sensu-api'
-        has_keys(%w[redis api])
+        has_keys(%w[api])
+        validate_api_settings
       when 'sensu-client'
         has_keys(%w[client])
         validate_client_settings

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196249
+  hash: 62196255
   prerelease: true
   segments: 
   - 0
   - 9
   - 5
   - beta
-  - 1
-  version: 0.9.5.beta.1
+  - 2
+  version: 0.9.5.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-05 00:00:00 -08:00
+date: 2012-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency