IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:30:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: strip webhook payload_url

Browse Source
This commit is contained in:
Arpit Jalan 2017-12-11 13:45:50 +05:30
parent 4b53be81cf
commit 3c56c9b637
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/emit_web_hook_event.rb
View File

@ -71,7 +71,7 @@ module Jobs
end end
def web_hook_request(args, web_hook) def web_hook_request(args, web_hook)
uri = URI(web_hook.payload_url) uri = URI(web_hook.payload_url.strip)
conn = Excon.new( conn = Excon.new(
uri.to_s, uri.to_s,

6
app/models/web_hook.rb
View File

@ -13,6 +13,8 @@ class WebHook < ActiveRecord::Base
validates_presence_of :last_delivery_status validates_presence_of :last_delivery_status
validates_presence_of :web_hook_event_types, unless: :wildcard_web_hook? validates_presence_of :web_hook_event_types, unless: :wildcard_web_hook?
before_save :strip_url
def self.content_types def self.content_types
@content_types ||= Enum.new('application/json' => 1, @content_types ||= Enum.new('application/json' => 1,
'application/x-www-form-urlencoded' => 2) 'application/x-www-form-urlencoded' => 2)
@ -47,6 +49,10 @@ class WebHook < ActiveRecord::Base
def self.enqueue_post_hooks(event, post, user = nil) def self.enqueue_post_hooks(event, post, user = nil)
WebHook.enqueue_hooks(:post, post_id: post.id, category_id: post&.topic&.category_id, event_name: event.to_s) WebHook.enqueue_hooks(:post, post_id: post.id, category_id: post&.topic&.category_id, event_name: event.to_s)
end end
def strip_url
self.payload_url = (payload_url || "").strip.presence
end
end end
# == Schema Information # == Schema Information

6
spec/models/web_hook_spec.rb
View File

@ -35,9 +35,13 @@ describe WebHook do
end end
context 'web hooks' do context 'web hooks' do
let!(:post_hook) { Fabricate(:web_hook) } let!(:post_hook) { Fabricate(:web_hook, payload_url: " https://example.com ") }
let!(:topic_hook) { Fabricate(:topic_web_hook) } let!(:topic_hook) { Fabricate(:topic_web_hook) }
it "removes whitspace from payload_url before saving" do
expect(post_hook.payload_url).to eq("https://example.com")
end
describe '#find_by_type' do describe '#find_by_type' do
it 'find relevant hooks' do it 'find relevant hooks' do
expect(WebHook.find_by_type(:post)).to eq([post_hook]) expect(WebHook.find_by_type(:post)).to eq([post_hook])