IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid parameters and missing bounced emails

Browse Source
This commit is contained in:
Rafael dos Santos Silva
2017-03-02 20:37:28 -03:00
parent 5296f00c28
commit aac4a4ed94
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/admin/email_controller.rb
View File

@@ -91,13 +91,21 @@ class Admin::EmailController < Admin::AdminController
def incoming_from_bounced
params.require(:id)
bounced = EmailLog.find(params[:id].to_i)
email_local_part, email_domain = SiteSetting.notification_email.split('@')
bounced_to_address = "#{email_local_part}+verp-#{bounced.bounce_key}@#{email_domain}"
begin
bounced = EmailLog.find_by(id: params[:id].to_i)
raise Discourse::InvalidParameters if bounced.nil?
incoming_email = IncomingEmail.find_by(to_addresses: bounced_to_address)
serializer = IncomingEmailDetailsSerializer.new(incoming_email, root: false)
render_json_dump(serializer)
email_local_part, email_domain = SiteSetting.notification_email.split('@')
bounced_to_address = "#{email_local_part}+verp-#{bounced.bounce_key}@#{email_domain}"
incoming_email = IncomingEmail.find_by(to_addresses: bounced_to_address)
raise Discourse::NotFound if incoming_email.nil?
serializer = IncomingEmailDetailsSerializer.new(incoming_email, root: false)
render_json_dump(serializer)
rescue => e
render json: {errors: [e.message]}, status: 404
end
end
private