From e1c500fb5384ea9120c35c775a8dff482a15984f Mon Sep 17 00:00:00 2001 From: Tal Garfinkel Date: Tue, 1 Nov 2011 18:23:25 -0700 Subject: [PATCH] fix to nginx upload path in cloudcontroller to support situation where there is no uploaded file i.e. all bits already in the resources pool. Change-Id: I9b4e0396b0461cc6bcc084dfec37f36a0b7517d2 --- .../app/controllers/apps_controller.rb | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cloud_controller/app/controllers/apps_controller.rb b/cloud_controller/app/controllers/apps_controller.rb index d9c0d5319..f4089b6a0 100644 --- a/cloud_controller/app/controllers/apps_controller.rb +++ b/cloud_controller/app/controllers/apps_controller.rb @@ -53,18 +53,21 @@ def valid_upload_path?(path) end def get_uploaded_file + file = nil if CloudController.use_nginx path = params[:application_path] - if not valid_upload_path?(path) - CloudController.logger.warn "Illegal path: #{path}, passed to cloud_controller - something is badly misconfigured or insecure!!!" - raise CloudError.new(CloudError::FORBIDDEN) - end - wrapper_class = Class.new do - attr_accessor :path + if path != nil + if not valid_upload_path?(path) + CloudController.logger.warn "Illegal path: #{path}, passed to cloud_controller + something is badly misconfigured or insecure!!!" + raise CloudError.new(CloudError::FORBIDDEN) + end + wrapper_class = Class.new do + attr_accessor :path + end + file = wrapper_class.new + file.path = path end - file = wrapper_class.new - file.path = path else file = params[:application] end