bosh-director 1.2847.0 → 1.2849.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a7e3fb908b7bf0f3636e71c74e48a297b911a4
-  data.tar.gz: a73af7de9a6881166a17bfcd20df8d979e52a71c
+  metadata.gz: bd013aa7392043f0147806eb7ec6e8ef0d6f9105
+  data.tar.gz: 318c2b8c5c85bea4e52169c4eaebd4c02c26c64f
 SHA512:
-  metadata.gz: 6e7e0817d2464dea69d69a3dfe6f5c058e76f793886112a3b57fb0d44f8fccc4d08aa8ef3e38d21cb171bb8f4f7f4b83a9a282826ae0436f9789db0800d62637
-  data.tar.gz: c77184d889e22d63620b36276296aad392e7e8ec78765da37d5bbbe2ac56a944682e5ca0f59b0cd8a296747aa30ca67e8e95c71a659210d102b90055ef38ae50
+  metadata.gz: 96ae8e542b92ba5f91ebd354c3a606427078309a3d1e30158fc4ec57592eadaa7d2a25ec1f5bced3664c6978290cf758c7a4c3bb1010d2d2ba3d576d7606b9f7
+  data.tar.gz: 3a0dac5c4f27bc9ca43b755b8ee73fec526bbb464c931c613ba3d2ccaa93a503958780f4f2e4a3a102c653775adbb66b6a9bcd913b509f219959e56949e6dd96

data/bin/bosh-director

@@ -16,61 +16,70 @@ opts.parse!(ARGV.dup)
 config_file ||= ::File.expand_path('../../config/bosh-director.yml', __FILE__)
 config = Bosh::Director::Config.load_file(config_file)
 
-Bosh::Director::App.new(config)
+director_app = Bosh::Director::App.new(config)
+
+compiled_package_group_manager = Bosh::Director::Api::CompiledPackageGroupManager.new
+resource_manager = Bosh::Director::Api::ResourceManager.new(director_app.blobstores.blobstore)
+# user_management_hash = config.hash['user_management']
+identity_provider = #if user_management_hash && user_management_hash['provider'] == 'uaa'
+  # Bosh::Director::Api::UaaIdentityProvider.new
+# else
+  Bosh::Director::Api::LocalIdentityProvider.new Bosh::Director::Api::UserManager.new
+# end
 
 thin_server = Thin::Server.new('127.0.0.1', config.hash['port'], signals: false) do
   use Rack::CommonLogger
 
   map '/info' do
-    run Bosh::Director::Api::Controllers::InfoController.new
+    run Bosh::Director::Api::Controllers::InfoController.new identity_provider
   end
 
   map '/tasks' do
-    run Bosh::Director::Api::Controllers::TasksController.new
+    run Bosh::Director::Api::Controllers::TasksController.new identity_provider
   end
 
   map '/backups' do
-    run Bosh::Director::Api::Controllers::BackupsController.new
+    run Bosh::Director::Api::Controllers::BackupsController.new identity_provider
   end
 
   map '/deployments' do
-    run Bosh::Director::Api::Controllers::DeploymentsController.new
+    run Bosh::Director::Api::Controllers::DeploymentsController.new identity_provider
   end
 
   map '/packages' do
-    run Bosh::Director::Api::Controllers::PackagesController.new
+    run Bosh::Director::Api::Controllers::PackagesController.new identity_provider
   end
 
   map '/releases' do
-    run Bosh::Director::Api::Controllers::ReleasesController.new
+    run Bosh::Director::Api::Controllers::ReleasesController.new identity_provider
   end
 
   map '/resources' do
-    run Bosh::Director::Api::Controllers::ResourcesController.new
+    run Bosh::Director::Api::Controllers::ResourcesController.new identity_provider, resource_manager
   end
 
   map '/resurrection' do
-    run Bosh::Director::Api::Controllers::ResurrectionController.new
+    run Bosh::Director::Api::Controllers::ResurrectionController.new identity_provider
   end
 
   map '/stemcells' do
-    run Bosh::Director::Api::Controllers::StemcellsController.new
+    run Bosh::Director::Api::Controllers::StemcellsController.new identity_provider
   end
 
   map '/task' do
-    run Bosh::Director::Api::Controllers::TaskController.new
+    run Bosh::Director::Api::Controllers::TaskController.new identity_provider
   end
 
   map '/users' do
-    run Bosh::Director::Api::Controllers::UsersController.new
+    run Bosh::Director::Api::Controllers::UsersController.new identity_provider
   end
 
   map '/compiled_package_groups' do
