This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 32076c779bbc990f7e8ea0b002ac62903cd4fb1a Author: Sebb <[email protected]> AuthorDate: Sun Oct 4 15:30:00 2020 +0100 Fix up untaint changes --- www/secretary/workbench/views/actions/icla.json.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/www/secretary/workbench/views/actions/icla.json.rb b/www/secretary/workbench/views/actions/icla.json.rb index 2558f2d..9f626cb 100644 --- a/www/secretary/workbench/views/actions/icla.json.rb +++ b/www/secretary/workbench/views/actions/icla.json.rb @@ -10,7 +10,7 @@ # extract message message = Mailbox.find(@message) [email protected] if @from =~ /\A("?[\s\w]+"?\s+<)?\w+@apache\.org>?\z/ +_warn "Invalid From address #{@from}" unless @from =~ /\A("?[\s\w]+"?\s+<)?\w+@apache\.org>?\z/ # extract file extension fileext = File.extname(@selected).downcase @@ -204,7 +204,7 @@ if @valid_user and @pmc and not @votelink.empty? ###################################################################### task "email [email protected]" do - # build mail from template + # build mail from template (already includes TO: root) mail = Mail.new(template('acreq.erb')) # adjust copy lists @@ -213,8 +213,6 @@ if @valid_user and @pmc and not @votelink.empty? cc << @podling.private_mail_list if @podling # copy podling mail.cc = cc.uniq.map {|email| email} - # untaint from and to email addresses - mail.to = mail.to.map {|email| email} mail.from = @from # echo email
