mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-20 10:06:04 +10:00
Dmitriy Zaporozhets
db2edff937
Write to log if web hook cant be executed. This prevents 500 error when test web hook with invalid URL and prevent exceptions and retries in sidekiq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
60 lines
1.9 KiB
Ruby
60 lines
1.9 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: web_hooks
|
|
#
|
|
# id :integer not null, primary key
|
|
# url :string(255)
|
|
# project_id :integer
|
|
# created_at :datetime
|
|
# updated_at :datetime
|
|
# 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
|
|
# tag_push_events :boolean default(FALSE)
|
|
#
|
|
|
|
class WebHook < ActiveRecord::Base
|
|
include HTTParty
|
|
|
|
default_value_for :push_events, true
|
|
default_value_for :issues_events, false
|
|
default_value_for :merge_requests_events, false
|
|
default_value_for :tag_push_events, false
|
|
|
|
# HTTParty timeout
|
|
default_timeout Gitlab.config.gitlab.webhook_timeout
|
|
|
|
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
|
|
rescue SocketError, Errno::ECONNREFUSED => e
|
|
logger.error("WebHook Error => #{e}")
|
|
false
|
|
end
|
|
|
|
def async_execute(data)
|
|
Sidekiq::Client.enqueue(ProjectWebHookWorker, id, data)
|
|
end
|
|
end
|