Commit b46cf429 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'sh-fix-httpclient-ssl' into 'master'

Make httpclient respect system SSL configuration

Closes charts/gitlab#1436

See merge request gitlab-org/gitlab-ce!30749
parents dbf521cf a6c0f957
---
title: Make httpclient respect system SSL configuration
merge_request: 30749
author:
type: fixed
# frozen_string_literal: true
# By default, httpclient (and hence anything that uses rack-oauth2)
# ignores the system-wide SSL certificate configuration in favor of its
# own cacert.pem. This makes it impossible to use custom certificates
# without patching that file. Until
# https://github.com/nahi/httpclient/pull/386 is merged, we work around
# this limitation by forcing the HTTPClient SSL store to use the default
# system configuration.
module HTTPClient::SSLConfigDefaultPaths
def initialize(client)
super
set_default_paths
end
end
HTTPClient::SSLConfig.prepend HTTPClient::SSLConfigDefaultPaths
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment