projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12032: Use permission_view in subquery to filter objects readable by user.
[arvados.git]
/
services
/
api
/
app
/
models
/
user.rb
diff --git
a/services/api/app/models/user.rb
b/services/api/app/models/user.rb
index bca1eef7261f97ceabf6e95c828fb07aaae167b2..c8c9bfb6ac1a26b8200f8feebf6f1749f2856636 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'can_be_an_owner'
class User < ArvadosModel
require 'can_be_an_owner'
class User < ArvadosModel
@@
-6,6
+10,11
@@
class User < ArvadosModel
include CommonApiTemplate
include CanBeAnOwner
include CommonApiTemplate
include CanBeAnOwner
+ # To avoid upgrade bugs, when changing the permission cache value
+ # format, change PERM_CACHE_PREFIX too:
+ PERM_CACHE_PREFIX = "perm_v20170725_"
+ PERM_CACHE_TTL = 172800
+
serialize :prefs, Hash
has_many :api_client_authorizations
validates(:username,
serialize :prefs, Hash
has_many :api_client_authorizations
validates(:username,
@@
-137,7
+146,7
@@
class User < ArvadosModel
timestamp = DbCurrentTime::db_current_time.to_i if timestamp.nil?
connection.execute "NOTIFY invalidate_permissions_cache, '#{timestamp}'"
else
timestamp = DbCurrentTime::db_current_time.to_i if timestamp.nil?
connection.execute "NOTIFY invalidate_permissions_cache, '#{timestamp}'"
else
- Rails.cache.delete_matched(/^
groups_for_user_
/)
+ Rails.cache.delete_matched(/^
#{PERM_CACHE_PREFIX}
/)
end
end
end
end
@@
-146,14
+155,14
@@
class User < ArvadosModel
install_view('permission')
all_perms = {}
ActiveRecord::Base.connection.
install_view('permission')
all_perms = {}
ActiveRecord::Base.connection.
- exec_query('SELECT user_uuid, target_owner_uuid, max(perm_level)
+ exec_query('SELECT user_uuid, target_owner_uuid, max(perm_level)
, max(trashed)
FROM permission_view
WHERE target_owner_uuid IS NOT NULL
GROUP BY user_uuid, target_owner_uuid',
# "name" arg is a query label that appears in logs:
"all_group_permissions",
FROM permission_view
WHERE target_owner_uuid IS NOT NULL
GROUP BY user_uuid, target_owner_uuid',
# "name" arg is a query label that appears in logs:
"all_group_permissions",
- ).rows.each do |user_uuid, group_uuid, max_p_val|
- all_perms[user_uuid] ||= {}
+ ).rows.each do |user_uuid, group_uuid, max_p_val
, trashed
|
+ all_perms[user_uuid] ||= {
user_uuid => {:read => true, :write => true, :manage => true}
}
all_perms[user_uuid][group_uuid] = PERMS_FOR_VAL[max_p_val.to_i]
end
all_perms
all_perms[user_uuid][group_uuid] = PERMS_FOR_VAL[max_p_val.to_i]
end
all_perms
@@
-165,9
+174,9
@@
class User < ArvadosModel
def calculate_group_permissions
self.class.install_view('permission')
def calculate_group_permissions
self.class.install_view('permission')
- group_perms = {}
+ group_perms = {
self.uuid => {:read => true, :write => true, :manage => true}
}
ActiveRecord::Base.connection.
ActiveRecord::Base.connection.
- exec_query('SELECT target_owner_uuid, max(perm_level)
+ exec_query('SELECT target_owner_uuid, max(perm_level)
, max(trashed)
FROM permission_view
WHERE user_uuid = $1
AND target_owner_uuid IS NOT NULL
FROM permission_view
WHERE user_uuid = $1
AND target_owner_uuid IS NOT NULL
@@
-176,10
+185,10
@@
class User < ArvadosModel
"group_permissions for #{uuid}",
# "binds" arg is an array of [col_id, value] for '$1' vars:
[[nil, uuid]],
"group_permissions for #{uuid}",
# "binds" arg is an array of [col_id, value] for '$1' vars:
[[nil, uuid]],
-
).rows.each do |group_uuid, max_p_val
|
+
).rows.each do |group_uuid, max_p_val, trashed
|
group_perms[group_uuid] = PERMS_FOR_VAL[max_p_val.to_i]
end
group_perms[group_uuid] = PERMS_FOR_VAL[max_p_val.to_i]
end
- Rails.cache.write "
groups_for_user_#{self.uuid}", group_perms
+ Rails.cache.write "
#{PERM_CACHE_PREFIX}#{self.uuid}", group_perms, expires_in: PERM_CACHE_TTL
group_perms
end
group_perms
end
@@
-187,12
+196,12
@@
class User < ArvadosModel
# and perm_hash[:write] are true if this user can read and write
# objects owned by group_uuid.
def group_permissions
# and perm_hash[:write] are true if this user can read and write
# objects owned by group_uuid.
def group_permissions
- r = Rails.cache.read "
groups_for_user_
#{self.uuid}"
+ r = Rails.cache.read "
#{PERM_CACHE_PREFIX}
#{self.uuid}"
if r.nil?
if Rails.configuration.async_permissions_update
while r.nil?
sleep(0.1)
if r.nil?
if Rails.configuration.async_permissions_update
while r.nil?
sleep(0.1)
- r = Rails.cache.read "
groups_for_user_
#{self.uuid}"
+ r = Rails.cache.read "
#{PERM_CACHE_PREFIX}
#{self.uuid}"
end
else
r = calculate_group_permissions
end
else
r = calculate_group_permissions