Disable SSL peer verification for all webhooks
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459
. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
This commit is contained in:
parent
1fc42d9934
commit
5ae0d61d0a
|
@ -28,7 +28,7 @@ class WebHook < ActiveRecord::Base
|
||||||
def execute(data)
|
def execute(data)
|
||||||
parsed_url = URI.parse(url)
|
parsed_url = URI.parse(url)
|
||||||
if parsed_url.userinfo.blank?
|
if parsed_url.userinfo.blank?
|
||||||
WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
|
WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" }, verify: false)
|
||||||
else
|
else
|
||||||
post_url = url.gsub("#{parsed_url.userinfo}@", "")
|
post_url = url.gsub("#{parsed_url.userinfo}@", "")
|
||||||
auth = {
|
auth = {
|
||||||
|
@ -38,6 +38,7 @@ class WebHook < ActiveRecord::Base
|
||||||
WebHook.post(post_url,
|
WebHook.post(post_url,
|
||||||
body: data.to_json,
|
body: data.to_json,
|
||||||
headers: {"Content-Type" => "application/json"},
|
headers: {"Content-Type" => "application/json"},
|
||||||
|
verify: false,
|
||||||
basic_auth: auth)
|
basic_auth: auth)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue