X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/02224e217ccb836e9a880057a8ece98c744aae34..848940a94d956c26297164cd6c7a51785db82726:/services/api/app/controllers/arvados/v1/users_controller.rb diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb index 6fe1cdf5dd..133df0f62c 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -1,4 +1,9 @@ class Arvados::V1::UsersController < ApplicationController + skip_before_filter :find_object_by_uuid, only: + [:activate, :event_stream, :current, :system] + skip_before_filter :render_404_if_no_object, only: + [:activate, :event_stream, :current, :system] + def current @object = current_user show @@ -29,7 +34,57 @@ class Arvados::V1::UsersController < ApplicationController if current_user.andand.is_admin channel = params[:uuid] || channel end - self.response.headers['Last-Modified'] = Time.now.ctime.to_s - self.response_body = ChannelStreamer.new(channel: channel) + if client_accepts_plain_text_stream + self.response.headers['Last-Modified'] = Time.now.ctime.to_s + self.response_body = ChannelStreamer.new(channel: channel) + else + render json: { + href: url_for(uuid: channel), + comment: ('To retrieve the event stream as plain text, ' + + 'use a request header like "Accept: text/plain"') + } + end + end + + def activate + if current_user.andand.is_admin && params[:uuid] + @object = User.find params[:uuid] + else + @object = current_user + end + if not @object.is_active + if not (current_user.is_admin or @object.is_invited) + logger.warn "User #{@object.uuid} called users.activate " + + "but is not invited" + raise ArgumentError.new "Cannot activate without being invited." + end + act_as_system_user do + required_uuids = Link.where(owner_uuid: system_user_uuid, + link_class: 'signature', + name: 'require', + tail_uuid: system_user_uuid, + head_kind: 'arvados#collection'). + collect(&:head_uuid) + signed_uuids = Link.where(owner_uuid: system_user_uuid, + link_class: 'signature', + name: 'click', + tail_kind: 'arvados#user', + tail_uuid: @object.uuid, + head_kind: 'arvados#collection', + head_uuid: required_uuids). + collect(&:head_uuid) + todo_uuids = required_uuids - signed_uuids + if todo_uuids == [] + @object.update_attributes is_active: true + logger.info "User #{@object.uuid} activated" + else + logger.warn "User #{@object.uuid} called users.activate " + + "before signing agreements #{todo_uuids.inspect}" + raise ArvadosModel::PermissionDeniedError.new \ + "Cannot activate without user agreements #{todo_uuids.inspect}." + end + end + end + show end end