X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/db31bedb109a4d918830a910654685a9f591cf28..5f915857cbb3620587f321514a065a73fd6ecc46:/services/api/app/models/api_client_authorization.rb diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb index 77fc0a45af..6057c4d269 100644 --- a/services/api/app/models/api_client_authorization.rb +++ b/services/api/app/models/api_client_authorization.rb @@ -111,7 +111,7 @@ class ApiClientAuthorization < ArvadosModel def self.check_system_root_token token if token == Rails.configuration.SystemRootToken return ApiClientAuthorization.new(user: User.find_by_uuid(system_user_uuid), - uuid: uuid_prefix+"-gj3su-000000000000000", + uuid: Rails.configuration.ClusterID+"-gj3su-000000000000000", api_token: token, api_client: ApiClient.new(is_trusted: true, url_prefix: "")) else @@ -164,6 +164,9 @@ class ApiClientAuthorization < ArvadosModel (secret == auth.api_token || secret == OpenSSL::HMAC.hexdigest('sha1', auth.api_token, remote)) # found it + if token_uuid[0..4] != Rails.configuration.ClusterID + Rails.logger.debug "found cached remote token #{token_uuid} with secret #{secret} in local db" + end return auth end @@ -274,6 +277,7 @@ class ApiClientAuthorization < ArvadosModel api_token: secret, api_client_id: 0, expires_at: Time.now + Rails.configuration.Login.RemoteTokenRefresh) + Rails.logger.debug "cached remote token #{token_uuid} with secret #{secret} in local db" end return auth else