X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/450b51a554050504d6b510c2c9c1adf463b937a0..15c688d1c4b41232536d0a275dd5c0fdb8879a00:/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 db99c0bc17..7645d1597c 100644 --- a/services/api/app/models/api_client_authorization.rb +++ b/services/api/app/models/api_client_authorization.rb @@ -87,8 +87,8 @@ class ApiClientAuthorization < ArvadosModel end def self.remote_host(uuid_prefix:) - Rails.configuration.RemoteClusters[uuid_prefix]["Host"] || - (Rails.configuration.RemoteClusters["*"]["Proxy"] && + (Rails.configuration.RemoteClusters[uuid_prefix].andand.Host) || + (Rails.configuration.RemoteClusters["*"].Proxy && uuid_prefix+".arvadosapi.com") end @@ -153,7 +153,7 @@ class ApiClientAuthorization < ArvadosModel # [re]validate it. begin clnt = HTTPClient.new - if Rails.configuration.TLS["Insecure"] + if Rails.configuration.TLS.Insecure clnt.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE else # Use system CA certificates @@ -187,7 +187,7 @@ class ApiClientAuthorization < ArvadosModel end end - if Rails.configuration.Users["NewUsersAreActive"] || + if Rails.configuration.Users.NewUsersAreActive || Rails.configuration.RemoteClusters[remote_user['uuid'][0..4]].andand["ActivateUsers"] # Update is_active to whatever it is at the remote end user.is_active = remote_user['is_active']