marker
+ return true if tag is 'DIV' && (el.data('signature') || el.prop('class') is 'yahoo_quoted')
+ _.some el.children(), (el) -> isQuoteOrSignature el
+
+ $('
').html(message).contents().each (index, node) ->
+ text = $(node).text()
+ if node.nodeType == Node.TEXT_NODE
+ res.push text
+ if text.trim().length
+ contentNodes.push index
+ else if node.nodeType == Node.ELEMENT_NODE
+ res.push node.outerHTML
+ if isQuoteOrSignature node
+ dismissNodes.push index
+ else if text.trim().length
+ contentNodes.push index
+
+ # filter out all dismiss nodes smaller than the largest content node
+ max_content = _.max contentNodes || 0
+ dismissNodes = _.filter dismissNodes, (x) -> x >= max_content
+
+ # return the message unchanged if there are no nodes to dismiss
+ return message if !dismissNodes.length
+
+ # insert marker template at the earliest valid location
+ markerIndex = _.min dismissNodes
+ markerTemplate = ''
+
+ res.splice(markerIndex, 0, markerTemplate)
+ res.join('')
+
# textReplaced = App.Utils.replaceTags( template, { user: { firstname: 'Bob', lastname: 'Smith' } } )
@replaceTags: (template, objects) ->
template = template.replace( /#\{\s{0,2}(.+?)\s{0,2}\}/g, (index, key) ->
diff --git a/lib/html_sanitizer.rb b/lib/html_sanitizer.rb
index 569b6a674..e72173785 100644
--- a/lib/html_sanitizer.rb
+++ b/lib/html_sanitizer.rb
@@ -18,7 +18,10 @@ satinize html string based on whiltelist
attributes_whitelist = Rails.configuration.html_sanitizer_attributes_whitelist
css_properties_whitelist = Rails.configuration.html_sanitizer_css_properties_whitelist
css_values_blacklist = Rails.application.config.html_sanitizer_css_values_backlist
- classes_whitelist = ['js-signatureMarker']
+
+ # We whitelist yahoo_quoted because Yahoo Mail marks quoted email content using
+ #
and we rely on this class to identify quoted messages
+ classes_whitelist = ['js-signatureMarker', 'yahoo_quoted']
attributes_2_css = %w[width height]
# remove html comments
diff --git a/public/assets/tests/html_utils.js b/public/assets/tests/html_utils.js
index decf0918f..62204a44f 100644
--- a/public/assets/tests/html_utils.js
+++ b/public/assets/tests/html_utils.js
@@ -800,220 +800,451 @@ test("check signature", function() {
});
// identify signature
-test("identify signature", function() {
+test("identify signature by plaintext", function() {
var message = "
test 123
"
var should = '
test 123
'
- var result = App.Utils.signatureIdentify(message)
+ var result = App.Utils.signatureIdentifyByPlaintext(message)
equal(result, should)
message = "
test 123
--
Bob Smith
"
should = '
test 123
--
Bob Smith
'
- result = App.Utils.signatureIdentify(message)
+ result = App.Utils.signatureIdentifyByPlaintext(message)
equal(result, should)
message = "
test 123
1
2
3
4
5
6
7
8
9
--
Bob Smith
"
should = '
test 123
1
2
3
4
5
6
7
8
9
--
Bob Smith
'
- result = App.Utils.signatureIdentify(message)
+ result = App.Utils.signatureIdentifyByPlaintext(message)
equal(result, should)
message = "
test 123
--no not match--
--
Bob Smith
"
should = '
test 123
--no not match--
--
Bob Smith
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
--no not match--
--
Bob Smith
"
should = '
test 123
--no not match--
--
Bob Smith
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
--
Bob Smith
--
Bob Smith
"
should = '
test 123
--
Bob Smith
--
Bob Smith
'
//should = '
test 123
--
Bob Smith
--
Bob Smith
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
test 123
--
Bob Smith
"
should = "
test 123
test 123
--
Bob Smith
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
test 123
--
Bob Smith
"
should = "
test 123
test 123
--
Bob Smith
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "Test reply to zammad
Am 24.10.2016 18:55 schrieb "Android Support" <android-support@example.com>:
>
> Sehr geehrte Damen"
should = "Test reply to zammad
Am 24.10.2016 18:55 schrieb "Android Support" <android-support@example.com>:
>
> Sehr geehrte Damen"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
< On 20 Oct 2016, at 12:23, Martin Edenhofer via Zammad Helpdesk wrote:
"
should = "
< On 20 Oct 2016, at 12:23, Martin Edenhofer via Zammad Helpdesk wrote:
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
// apple
// en
message = "
test 123
--no not match--
Bob Smith
On 01/04/15 10:55, Bob Smith wrote:
lalala
--
some test
"
should = '
test 123
--no not match--
Bob Smith
On 01/04/15 10:55, Bob Smith wrote:
lalala
--
some test
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
// de
message = "
test 123
--no not match--
Bob Smith
Am 03.04.2015 um 20:58 schrieb Bob Smith <bob@example.com>:
lalala
"
should = '
test 123
--no not match--
Bob Smith
Am 03.04.2015 um 20:58 schrieb Bob Smith <bob@example.com>:
lalala
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
// ms
// en
message = "
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
lalala
"
should = '
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
lalala
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
Subject: lalala
"
should = '
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
Subject: lalala
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
1
2
3
4
4
Subject: lalala
"
should = '
test 123
--no not match--
Bob Smith
From: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Sent: Donnerstag, 2. April 2015 10:00
1
2
3
4
4
Subject: lalala
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
// de
message = "
test 123
--no not match--
Bob Smith
Von: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Gesendet: Donnerstag, 2. April 2015 10:00
Betreff: lalala
"
should = '
test 123
--no not match--
Bob Smith
Von: Martin Edenhofer via Znuny Support [mailto:support@znuny.inc]
Gesendet: Donnerstag, 2. April 2015 10:00
Betreff: lalala
'
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
1
\n
Gesendet: Donnerstag, 2. April 2015 11:32
"
should = "
1
\n
Gesendet: Donnerstag, 2. April 2015 11:32
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
1
\n
Gesendet: Donnerstag, 2. April 2015 11:32
Betreff: lalala
"
should = "
1
\n
Gesendet: Donnerstag, 2. April 2015 11:32
Betreff: lalala
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
1
\n
An: somebody
Datum: Donnerstag, 2. April 2015 11:32
Betreff: lalala
"
should = "
1
\n
An: somebody
Datum: Donnerstag, 2. April 2015 11:32
Betreff: lalala
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
Gesendet: Donnerstag, 2. April 2015 10:11:12
Betreff: Angebot Redundanz / Paket mit Silver Subscription [Ticket#424242]
Hallo Frau Smith,
"
should = "
Gesendet: Donnerstag, 2. April 2015 10:11:12
Betreff: Angebot Redundanz / Paket mit Silver Subscription [Ticket#424242]
Hallo Frau Smith,
"
- result = App.Utils.signatureIdentify(message, true)
+ result = App.Utils.signatureIdentifyByPlaintext(message, true)
equal(result, should)
message = "
Hi Johannes,
das Angebot für den halben Tag bitte an uns.
Der Termin hat sich jetzt auf 10-12 Uhr verschoben, hab ich dir weitergeleitet.
Viele Grüße
Max
>
> Hi,
>
> OK. Wer kriegt das Angebot? Ist das wirklich nur ein halber Tag?
das Angebot für den halben Tag bitte an uns.
Der Termin hat sich jetzt auf 10-12 Uhr verschoben, hab ich dir weitergeleitet.
> OK. Wer kriegt das Angebot? Ist das wirklich nur ein halber Tag?