X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/01f52958d899c62b0b1f9a39fda960136835850c..82d7893e9b0816896885b3486b5e388002ec8bcb:/services/api/app/middlewares/arvados_api_token.rb

diff --git a/services/api/app/middlewares/arvados_api_token.rb b/services/api/app/middlewares/arvados_api_token.rb
index 6dcadb01e2..acdc485811 100644
--- a/services/api/app/middlewares/arvados_api_token.rb
+++ b/services/api/app/middlewares/arvados_api_token.rb
@@ -15,63 +15,53 @@ class ArvadosApiToken
   end
 
   def call env
-    # First, clean up just in case we have a multithreaded server and thread
-    # local variables are still set from a prior request.  Also useful for
-    # tests that call this code to set up the environment.
-    Thread.current[:supplied_token] = nil
-    Thread.current[:api_client_ip_address] = nil
-    Thread.current[:api_client_authorization] = nil
-    Thread.current[:api_client_uuid] = nil
-    Thread.current[:api_client] = nil
-    Thread.current[:user] = nil
-
     request = Rack::Request.new(env)
     params = request.params
     remote_ip = env["action_dispatch.remote_ip"]
 
     Thread.current[:request_starttime] = Time.now
-    user = nil
-    api_client = nil
-    api_client_auth = nil
-    supplied_token =
-      params["api_token"] ||
-      params["oauth_token"] ||
-      env["HTTP_AUTHORIZATION"].andand.match(/(OAuth2|Bearer) ([-,a-zA-Z0-9]+)/).andand[2]
-    if supplied_token
-      case supplied_token[0..2]
-      when 'v2,'
-        _, uuid, secret = supplied_token.split(',')
-        auth = ApiClientAuthorization.
-               includes(:api_client, :user).
-               where('uuid=? and api_token=? and (expires_at is null or expires_at > CURRENT_TIMESTAMP)',
-                     uuid, secret).
-               first
-      else
-        auth = ApiClientAuthorization.
-               includes(:api_client, :user).
-               where('api_token=? and (expires_at is null or expires_at > CURRENT_TIMESTAMP)',
-                     supplied_token).
-               first
+
+    remote = false
+    reader_tokens = nil
+    if params["remote"] && request.get? && (
+         request.path.start_with?('/arvados/v1/groups') ||
+         request.path.start_with?('/arvados/v1/users/current'))
+      # Request from a remote API server, asking to validate a salted
+      # token.
+      remote = params["remote"]
+    elsif request.get? || params["_method"] == 'GET'
+      reader_tokens = params["reader_tokens"]
+      if reader_tokens.is_a? String
+        reader_tokens = SafeJSON.load(reader_tokens)
       end
-      if auth.andand.user
-        user = auth.user
-        api_client = auth.api_client
-      else
-        # Token is invalid, or belongs to a non-existent (deleted?) user.
-        auth = nil
+    end
+
+    # Set current_user etc. based on the primary session token if a
+    # valid one is present. Otherwise, use the first valid token in
+    # reader_tokens.
+    accepted = false
+    auth = nil
+    [params["api_token"],
+     params["oauth_token"],
+     env["HTTP_AUTHORIZATION"].andand.match(/(OAuth2|Bearer) ([-\/a-zA-Z0-9]+)/).andand[2],
+     *reader_tokens,
+    ].each do |supplied|
+      next if !supplied
+      try_auth = ApiClientAuthorization.
+                 validate(token: supplied, remote: remote)
+      if try_auth.andand.user
+        auth = try_auth
+        accepted = supplied
+        break
       end
     end
-    Thread.current[:supplied_token] = supplied_token
+
     Thread.current[:api_client_ip_address] = remote_ip
     Thread.current[:api_client_authorization] = auth
-    Thread.current[:api_client_uuid] = api_client.andand.uuid
-    Thread.current[:api_client] = api_client
-    Thread.current[:user] = user
-    if auth
-      auth.last_used_at = Time.now
-      auth.last_used_by_ip_address = remote_ip.to_s
-      auth.save validate: false
-    end
+    Thread.current[:api_client_uuid] = auth.andand.api_client.andand.uuid
+    Thread.current[:api_client] = auth.andand.api_client
+    Thread.current[:token] = accepted
+    Thread.current[:user] = auth.andand.user
 
     @app.call env if @app
   end