github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 21:41:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

use proper 'Message-Id' field

Browse Source
This commit is contained in:
Régis Hanol
2016-06-09 00:33:13 +02:00
parent 9a81115c1c
commit 214e25f1b5
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/webhooks_controller.rb
View File

@ -7,7 +7,7 @@ class WebhooksController < ActionController::Base
return mailgun_failure if SiteSetting.mailgun_api_key.blank?
# token is a random string of 50 characters
token = params.delete("token")
token = params["token"]
return mailgun_failure if token.blank? || token.size != 50
# prevent replay attack
@ -16,14 +16,14 @@ class WebhooksController < ActionController::Base
$redis.expire(key, 10.minutes)
# ensure timestamp isn't too far from current time
timestamp = params.delete("timestamp")
timestamp = params["timestamp"]
return mailgun_failure if (Time.at(timestamp.to_i) - Time.now).abs > 24.hours.to_i
# check the signature
return mailgun_failure unless mailgun_verify(timestamp, token, params["signature"])
event = params.delete("event")
message_id = params.delete("message-id")
event = params["event"]
message_id = params["Message-Id"].tr("<>", "")
# only handle soft bounces, because hard bounces are also handled
# by the "dropped" event and we don't want to increase bounce score twice