[ARVADOS] updated: 2.1.0-1514-g169a77559

Git user git at public.arvados.org
Thu Oct 21 20:39:39 UTC 2021


Summary of changes:
 services/api/script/get_anonymous_user_token.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

  discards  841e704b5b3277b4fd21c05628afb7f9e6e94c65 (commit)
       via  169a7755916e1f3227ab9c3959447149ecb99503 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (841e704b5b3277b4fd21c05628afb7f9e6e94c65)
            \
             N -- N -- N (169a7755916e1f3227ab9c3959447149ecb99503)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 169a7755916e1f3227ab9c3959447149ecb99503
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Oct 21 16:27:59 2021 -0400

    18288: when storing the anonymous user token, make sure to clear the
           expires_at field.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/api/script/get_anonymous_user_token.rb b/services/api/script/get_anonymous_user_token.rb
index 8775ae595..4c3ca34f0 100755
--- a/services/api/script/get_anonymous_user_token.rb
+++ b/services/api/script/get_anonymous_user_token.rb
@@ -58,6 +58,9 @@ def create_api_client_auth(supplied_token=nil)
 
   api_client_auth = ApiClientAuthorization.where(attr).first
   if !api_client_auth
+    # The anonymous user token should never expire but we are not allowed to
+    # set :expires_at to nil, so we set it to 1000 years in the future.
+    attr[:expires_at] = Time.now + 1000.years
     api_client_auth = ApiClientAuthorization.create!(attr)
   end
   api_client_auth

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list