[arvados] updated: 2.6.0-572-gda766e40d5

[git repository hosting]

Summary of changes:
 doc/admin/scoped-tokens.html.textile.liquid        |   2 +
 doc/admin/upgrading.html.textile.liquid            |   4 +
 .../api_client_authorizations.html.textile.liquid  |   9 +
 doc/api/tokens.html.textile.liquid                 |   4 +-
 services/api/app/middlewares/arvados_api_token.rb  |  49 ++++-
 .../api/app/models/api_client_authorization.rb     | 211 ++++++++++++---------
 .../api_client_authorizations_controller_test.rb   |  13 ++
 services/api/test/integration/remote_user_test.rb  |  88 ++++++---
 8 files changed, 257 insertions(+), 123 deletions(-)

       via  da766e40d5119f23689a3d1859fd1473b4d7ad5f (commit)
       via  73931b1077dbf1f6cb195dfc427b1a7a6fe89a33 (commit)
       via  8d6c085a1a7f0a7895245949a250d11d15117cf9 (commit)
       via  afac7abd6f7ee614cd1bbe7413d196f7c149387e (commit)
       via  9717f88d29310067fa70e19fb9afb3679c036bc4 (commit)
       via  17c1f9f6bd6eea9321d36a45b9dfc1ca1f4fb51d (commit)
       via  5de32fb197f6b98d0722c2aacc0bfb8f63a6516f (commit)
       via  1eb8ce5b0258f71d936ca12f71986c94e183e268 (commit)
      from  aceb1f665394d84ec238d6654b5447a37c2bc3b3 (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 da766e40d5119f23689a3d1859fd1473b4d7ad5f
Merge: aceb1f6653 73931b1077
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Sep 5 16:50:09 2023 -0400

    Merge branch '20750-sharing-token-scopes'
    
    Closes #20750.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>


commit 73931b1077dbf1f6cb195dfc427b1a7a6fe89a33
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Sep 5 16:46:54 2023 -0400

    20750/20927: Add TODO about network error handling
    
    The commit message for 9717f88d29310067fa70e19fb9afb3679c036bc4 says:
    
    > This may also provide better behavior in cases of network hiccups or
    > other remote server turbulence.
    
    This was written with the expectation that those problems would raise
    `HTTPClient::BadResponseError`. That was mistaken. Those problems
    actually raise lower-level socket exceptions instead.
    
    We now have a ticket to improve the error handling here. It's out of
    scope for #20750, since the error handling is no worse than it was
    before the branch.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb
index 19d3cc687f..c149ffc329 100644
--- a/services/api/app/models/api_client_authorization.rb
+++ b/services/api/app/models/api_client_authorization.rb
@@ -301,6 +301,8 @@ class ApiClientAuthorization < ArvadosModel
         self.res.status_code
       end
       raise
+    # TODO #20927: Catch network exceptions and assign a 5xx status to them so
+    # the client knows they're a temporary problem.
     rescue => e
       Rails.logger.warn "error getting remote token details for #{token.inspect}: #{e}"
       return nil
@@ -336,6 +338,8 @@ class ApiClientAuthorization < ArvadosModel
         end
         raise
       end
+    # TODO #20927: Catch network exceptions and assign a 5xx status to them so
+    # the client knows they're a temporary problem.
     rescue => e
       Rails.logger.warn "getting remote user with token #{token.inspect} failed: #{e}"
     else

commit 8d6c085a1a7f0a7895245949a250d11d15117cf9
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Sep 5 16:46:48 2023 -0400

    20750: Fix comment typo
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/services/api/app/middlewares/arvados_api_token.rb b/services/api/app/middlewares/arvados_api_token.rb
index 8d88d45875..18140e57fe 100644
--- a/services/api/app/middlewares/arvados_api_token.rb
+++ b/services/api/app/middlewares/arvados_api_token.rb
@@ -82,7 +82,7 @@ class ArvadosApiToken
     Thread.current[:user] = auth.andand.user
 
     if auth.nil? and not remote_errcodes.empty?
-      # If we failed to the validate any tokens because of remote validation
+      # If we failed to validate any tokens because of remote validation
       # errors, pass those on to the client. This code is functionally very
       # similar to ApplicationController#render_error, but the implementation
       # is very different because we're a Rack middleware, not in

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


hooks/post-receive
--