projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12409-cwl-v1.2' refs #12409
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
containers_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/containers_controller.rb
b/services/api/app/controllers/arvados/v1/containers_controller.rb
index e1a8a019aa094374a554e40be6b602c7a734c17c..041f55947229d4d6d802de348e5561dce313c96e 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/containers_controller.rb
@@
-10,28
+10,26
@@
class Arvados::V1::ContainersController < ApplicationController
accept_attribute_as_json :command, Array
accept_attribute_as_json :scheduling_parameters, Hash
accept_attribute_as_json :command, Array
accept_attribute_as_json :scheduling_parameters, Hash
- skip_before_
filter
:find_object_by_uuid, only: [:current]
- skip_before_
filter
:render_404_if_no_object, only: [:current]
+ skip_before_
action
:find_object_by_uuid, only: [:current]
+ skip_before_
action
:render_404_if_no_object, only: [:current]
def auth
if @object.locked_by_uuid != Thread.current[:api_client_authorization].uuid
raise ArvadosModel::PermissionDeniedError.new("Not locked by your token")
end
def auth
if @object.locked_by_uuid != Thread.current[:api_client_authorization].uuid
raise ArvadosModel::PermissionDeniedError.new("Not locked by your token")
end
- if @object.auth.nil?
- cr = ContainerRequest.
- where('container_uuid=? and priority>0', self.uuid).
- order('priority desc').
- first
- @object = ApiClientAuthorization.validate(token: cr.runtime_token)
- else
+ if @object.runtime_token.nil?
@object = @object.auth
@object = @object.auth
+ else
+ @object = ApiClientAuthorization.validate(token: @object.runtime_token)
+ if @object.nil?
+ raise ArvadosModel::PermissionDeniedError.new("Invalid runtime_token")
+ end
end
show
end
def update
@object.with_lock do
end
show
end
def update
@object.with_lock do
- @object.reload
super
end
end
super
end
end
@@
-40,7
+38,7
@@
class Arvados::V1::ContainersController < ApplicationController
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
- @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid)
+ @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid
, :lock_count
)
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end
@@
-59,20
+57,18
@@
class Arvados::V1::ContainersController < ApplicationController
if Thread.current[:api_client_authorization].nil?
send_error("Not logged in", status: 401)
else
if Thread.current[:api_client_authorization].nil?
send_error("Not logged in", status: 401)
else
- c = Container.where(auth_uuid: Thread.current[:api_client_authorization].uuid).first
- if
c
.nil?
+ @object = Container.for_current_token
+ if
@object
.nil?
send_error("Token is not associated with a container.", status: 404)
else
send_error("Token is not associated with a container.", status: 404)
else
- @object = c
show
end
end
end
def secret_mounts
show
end
end
end
def secret_mounts
- if @object &&
- @object.auth_uuid &&
- @object.auth_uuid == Thread.current[:api_client_authorization].uuid
+ c = Container.for_current_token
+ if @object && c && @object.uuid == c.uuid
send_json({"secret_mounts" => @object.secret_mounts})
else
send_error("Token is not associated with this container.", status: 403)
send_json({"secret_mounts" => @object.secret_mounts})
else
send_error("Token is not associated with this container.", status: 403)