kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rename load_certs and include default cert file

This commit is contained in:
Ahmad Hassan 2018-12-11 13:41:03 +02:00
parent b8e457827e
commit d0daa1591b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/gitlab/gitaly_client.rb
View File

@ -66,15 +66,20 @@ module Gitlab
end end
end end
def self.load_certs def self.certs
@certs ||= Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*"].map do |cert| return @certs if @certs
cert_paths = Dir["#{OpenSSL::X509::DEFAULT_CERT_DIR}/*"]
cert_paths << OpenSSL::X509::DEFAULT_CERT_FILE if File.exist? OpenSSL::X509::DEFAULT_CERT_FILE
@certs = cert_paths.map do |cert|
File.read(cert) File.read(cert)
end.join("\n") end.join("\n")
end end
def self.stub_creds(storage) def self.stub_creds(storage)
if URI(address(storage)).scheme == 'tls' if URI(address(storage)).scheme == 'tls'
GRPC::Core::ChannelCredentials.new load_certs GRPC::Core::ChannelCredentials.new certs
else else
:this_channel_is_insecure :this_channel_is_insecure
end end