From a312b9ae88711dc624cbdfd1ae9d8f35474a0a63 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 17 Feb 2022 20:18:34 -0500 Subject: [PATCH] FIX: ReplyByEmailAddressValidator should leverage EmailAddressValidator Since we already have perfectly sensible logic for validating email addresses, let's leverage that and simplify the logic while we're at it. Emails with spaces are no longer permitted (why were they?) --- lib/validators/reply_by_email_address_validator.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/validators/reply_by_email_address_validator.rb b/lib/validators/reply_by_email_address_validator.rb index 02864beb3cd..a5ab973f811 100644 --- a/lib/validators/reply_by_email_address_validator.rb +++ b/lib/validators/reply_by_email_address_validator.rb @@ -7,17 +7,14 @@ class ReplyByEmailAddressValidator def valid_value?(val) return true if val.blank? - return false if !val.include?("@") - - value = val.dup - value.strip! + return false if !EmailAddressValidator.valid_value?(val) if SiteSetting.find_related_post_with_key - return false if !value.include?("%{reply_key}") - value.sub!(/\+?%{reply_key}/, "") + return false if !val.include?("%{reply_key}") + val.sub(/\+?%{reply_key}/, "") != SiteSetting.notification_email + else + val != SiteSetting.notification_email end - - value != SiteSetting.notification_email && !value.include?(" ") end def error_message