projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10081-cwl-run-same-job
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_api_client.rb
diff --git
a/apps/workbench/app/models/arvados_api_client.rb
b/apps/workbench/app/models/arvados_api_client.rb
index 4d549d194728eb00a9f3a2a01fd097d84955a16e..fc9635bc65645d0885c108a8c1d6a935a3bd80de 100644
(file)
--- a/
apps/workbench/app/models/arvados_api_client.rb
+++ b/
apps/workbench/app/models/arvados_api_client.rb
@@
-89,7
+89,10
@@
class ArvadosApiClient
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
# Use system CA certificates
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
# Use system CA certificates
- @api_client.ssl_config.add_trust_ca('/etc/ssl/certs')
+ ["/etc/ssl/certs/ca-certificates.crt",
+ "/etc/pki/tls/certs/ca-bundle.crt"]
+ .select { |ca_path| File.readable?(ca_path) }
+ .each { |ca_path| @api_client.ssl_config.add_trust_ca(ca_path) }
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
@@
-111,6
+114,7
@@
class ArvadosApiClient
Thread.current[:reader_tokens] ||
[]) +
[Rails.configuration.anonymous_user_token]).to_json,
Thread.current[:reader_tokens] ||
[]) +
[Rails.configuration.anonymous_user_token]).to_json,
+ 'current_request_id' => (Thread.current[:current_request_id] || ''),
}
if !data.nil?
data.each do |k,v|
}
if !data.nil?
data.each do |k,v|