X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/33dd05d22ecae6f9028692433096a8e3eca5c71b..30d37841e979eacd15f11cbaf608d507af379a86:/apps/workbench/app/controllers/users_controller.rb diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb index c8c0016ffd..8cfc2c10f1 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -1,7 +1,11 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class UsersController < ApplicationController skip_around_filter :require_thread_api_token, only: :welcome - skip_before_filter :check_user_agreements, only: [:welcome, :inactive] - skip_before_filter :check_user_profile, only: [:welcome, :inactive, :profile] + skip_before_filter :check_user_agreements, only: [:welcome, :inactive, :link_account, :merge] + skip_before_filter :check_user_profile, only: [:welcome, :inactive, :profile, :link_account, :merge] skip_before_filter :find_object_by_uuid, only: [:welcome, :activity, :storage] before_filter :ensure_current_user_is_admin, only: [:sudo, :unsetup, :setup] @@ -9,7 +13,11 @@ class UsersController < ApplicationController if params[:uuid] == current_user.uuid respond_to do |f| f.html do - redirect_to(params[:return_to] || project_path(params[:uuid])) + if request.url.include?("/users/#{current_user.uuid}") + super + else + redirect_to(params[:return_to] || project_path(params[:uuid])) + end end end else @@ -98,6 +106,7 @@ class UsersController < ApplicationController filter([[:object_uuid, '=', u.uuid], [:event_type, '=', 'user-storage-report']]). order(:created_at => :desc). + with_count('none'). limit(1) storage_log.each do |log_entry| # We expect this block to only execute once since we specified limit(1) @@ -204,27 +213,28 @@ class UsersController < ApplicationController if params['openid_prefix'] && params['openid_prefix'].size>0 setup_params[:openid_prefix] = params['openid_prefix'] end - if params['repo_name'] && params['repo_name'].size>0 - setup_params[:repo_name] = params['repo_name'] - end if params['vm_uuid'] && params['vm_uuid'].size>0 setup_params[:vm_uuid] = params['vm_uuid'] end - if User.setup setup_params + setup_resp = User.setup setup_params + if setup_resp + vm_link = nil + setup_resp[:items].each do |item| + if item[:head_kind] == "arvados#virtualMachine" + vm_link = item + break + end + end if params[:groups] - new_groups = params[:groups].split(',').map(&:strip).compact.select{|i| !i.to_s.empty?} - prev_groups = params[:prev_groups].split(',').map(&:strip).compact.select{|i| !i.to_s.empty?} - if new_groups != prev_groups - can_login_perms = Link.where(tail_uuid: params[:user_email], - head_kind: 'arvados#user', - link_class: 'permission', - name: 'can_login') - if can_login_perms.any? - perm = can_login_perms.first - props = perm.properties + new_groups = params[:groups].split(',').map(&:strip).select{|i| !i.empty?} + if vm_link and new_groups != vm_link[:properties][:groups] + vm_login_link = Link.where(uuid: vm_link[:uuid]) + if vm_login_link.items_available > 0 + link = vm_login_link.results.first + props = link.properties props[:groups] = new_groups - perm.save! + link.save! end end end @@ -250,35 +260,9 @@ class UsersController < ApplicationController end end - def manage_account - # repositories current user can read / write - repo_links = Link. - filter([['head_uuid', 'is_a', 'arvados#repository'], - ['tail_uuid', '=', current_user.uuid], - ['link_class', '=', 'permission'], - ]) - - owned_repositories = Repository.where(owner_uuid: current_user.uuid) - - @my_repositories = (Repository.where(uuid: repo_links.collect(&:head_uuid)) | - owned_repositories). - uniq { |repo| repo.uuid } - - - @repo_writable = {} - repo_links.each do |link| - if link.name.in? ['can_write', 'can_manage'] - @repo_writable[link.head_uuid] = link.name - end - end - - owned_repositories.each do |repo| - @repo_writable[repo.uuid] = 'can_manage' - end - - # virtual machines the current user can login into + def virtual_machines @my_vm_logins = {} - Link.where(tail_uuid: current_user.uuid, + Link.where(tail_uuid: @object.uuid, link_class: 'permission', name: 'can_login'). each do |perm_link| @@ -288,13 +272,10 @@ class UsersController < ApplicationController end end @my_virtual_machines = VirtualMachine.where(uuid: @my_vm_logins.keys) + end - # current user's ssh keys - @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid) - - respond_to do |f| - f.html { render template: 'users/manage_account' } - end + def ssh_keys + @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: @object.uuid) end def add_ssh_key_popup @@ -336,6 +317,11 @@ class UsersController < ApplicationController RequestShellAccessReporter.send_request(current_user, params).deliver end + def merge + User.merge params[:new_user_token], params[:direction] + redirect_to "/" + end + protected def find_current_links user @@ -346,16 +332,14 @@ class UsersController < ApplicationController end # oid login perm - can_login_perms = Link.where(tail_uuid: user.email, + oid_login_perms = Link.where(tail_uuid: user.email, head_kind: 'arvados#user', link_class: 'permission', name: 'can_login') - if can_login_perms.any? - perm_properties = can_login_perms.first.properties - current_selections[:identity_url_prefix] = perm_properties[:identity_url_prefix] - current_selections[:groups] = perm_properties[:groups].andand.join(', ') -@current_groups = current_selections[:groups] + if oid_login_perms.any? + prefix_properties = oid_login_perms.first.properties + current_selections[:identity_url_prefix] = prefix_properties[:identity_url_prefix] end # repo perm @@ -378,8 +362,10 @@ class UsersController < ApplicationController link_class: 'permission', name: 'can_login') if vm_login_perms.any? - vm_uuid = vm_login_perms.first.head_uuid + vm_perm = vm_login_perms.first + vm_uuid = vm_perm.head_uuid current_selections[:vm_uuid] = vm_uuid + current_selections[:groups] = vm_perm.properties[:groups].andand.join(', ') end return current_selections