X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/55a05d9e809775a6ea6305add096022ef1ec70e4..77797b21b0701654f9a7ee57aace7fa16214e9c2:/script/deliver-message diff --git a/script/deliver-message b/script/deliver-message index 087a117c3..28d755b24 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -4,14 +4,14 @@ require File.join(File.dirname(__FILE__), "..", "config", "environment") if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/) comment = DiaryComment.find(recipient[1]) - digest = comment.digest + expected_token = comment.notification_token(recipient[2]) date = comment.created_at from = comment.diary_entry.subscribers.find(recipient[2]) to = comment.user token = recipient[3] elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/) message = Message.find(recipient[1]) - digest = message.digest + expected_token = message.notification_token date = message.sent_on from = message.recipient to = message.sender @@ -20,7 +20,7 @@ else exit 0 end -exit 0 unless ActiveSupport::SecurityUtils.secure_compare(token, digest[0, 6]) +exit 0 unless ActiveSupport::SecurityUtils.secure_compare(token, expected_token) exit 0 unless from.active? exit 0 if date < 1.month.ago