[ARVADOS] updated: 2.1.0-2207-g3961f5bd4

Git user git at public.arvados.org
Mon Apr 4 18:49:28 UTC 2022


Summary of changes:
 doc/sdk/cli/subcommands.html.textile.liquid        |  34 ++--
 lib/controller/handler_test.go                     |  16 +-
 lib/controller/router/router.go                    |  17 ++
 sdk/go/arvados/client.go                           |  62 ++++++-
 sdk/go/arvados/client_test.go                      | 111 +++++++++----
 sdk/go/httpserver/logger.go                        |  23 ++-
 sdk/python/arvados/arvfile.py                      |  11 +-
 sdk/python/arvados/collection.py                   |  11 +-
 sdk/python/arvados/commands/get.py                 |  13 +-
 sdk/python/arvados/keep.py                         |  17 +-
 sdk/python/tests/test_arvfile.py                   |   3 +-
 sdk/python/tests/test_collections.py               |   2 +-
 .../app/controllers/arvados/v1/links_controller.rb |  19 ++-
 services/fuse/arvados_fuse/fusedir.py              |  12 +-
 services/fuse/tests/test_mount.py                  |   1 +
 services/keep-web/handler.go                       |   8 +
 tools/user-activity/arvados_user_activity/main.py  | 178 +++++++++++++++------
 17 files changed, 410 insertions(+), 128 deletions(-)

       via  3961f5bd4349fca6769fd4263d2f7fbe54e8bcaa (commit)
       via  1f430bb0fc2c0438b96641876e7c6bd38e2a7121 (commit)
       via  7182d14c2607e15581bb34814e22871e4b2383b0 (commit)
       via  28d591b7d82143f35016681b14dfc841b9ef04b2 (commit)
       via  50942bad39e2262a013879ba9c021c4dbf99f6ad (commit)
       via  94e82b3e5e65cc8792baf0b4d5dc80ae3721760e (commit)
       via  ef84e9726cc95b4a76050ef233bf1eda3651b9a9 (commit)
       via  f41534fcdfa95c282a04d64158f8a7d850637768 (commit)
       via  8fc40b6a38743207320d39ff6fcdfaba564bd983 (commit)
       via  fb1915d4370561a6e5dda1019e5813bbe91f600c (commit)
       via  0a9d4fa5043bd7291611c41588bdd3f0b70ede44 (commit)
       via  d3051d45df5ee760a05a84bf4d385799c4326477 (commit)
       via  aac0a284e71ab62b2537a6fdeab6d736deb9a1a9 (commit)
       via  33e4f1574f5bd14784c65863739478ff864732d2 (commit)
       via  2f5d5f03ef768d5bca81d52aa70cf7383fe449a2 (commit)
       via  d3aed8ca5cbf876cdd9f3fcb36f4b44191be2066 (commit)
       via  5b9ed64a169945cf2f9f2bb5932279aef4678f1d (commit)
       via  a46914b92aaae9b9d8eae4021d28360abf835a76 (commit)
       via  0e83a8971942943e79dfc1b064b5bac0cc82217f (commit)
       via  e634af988c6bbf23ebe2f6645360a1237182a85f (commit)
       via  08b093c536619aa2ccaa3456d1e4d03aac73714d (commit)
       via  9b5642f1d360ca1572dff5291c9be72913d4a623 (commit)
       via  348ef77de2aac95cdaff388da9602362ae269126 (commit)
       via  2d6c425e78bc5712c63b4ebecb05077b0e30da1f (commit)
       via  32c9b81e2c1bce19673c73cb14490f6e9dde0fc6 (commit)
       via  de266a3874ec6b9593dfbfcb1f0993d8ed289eb1 (commit)
       via  08d681a8b0aa1d4785ecbd97f40c0cc5c2cebb91 (commit)
       via  382074344ae9cae97739ec333203a7c688fbc5f3 (commit)
       via  c3c1f4261f61bc52dbc8fadad644520797b3f6a6 (commit)
       via  ba245c7a71e54de5b0a9ad0adb1f8ed0486e686e (commit)
       via  5ca906cc875a1debfde1123e461b60411e152b33 (commit)
       via  8f0f3b495d0c715cc57d0d384bc5839acf9ece3f (commit)
       via  15661585c028bedf752603b37cab07746209c3cc (commit)
       via  d89f3c32c8c98d7f9a28e796358645683f0f66c9 (commit)
       via  f8819df5b2fb49e42b60a90656fcbe228208388d (commit)
       via  5698689547f38b7a93e7ef6d313a627934124832 (commit)
       via  dffe2b5c67da2086bde865a0005b6b908b074e0c (commit)
      from  d1b1a36ca2c71c7bc60f603d43755ba828af3666 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3961f5bd4349fca6769fd4263d2f7fbe54e8bcaa
Merge: 1f430bb0f 7182d14c2
Author: Tom Clegg <tom at curii.com>
Date:   Mon Apr 4 14:49:11 2022 -0400

    18865: Merge branch 'main'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 1f430bb0fc2c0438b96641876e7c6bd38e2a7121
Author: Tom Clegg <tom at curii.com>
Date:   Mon Apr 4 14:48:19 2022 -0400

    18865: Rearrange code & update comments for clarity.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/app/controllers/arvados/v1/links_controller.rb b/services/api/app/controllers/arvados/v1/links_controller.rb
index 64e070999..7716a3d5c 100644
--- a/services/api/app/controllers/arvados/v1/links_controller.rb
+++ b/services/api/app/controllers/arvados/v1/links_controller.rb
@@ -57,14 +57,17 @@ class Arvados::V1::LinksController < ApplicationController
       # by UUID, then check whether (a) its tail_uuid is the current
       # user or (b) its head_uuid is an object the current_user
       # can_manage.
-      @object = Link.unscoped.where(uuid: params[:uuid]).first
-      if @object && @object.link_class != 'permission'
-        # Throw this out and re-fetch using generic permission query
-        @object = nil
+      link = Link.unscoped.where(uuid: params[:uuid]).first
+      if link && link.link_class != 'permission'
+        # Not a permission link. Re-fetch using generic
+        # permission-filtering query.
         super
-      elsif @object &&
-         current_user.uuid != @object.tail_uuid &&
-         !current_user.can?(manage: @object.head_uuid)
+      elsif link && (current_user.uuid == link.tail_uuid ||
+                     current_user.can?(manage: link.head_uuid))
+        # Permission granted.
+        @object = link
+      else
+        # Permission denied, i.e., link is invisible => 404.
         @object = nil
       end
     end
@@ -122,6 +125,8 @@ class Arvados::V1::LinksController < ApplicationController
           if k[1] == '=' && current_user.can?(manage: k[2])
             @objects = Link.unscoped
           elsif k[1] == 'in'
+            # Modify the filter operand element (k[2]) in place,
+            # removing any non-permitted UUIDs.
             k[2].select! do |head_uuid|
               current_user.can?(manage: head_uuid)
             end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list