Bug 909622 - [B2G][Helix][messages][zhaotao]Sending mms with attachme…

…nt(chinese name mp3) fail - r=julienw

- Replace all non standard word characters in filenames with a # while encoding SMIL
- Remove HTML escaping in preference for replacing unsafe chars with the #
- Add unit test to ensure that quotes are always escaped

apps/sms/js/smil.js

@@ -5,7 +5,8 @@
 (function() {
 'use strict';
 
-var runsafefilename = /[^a-zA-Z0-9.]/g;
+// characters not allowed in smil filenames
+var unsafeFilenamePattern = /[^a-zA-Z0-9_#.()?&%-]/g;
 
 // This encoder is aimed for encoding the string by 'utf-8'.
 var encoder = new TextEncoder('UTF-8');
@@ -65,9 +66,9 @@ function SMIL_generateSlides(data, slide, slideIndex) {
   if (slide.blob) {
     blobType = Utils.typeFromMimeType(slide.blob.type);
     if (blobType) {
+      name = slide.name.substr(slide.name.lastIndexOf('/') + 1);
       // just to be safe, remove any non-standard characters from the filename
-      name = Template.escape(slide.name);
-      name = name.substr(name.lastIndexOf('/') + 1);
+      name = name.replace(unsafeFilenamePattern, '#');
       name = SMIL_generateUniqueLocation(data, name);
       media = '<' + blobType + ' src="' + name + '" region="Image"/>';
       data.attachments.push({

apps/sms/test/unit/smil_test.js

@@ -450,6 +450,42 @@ suite('SMIL', function() {
       }), filenames, 'List of filenames matches <img> tags');
 
     });
+
+    test('Message with non-ascii filenames', function() {
+      var smilTest = [{
+        name: 'kitten♥-450.jpg',
+        blob: testImageBlob
+      }, {
+        // 5 replaced chars
+        name: '새끼고양이.jpg',
+        blob: testImageBlob
+      }, {
+        // 5 replaced chars
+        name: 'ἀρετή.jpg',
+        blob: testImageBlob
+      }, {
+        // testing non-replaced chars
+        name: 'abzABZ019_#.()?&%-.jpg',
+        blob: testImageBlob
+      }, {
+        // quotes MUST be replaced - filename content is used in xml
+        name: '"\'.jpg',
+        blob: testImageBlob
+      }];
+      var output = SMIL.generate(smilTest);
+      assert.equal(output.attachments.length, 5);
+      assert.equal(output.attachments[0].location, 'kitten#-450.jpg');
+
+      // output from the next two also tests a clash after replace
+      assert.equal(output.attachments[1].location, '#####.jpg');
+      assert.equal(output.attachments[2].location, '#####_2.jpg');
+
+      // this one has nothing to replace:
+      assert.equal(output.attachments[3].location, smilTest[3].name);
+
+      // quotes must be replaced
+      assert.equal(output.attachments[4].location, '##.jpg');
+    });
   });
 
 });