X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc100474c5d74b20b2576bd3a8f633746c0c6fb2..3f0914ec893c01440778b01620776745da2546de:/services/api/app/models/api_client.rb diff --git a/services/api/app/models/api_client.rb b/services/api/app/models/api_client.rb index 3e1dcd6c4a..8ed693f820 100644 --- a/services/api/app/models/api_client.rb +++ b/services/api/app/models/api_client.rb @@ -1,5 +1,9 @@ -class ApiClient < ActiveRecord::Base - include AssignUuid +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +class ApiClient < ArvadosModel + include HasUuid include KindAndEtag include CommonApiTemplate has_many :api_client_authorizations @@ -9,4 +13,25 @@ class ApiClient < ActiveRecord::Base t.add :url_prefix t.add :is_trusted end + + def is_trusted + norm(self.url_prefix) == norm(Rails.configuration.Services.Workbench1.ExternalURL) || + norm(self.url_prefix) == norm(Rails.configuration.Services.Workbench2.ExternalURL) || + super + end + + protected + + def norm url + # normalize URL for comparison + url = URI(url) + if url.scheme == "https" + url.port == "443" + end + if url.scheme == "http" + url.port == "80" + end + url.path = "/" + url + end end