X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4f552c0187f8c31d94ff74485c57ef7f9888597e..21485541dec5b6df36aaba7d4c2a1e96ba65dec6:/services/api/app/controllers/arvados/v1/nodes_controller.rb diff --git a/services/api/app/controllers/arvados/v1/nodes_controller.rb b/services/api/app/controllers/arvados/v1/nodes_controller.rb index 4415a51163..3fbf5fcc6b 100644 --- a/services/api/app/controllers/arvados/v1/nodes_controller.rb +++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb @@ -1,12 +1,12 @@ class Arvados::V1::NodesController < ApplicationController - skip_before_filter :require_auth_scope_all, :only => :ping + skip_before_filter :require_auth_scope, :only => :ping skip_before_filter :find_object_by_uuid, :only => :ping skip_before_filter :render_404_if_no_object, :only => :ping def create @object = Node.new @object.save! - @object.start!(lambda { |h| arvados_v1_ping_node_url(h) }) + @object.start!(lambda { |h| ping_arvados_v1_node_url(h) }) show end @@ -15,7 +15,7 @@ class Arvados::V1::NodesController < ApplicationController end def ping - act_as_system_user do + act_as_system_user do @object = Node.where(uuid: (params[:id] || params[:uuid])).first if !@object return render_not_found @@ -23,7 +23,7 @@ class Arvados::V1::NodesController < ApplicationController @object.ping({ ip: params[:local_ipv4] || request.env['REMOTE_ADDR'], ping_secret: params[:ping_secret], ec2_instance_id: params[:instance_id] }) - if @object.info[:ping_secret] == params[:ping_secret] + if @object.info['ping_secret'] == params[:ping_secret] render json: @object.as_api_response(:superuser) else raise "Invalid ping_secret after ping"