5ae0d61d0a
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459
. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
49 lines
1.5 KiB
Ruby
49 lines
1.5 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: web_hooks
|
|
#
|
|
# id :integer not null, primary key
|
|
# url :string(255)
|
|
# project_id :integer
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# type :string(255) default("ProjectHook")
|
|
# service_id :integer
|
|
# push_events :boolean default(TRUE), not null
|
|
# issues_events :boolean default(FALSE), not null
|
|
# merge_requests_events :boolean default(FALSE), not null
|
|
#
|
|
|
|
class WebHook < ActiveRecord::Base
|
|
include HTTParty
|
|
|
|
attr_accessible :url
|
|
|
|
# HTTParty timeout
|
|
default_timeout 10
|
|
|
|
validates :url, presence: true,
|
|
format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }
|
|
|
|
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" }, verify: false)
|
|
else
|
|
post_url = url.gsub("#{parsed_url.userinfo}@", "")
|
|
auth = {
|
|
username: URI.decode(parsed_url.user),
|
|
password: URI.decode(parsed_url.password),
|
|
}
|
|
WebHook.post(post_url,
|
|
body: data.to_json,
|
|
headers: {"Content-Type" => "application/json"},
|
|
verify: false,
|
|
basic_auth: auth)
|
|
end
|
|
end
|
|
|
|
def async_execute(data)
|
|
Sidekiq::Client.enqueue(ProjectWebHookWorker, id, data)
|
|
end
|
|
end
|