Commit 206741f0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'webhook_verify_none' into 'master'

Disable SSL peer verification for all webhooks

SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda4.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
parents 4416b57f 5ae0d61d
...@@ -28,7 +28,7 @@ class WebHook < ActiveRecord::Base ...@@ -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 ...@@ -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
......
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