-    run Bosh::Director::Api::Controllers::CompiledPackagesController.new
+    run Bosh::Director::Api::Controllers::CompiledPackagesController.new identity_provider, compiled_package_group_manager
   end
 
   map '/locks' do
-    run Bosh::Director::Api::Controllers::LocksController.new
+    run Bosh::Director::Api::Controllers::LocksController.new identity_provider
   end
 end
 

data/lib/bosh/director.rb

@@ -131,6 +131,7 @@ require 'bosh/director/models/helpers/model_helper'
 
 require 'bosh/director/db_backup'
 require 'bosh/director/blobstores'
+require 'bosh/director/api/local_identity_provider'
 require 'bosh/director/app'
 
 module Bosh::Director
@@ -138,7 +139,6 @@ module Bosh::Director
 end
 
 require 'bosh/director/thread_pool'
-require 'bosh/director/api/controller_helpers'
 require 'bosh/director/api/controllers/backups_controller'
 require 'bosh/director/api/controllers/deployments_controller'
 require 'bosh/director/api/controllers/packages_controller'

data/lib/bosh/director/api/controllers/base_controller.rb

@@ -2,21 +2,19 @@ module Bosh::Director
   module Api
     module Controllers
       class BaseController < Sinatra::Base
-        PUBLIC_URLS = %w(/info)
-
         include ApiHelper
         include Http
         include DnsHelper
 
-        def initialize(*_)
-          super
+        def initialize(identity_provider)
+          super()
+          @identity_provider = identity_provider
           @deployment_manager = DeploymentManager.new
           @backup_manager = BackupManager.new
           @instance_manager = InstanceManager.new
           @resurrector_manager = ResurrectorManager.new
           @problem_manager = ProblemManager.new
           @property_manager = PropertyManager.new
-          @resource_manager = ResourceManager.new
           @release_manager = ReleaseManager.new
           @snapshot_manager = SnapshotManager.new
           @stemcell_manager = StemcellManager.new
@@ -41,23 +39,23 @@ module Bosh::Director
           end
         end
 
-        def authenticate(user, password)
-          if @user_manager.authenticate(user, password)
-            @user = user
-            true
-          else
-            false
-          end
+        def always_authenticated?
+          true
         end
 
-        helpers ControllerHelpers
-
         before do
           auth_provided = %w(HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION).detect do |key|
             request.env.has_key?(key)
           end
 
-          protected! if auth_provided || !PUBLIC_URLS.include?(request.path)
+          if auth_provided || always_authenticated?
+            begin
+              @user = @identity_provider.corroborate_user(request.env)
+            rescue AuthenticationError => e
+              response['WWW-Authenticate'] = 'Basic realm="BOSH Director"'
+              throw(:halt, [401, "Not authorized\n"])
+            end
+          end
         end
 
         after { headers('Date' => Time.now.rfc822) } # As thin doesn't inject date

data/lib/bosh/director/api/controllers/compiled_packages_controller.rb

@@ -11,9 +11,9 @@ require 'bosh/director/jobs/import_compiled_packages'
 module Bosh::Director
   module Api::Controllers
     class CompiledPackagesController < BaseController
-      def initialize(*args)
-        super
-        @compiled_package_group_manager = Api::CompiledPackageGroupManager.new
+      def initialize(identity_provider, compiled_package_group_manager)
+        super(identity_provider)
+        @compiled_package_group_manager = compiled_package_group_manager
       end
 
       post '/export', consumes: :json do

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -238,7 +238,6 @@ module Bosh::Director
         json_encode(problems)
       end
 
-      # Try to resolve a set of problems
       put '/:deployment/problems', :consumes => [:json] do
         payload = json_decode(request.body)
         start_task { @problem_manager.apply_resolutions(@user, params[:deployment], payload['resolutions']) }
@@ -246,7 +245,6 @@ module Bosh::Director
 
       put '/:deployment/scan_and_fix', :consumes => :json do
         jobs_json = json_decode(request.body)['jobs']
-        # payload: [['j1', 'i1'], ['j1', 'i2'], ['j2', 'i1'], ...]
         payload = convert_job_instance_hash(jobs_json)
 
         start_task { @problem_manager.scan_and_fix(@user, params[:deployment], payload) }
@@ -289,6 +287,14 @@ module Bosh::Director
 
         json_encode(errand_data)
       end
+
+      private
+      def convert_job_instance_hash(hash)
+        hash.reduce([]) do |jobs, kv|
+          job, indicies = kv
+          jobs + indicies.map { |index| [job, index] }
+        end
+      end
     end
   end
 end

data/lib/bosh/director/api/controllers/info_controller.rb

@@ -3,6 +3,10 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class InfoController < BaseController
+      def always_authenticated?
+        false
+      end
+
       get '/' do
         status = {
           'name' => Config.name,

data/lib/bosh/director/api/controllers/resources_controller.rb

@@ -3,6 +3,12 @@ require 'bosh/director/api/controllers/base_controller'
 module Bosh::Director
   module Api::Controllers
     class ResourcesController < BaseController
+
+      def initialize(identity_provider, resource_manager)
+        super(identity_provider)
+        @resource_manager = resource_manager
+      end
+
       get '/:id' do
         tmp_file = @resource_manager.get_resource_path(params[:id])
         send_disposable_file(tmp_file, :type => 'application/x-gzip')

data/lib/bosh/director/api/controllers/tasks_controller.rb

@@ -75,6 +75,20 @@ module Bosh::Director
           status(204)
         end
       end
+
+      private
+
+      def task_timeout?(task)
+        # Some of the old task entries might not have the checkpoint_time
+        unless task.checkpoint_time
+          task.checkpoint_time = Time.now
+          task.save
+        end
+
+        # If no checkpoint update in 3 cycles --> timeout
+        (task.state == 'processing' || task.state == 'cancelling') &&
+          (Time.now - task.checkpoint_time > Config.task_checkpoint_interval * 3)
+      end
     end
   end
 end

data/lib/bosh/director/api/local_identity_provider.rb

@@ -0,0 +1,22 @@
+module Bosh
+  module Director
+    module Api
+      class LocalIdentityProvider
+        def initialize(user_manager)
+          @user_manager = user_manager
+        end
+
+        def corroborate_user(request_env)
+          auth ||= Rack::Auth::Basic::Request.new(request_env)
+          raise AuthenticationError unless auth.provided? && auth.basic? && auth.credentials
+
+          if @user_manager.authenticate(*auth.credentials)
+            auth.credentials.first
+          else
+            raise AuthenticationError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/app.rb

@@ -29,7 +29,5 @@ module Bosh::Director
 
       @blobstores = Blobstores.new(config)
     end
-
-
   end
 end

data/lib/bosh/director/errors.rb

@@ -4,6 +4,7 @@ module Bosh::Director
   include Api::Http
 
   class ProblemHandlerError < StandardError; end
+  class AuthenticationError < StandardError; end
 
   # DirectorError is a generic exception for most of the errors originated
   # in BOSH Director.

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2847.0'
+    VERSION = '1.2849.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2847.0
+  version: 1.2849.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -446,7 +446,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  139553
+  4f117d
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -505,7 +505,6 @@ files:
 - lib/bosh/director/api/api_helper.rb
 - lib/bosh/director/api/backup_manager.rb
 - lib/bosh/director/api/compiled_package_group_manager.rb
-- lib/bosh/director/api/controller_helpers.rb
 - lib/bosh/director/api/controllers/backups_controller.rb
 - lib/bosh/director/api/controllers/base_controller.rb
 - lib/bosh/director/api/controllers/compiled_packages_controller.rb
@@ -525,6 +524,7 @@ files:
 - lib/bosh/director/api/http_constants.rb
 - lib/bosh/director/api/instance_lookup.rb
 - lib/bosh/director/api/instance_manager.rb
+- lib/bosh/director/api/local_identity_provider.rb
 - lib/bosh/director/api/problem_manager.rb
 - lib/bosh/director/api/property_manager.rb
 - lib/bosh/director/api/release_manager.rb

data/lib/bosh/director/api/controller_helpers.rb

@@ -1,34 +0,0 @@
-module Bosh::Director
-  module Api::ControllerHelpers
-    def task_timeout?(task)
-      # Some of the old task entries might not have the checkpoint_time
-      unless task.checkpoint_time
-        task.checkpoint_time = Time.now
-        task.save
-      end
-
-      # If no checkpoint update in 3 cycles --> timeout
-      (task.state == 'processing' || task.state == 'cancelling') &&
-        (Time.now - task.checkpoint_time > Config.task_checkpoint_interval * 3)
-    end
-
-    def protected!
-      unless authorized?
-        response['WWW-Authenticate'] = 'Basic realm="BOSH Director"'
-        throw(:halt, [401, "Not authorized\n"])
-      end
-    end
-
-    def authorized?
-      @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-      @auth.provided? && @auth.basic? && @auth.credentials && authenticate(*@auth.credentials)
-    end
-
-    def convert_job_instance_hash(hash)
-      hash.reduce([]) do |jobs, kv|
-        job, indicies = kv
-        jobs + indicies.map { |index| [job, index] }
-      end
-    end
-  end
-end