bosh-director 1.2999.0 → 1.3000.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314dd17fbbb059aaaae50d56efba07c3b0893445
-  data.tar.gz: 89dd10046a5b22f8e1424878c432cfc69f6d51da
+  metadata.gz: ba2ff6a9c8c7c521d934f1f35d503ca599c61716
+  data.tar.gz: 5cecae6a2b9ad5d9276a02f22cfaced254f93318
 SHA512:
-  metadata.gz: 6477ca1a6659b9661203e54493c553fd1e4c61a18f28431b8ccb373273d136c8a967891f86437795bb94555af1d7c80eb9d7eb5faa9a5db52b1e9547c2c708fd
-  data.tar.gz: d492ee6cc46b18579cd1f0094e5b5f35e82b4a986badab2a5b5b7768011c3338c5c424cb60c849a179006087cea79b851dbf32d268f6840696a900870edbc246
+  metadata.gz: 32db876c4d563a6118289e956926b957c636bbe9ae00636f723b3adf2832a5d880b779b50b7ba2c10bd55d9d9849066c17e1dc0500babd85bd8d728d5b101b81
+  data.tar.gz: 021630149470426da1313f8af9e008ca2a4724dff5f144f26e2b4ff8459359fefb0ca1650de4e1a7c0e7d57b560dcb273638339af8173e57c4c2aa591d6684ea

data/lib/bosh/director.rb

@@ -112,6 +112,7 @@ require 'bosh/director/jobs/delete_deployment_snapshots'
 require 'bosh/director/jobs/delete_release'
 require 'bosh/director/jobs/delete_snapshots'
 require 'bosh/director/jobs/delete_stemcell'
+require 'bosh/director/jobs/export_release'
 require 'bosh/director/jobs/update_deployment'
 require 'bosh/director/jobs/update_release'
 require 'bosh/director/jobs/update_stemcell'

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

@@ -42,6 +42,21 @@ module Bosh::Director
         json_encode(releases)
       end
 
+      post '/export', consumes: :json do
+        body_params = JSON.parse(request.body.read)
+
+        deployment_name = body_params['deployment_name']
+        release_name = body_params['release_name']
+        release_version = body_params['release_version']
+        stemcell_os = body_params['stemcell_os']
+        stemcell_version = body_params['stemcell_version']
+
+        task = @release_manager.export_release(
+            current_user, deployment_name, release_name, release_version, stemcell_os, stemcell_version)
+
+        redirect "/tasks/#{task.id}"
+      end
+
       get '/:name', scope: :read do
         name = params[:name].to_s.strip
         release = @release_manager.find_by_name(name)

data/lib/bosh/director/api/extensions/scoping.rb

@@ -4,7 +4,7 @@ module Bosh::Director
       module Scoping
         module Helpers
           def current_user
-            @user
+            @user.username if @user
           end
         end
 
@@ -29,12 +29,12 @@ module Bosh::Director
 
             if auth_provided
               begin
-                @user = identity_provider.corroborate_user(request.env, scope)
+                @user = identity_provider.get_user(request.env)
               rescue AuthenticationError
               end
             end
 
-            if requires_authentication? && @user.nil?
+            if (@user.nil? || !@user.has_access?(scope)) && requires_authentication?
               response['WWW-Authenticate'] = 'Basic realm="BOSH Director"'
               throw(:halt, [401, "Not authorized\n"])
             end

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

@@ -18,16 +18,32 @@ module Bosh
           {'type' => 'basic', 'options' => {}}
         end
 
-        def corroborate_user(request_env, _)
+        def get_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
+            username = auth.credentials.first
+            password = auth.credentials[1]
+            LocalUser.new(@user_manager, username, password)
           else
             raise AuthenticationError
           end
         end
+
+        class LocalUser
+
+          attr_reader :username
+
+          def initialize(user_manager, username, password)
+            @user_manager = user_manager
+            @username = username
+            @password = password
+          end
+
+          def has_access?(_)
+            @user_manager.authenticate(@username, @password)
+          end
+        end
       end
     end
   end

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

@@ -62,6 +62,14 @@ module Bosh::Director
       def delete_release(username, release, options = {})
         JobQueue.new.enqueue(username, Jobs::DeleteRelease, "delete release: #{release.name}", [release.name, options])
       end
+
+      def export_release(username, deployment_name, release_name, release_version, stemcell_os, stemcell_version)
+        JobQueue.new.enqueue(
+            username,
+            Jobs::ExportRelease,
+            "export release: #{release_name}/#{release_version} for #{stemcell_os}/#{stemcell_version}",
+            [deployment_name, release_name, release_version, stemcell_os, stemcell_version])
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Bosh
         def initialize(options, director_uuid_provider)
           @url = options.fetch('url')
           Config.logger.debug "Initializing UAA Identity provider with url #{@url}"
-          @director_uuid_provider = director_uuid_provider
+          @director_uuid = director_uuid_provider.uuid
           @token_coder = CF::UAA::TokenCoder.new(skey: options.fetch('symmetric_key', nil), pkey: options.fetch('public_key', nil), scope: [])
         end
 
@@ -24,38 +24,50 @@ module Bosh
           }
         end
 
-        def corroborate_user(request_env, requested_access)
+        def get_user(request_env)
           auth_header = request_env['HTTP_AUTHORIZATION']
           token = @token_coder.decode(auth_header)
-          validate_access(token, requested_access)
-
-          token['user_name'] || token['client_id']
+          UaaUser.new(token, @director_uuid)
         rescue CF::UAA::DecodeError, CF::UAA::AuthError => e
           raise AuthenticationError, e.message
         end
+      end
 
-        private
+      class UaaUser
+
+        attr_reader :token
+
+        def initialize(token, director_uuid)
+          @token = token
+          @director_uuid = director_uuid
+        end
 
-        def validate_access(token, requested_access)
-          if token['scope']
-            if token_has_admin_scope?(token['scope'])
-              return
+        def username
+          @token['user_name'] || @token['client_id']
+        end
+
+        def has_access?(requested_access)
+          if @token['scope']
+            if token_has_admin_scope?(@token['scope'])
+              return true
             end
 
-            if requested_access == :read && token_has_read_scope?(token['scope'])
-              return
+            if requested_access == :read && token_has_read_scope?(@token['scope'])
+              return true
             end
           end
 
-          raise AuthenticationError, 'Requested access is not allowed by the scope'
+          false
         end
 
+        private
+
         def token_has_read_scope?(token_scope)
-          token_scope.include?('bosh.read') || token_scope.include?("bosh.#{@director_uuid_provider.uuid}.read")
+          token_scope.include?('bosh.read') || token_scope.include?("bosh.#{@director_uuid}.read")
         end
 
         def token_has_admin_scope?(token_scope)
-          token_scope.include?('bosh.admin') || token_scope.include?("bosh.#{@director_uuid_provider.uuid}.admin")
+          token_scope.include?('bosh.admin') || token_scope.include?("bosh.#{@director_uuid}.admin")
         end
       end
     end

data/lib/bosh/director/jobs/export_release.rb

@@ -0,0 +1,26 @@
+require 'securerandom'
+require 'common/version/release_version'
+
+module Bosh::Director
+  module Jobs
+    class ExportRelease < BaseJob
+      include LockHelper
+
+      @queue = :normal
+
+      def self.job_type
+        :export_release
+      end
+
+      def initialize(deployment_name, release_name, release_version, stemcell_os, stemcell_version, options = {})
+      #   DO some initilization
+        logger.info("we are in ExportRelease:initialize #{release_name}/#{release_version} #{stemcell_os}/#{stemcell_version}")
+      end
+
+      # @return [void]
+      def perform
+        logger.info("we are in ExportRelease:perform")
+      end
+    end
+  end
+end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2999.0'
+    VERSION = '1.3000.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2999.0
+  version: 1.3000.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-24 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.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2999.0
+        version: 1.3000.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  321dd5
+  277382
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -767,6 +767,7 @@ files:
 - lib/bosh/director/jobs/delete_release.rb
 - lib/bosh/director/jobs/delete_snapshots.rb
 - lib/bosh/director/jobs/delete_stemcell.rb
+- lib/bosh/director/jobs/export_release.rb
 - lib/bosh/director/jobs/fetch_logs.rb
 - lib/bosh/director/jobs/import_compiled_packages.rb
 - lib/bosh/director/jobs/run_errand.rb