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.

Disable SSL peer verification for all webhooks
5ae0d61d · Jacob Vosmaer · 1fc42d99 · 5ae0d61d
Commit 5ae0d61d authored Jan 15, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

web_hook.rb app/models/web_hook.rb +2 -1

No files found.
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -28,7 +28,7 @@ class WebHook < ActiveRecord::Base
  def execute(data)
    parsed_url = URI.parse(url)
    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
      post_url = url.gsub("#{parsed_url.userinfo}@", "")
      auth = {
@@ -38,6 +38,7 @@ class WebHook < ActiveRecord::Base
      WebHook.post(post_url,
                   body: data.to_json,
                   headers: {"Content-Type" => "application/json"},
+                   verify: false,
                   basic_auth: auth)
    end
  end