Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove quotation marks from email addresses (fixes #2154)

Browse source
This commit is contained in:
Ryan Lue 2018-08-10 15:19:37 +08:00
parent f848f8d151
commit ae8fa91260
7 changed files with 97 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/controllers/ticket_zoom/article_action/email_reply.coffee
View file

@ -30,11 +30,12 @@ class EmailReply extends App.Controller
# remove system addresses
localAddresses = App.EmailAddress.all()
forgeinRecipients = []
foreignRecipients = []
recipientUsed = {}
for recipient in recipients
if !_.isEmpty(recipient.address)
localRecipientAddress = recipient.address.toString().toLowerCase()
if !recipientUsed[localRecipientAddress]
recipientUsed[localRecipientAddress] = true
localAddress = false
@ -43,10 +44,10 @@ class EmailReply extends App.Controller
recipientUsed[localRecipientAddress] = true
localAddress = true
if !localAddress
forgeinRecipients.push recipient
foreignRecipients.push recipient
# check if reply all is neede
if forgeinRecipients.length > 1
if foreignRecipients.length > 1
actions.push {
name: 'reply all'
type: 'emailReplyAll'

30
app/assets/javascripts/app/lib/app_post/utils.coffee
View file

@ -1034,32 +1034,20 @@ class App.Utils
# filter for uniq recipients
recipientAddresses = {}
addAddresses = (addressLine, line) ->
lineNew = ''
recipients = App.Utils.parseAddressListLocal(addressLine)
if !_.isEmpty(recipients)
for recipient in recipients
if !_.isEmpty(recipient)
localRecipientAddress = recipient.toString().toLowerCase()
recipients = recipients.map((r) -> r.toString().toLowerCase())
recipients = _.reject(recipients, (r) -> _.isEmpty(r))
recipients = _.reject(recipients, (r) -> isLocalAddress(r))
recipients = _.reject(recipients, (r) -> recipientAddresses[r])
recipients = _.each(recipients, (r) -> recipientAddresses[r] = true)
# check if address is not local
if !isLocalAddress(localRecipientAddress)
recipients.push(line) if !_.isEmpty(line)
# filter for uniq recipients
if !recipientAddresses[localRecipientAddress]
recipientAddresses[localRecipientAddress] = true
# see https://github.com/zammad/zammad/issues/2154
recipients = recipients.map((a) -> a.replace(/'(\S+@\S+\.\S+)'/, '$1'))
# add recipient
if lineNew
lineNew = lineNew + ', '
lineNew = lineNew + localRecipientAddress
lineNew
if !_.isEmpty(line)
if !_.isEmpty(lineNew)
lineNew += ', '
lineNew += line
lineNew
recipients.join(', ')
if articleNew.to
articleNew.to = addAddresses(articleNew.to)

7
app/models/channel/email_parser.rb
View file

@ -491,14 +491,13 @@ process unprocessable_mails (tmp/unprocessable_mail/*.eml) again
# imported_fields = mail.header.fields.map { |f| [f.name.downcase, f.to_utf8] }.to_h
raw_fields = mail.header.fields.map { |f| ["raw-#{f.name.downcase}", f] }.to_h
custom_fields = {}.tap do |h|
validated_recipients = imported_fields.slice(*RECIPIENT_FIELDS)
.transform_values { |v| v.match?(EMAIL_REGEX) ? v : '' }
h.merge!(validated_recipients)
h.replace(imported_fields.slice(*RECIPIENT_FIELDS)
.transform_values { |v| v.match?(EMAIL_REGEX) ? v : '' })
h['x-any-recipient'] = h.values.select(&:present?).join(', ')
h['date'] = Time.zone.parse(mail.date.to_s) || imported_fields['date']
h['message_id'] = imported_fields['message-id']
h['subject'] = imported_fields['subject']&.sub(/^=\?us-ascii\?Q\?(.+)\?=$/, '\1')
h['x-any-recipient'] = validated_recipients.values.select(&:present?).join(', ')
end
[imported_fields, raw_fields, custom_fields].reduce({}.with_indifferent_access, &:merge)

8
app/models/channel/filter/identify_sender.rb
View file

@ -196,10 +196,10 @@ module Channel::Filter::IdentifySender
end
def self.cleanup_email(string)
string = string.downcase
string.strip!
string.delete!('"')
string
string.downcase
.strip
.delete('"')
.sub(/\A'(.*)'\z/, '\1')
end
end

36
public/assets/tests/html_utils.js
View file

@ -2648,6 +2648,42 @@ test('check getRecipientArticle format', function() {
verify = App.Utils.getRecipientArticle(ticket, article, agent, article.type, email_addresses, false)
deepEqual(verify, result)
customer = {
login: 'login',
firstname: 'firstname',
lastname: 'lastname',
email: "'customer@example.com'",
}
agent = {
login: 'login',
firstname: 'firstname',
lastname: 'lastname',
email: 'agent@example.com',
}
ticket = {
customer: customer,
}
article = {
message_id: 'message_id21',
created_by: agent,
type: {
name: 'email',
},
sender: {
name: 'Agent',
},
from: customer.email,
to: 'agent@example.com',
}
result = {
to: 'customer@example.com',
cc: '',
body: '',
in_reply_to: 'message_id21',
}
verify = App.Utils.getRecipientArticle(ticket, article, article.created_by, article.type)
deepEqual(verify, result)
});
test("contentTypeCleanup", function() {

6
spec/models/channel/email_parser_spec.rb
View file

@ -1,14 +1,16 @@
require 'rails_helper'
RSpec.describe Channel::EmailParser, type: :model do
let(:ticket) { create(:ticket) }
let(:mail_file) { Rails.root.join('test', 'data', 'mail', 'mail001.box') }
let(:raw_mail) { File.read(mail_file) }
describe '#process' do
let(:raw_mail) { File.read(mail_file).sub(/(?<=^Subject: ).*$/, test_string) }
let(:test_string) do
Setting.get('ticket_hook') + Setting.get('ticket_hook_divider') + ticket.number
end
let(:ticket) { create(:ticket) }
describe '#process' do
context 'when email subject contains ticket reference' do
it 'adds message to ticket' do
expect { described_class.new.process({}, raw_mail) }

34
test/unit/email_process_test.rb
View file

@ -3033,6 +3033,40 @@ Content-Type: text/html; charset=us-ascii; format=flowed
},
},
},
{
data: <<~RAW_MAIL.chomp,
From: me@example.com
To: Bob Smith <'customer_outlook_recipient_not_in_address_book@example.com'>
Subject: some subject for outlook recipient issue
Content-Type: text/html; charset=us-ascii;
test
RAW_MAIL
success: true,
result: {
0 => {
priority: '2 normal',
title: 'some subject for outlook recipient issue',
},
1 => {
content_type: 'text/html',
body: 'test',
sender: 'Customer',
type: 'email',
internal: false,
},
},
verify: {
users: [
{
firstname: 'Bob',
lastname: 'Smith',
fullname: 'Bob Smith',
email: 'customer_outlook_recipient_not_in_address_book@example.com',
},
],
},
},
{
data: File.read(Rails.root.join('test', 'data', 'mail', 'mail067.box')),
success: true,