Skip to content

Commit edd5dfe

Browse files
committed
fix(data-uri): Moved all data-uri regexes to use the non-regex parseDataUri method
1 parent db77249 commit edd5dfe

2 files changed

Lines changed: 55 additions & 53 deletions

File tree

‎lib/mail-composer/index.js‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
const MimeNode = require('../mime-node');
66
const mimeFuncs = require('../mime-funcs');
7+
const parseDataURI = require('../shared').parseDataURI;
78

89
/**
910
* Creates the object for composing a MimeNode instance out from the mail options
@@ -539,7 +540,7 @@ class MailComposer {
539540
_processDataUrl(element) {
540541
let parsedDataUri;
541542
if ((element.path || element.href).match(/^data:/)) {
542-
parsedDataUri = this.parseDataURI(element.path || element.href);
543+
parsedDataUri = parseDataURI(element.path || element.href);
543544
}
544545

545546
if (!parsedDataUri) {
@@ -559,55 +560,6 @@ class MailComposer {
559560

560561
return element;
561562
}
562-
563-
parseDataURI(uri) {
564-
let input = uri;
565-
let commaPos = input.indexOf(',');
566-
if (!commaPos) {
567-
return uri;
568-
}
569-
570-
let data = input.substring(commaPos + 1);
571-
let metaStr = input.substring('data:'.length, commaPos);
572-
573-
let encoding;
574-
575-
let metaEntries = metaStr.split(';');
576-
let lastMetaEntry = metaEntries.length > 1 ? metaEntries[metaEntries.length - 1] : false;
577-
if (lastMetaEntry && lastMetaEntry.indexOf('=') < 0) {
578-
encoding = lastMetaEntry.toLowerCase();
579-
metaEntries.pop();
580-
}
581-
582-
let contentType = metaEntries.shift() || 'application/octet-stream';
583-
let params = {};
584-
for (let entry of metaEntries) {
585-
let sep = entry.indexOf('=');
586-
if (sep >= 0) {
587-
let key = entry.substring(0, sep);
588-
let value = entry.substring(sep + 1);
589-
params[key] = value;
590-
}
591-
}
592-
593-
switch (encoding) {
594-
case 'base64':
595-
data = Buffer.from(data, 'base64');
596-
break;
597-
case 'utf8':
598-
data = Buffer.from(data);
599-
break;
600-
default:
601-
try {
602-
data = Buffer.from(decodeURIComponent(data));
603-
} catch (err) {
604-
data = Buffer.from(data);
605-
}
606-
data = Buffer.from(data);
607-
}
608-
609-
return { data, encoding, contentType, params };
610-
}
611563
}
612564

613565
module.exports = MailComposer;

‎lib/shared/index.js‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,55 @@ module.exports.callbackPromise = (resolve, reject) =>
418418
}
419419
};
420420

421+
module.exports.parseDataURI = uri => {
422+
let input = uri;
423+
let commaPos = input.indexOf(',');
424+
if (!commaPos) {
425+
return uri;
426+
}
427+
428+
let data = input.substring(commaPos + 1);
429+
let metaStr = input.substring('data:'.length, commaPos);
430+
431+
let encoding;
432+
433+
let metaEntries = metaStr.split(';');
434+
let lastMetaEntry = metaEntries.length > 1 ? metaEntries[metaEntries.length - 1] : false;
435+
if (lastMetaEntry && lastMetaEntry.indexOf('=') < 0) {
436+
encoding = lastMetaEntry.toLowerCase();
437+
metaEntries.pop();
438+
}
439+
440+
let contentType = metaEntries.shift() || 'application/octet-stream';
441+
let params = {};
442+
for (let entry of metaEntries) {
443+
let sep = entry.indexOf('=');
444+
if (sep >= 0) {
445+
let key = entry.substring(0, sep);
446+
let value = entry.substring(sep + 1);
447+
params[key] = value;
448+
}
449+
}
450+
451+
switch (encoding) {
452+
case 'base64':
453+
data = Buffer.from(data, 'base64');
454+
break;
455+
case 'utf8':
456+
data = Buffer.from(data);
457+
break;
458+
default:
459+
try {
460+
data = Buffer.from(decodeURIComponent(data));
461+
} catch (err) {
462+
data = Buffer.from(data);
463+
}
464+
data = Buffer.from(data);
465+
}
466+
467+
return { data, encoding, contentType, params };
468+
};
469+
421470
/**
422471
* Resolves a String or a Buffer value for content value. Useful if the value
423472
* is a Stream or a file or an URL. If the value is a Stream, overwrites
@@ -470,11 +519,12 @@ module.exports.resolveContent = (data, key, callback) => {
470519
contentStream = nmfetch(content.path || content.href);
471520
return resolveStream(contentStream, callback);
472521
} else if (/^data:/i.test(content.path || content.href)) {
473-
let parts = (content.path || content.href).match(/^data:((?:[^;]*;)*(?:[^,]*)),(.*)$/i);
474-
if (!parts) {
522+
let parsedDataUri = module.exports.parseDataURI(content.path || content.href);
523+
524+
if (!parsedDataUri || !parsedDataUri.data) {
475525
return callback(null, Buffer.from(0));
476526
}
477-
return callback(null, /\bbase64$/i.test(parts[1]) ? Buffer.from(parts[2], 'base64') : Buffer.from(decodeURIComponent(parts[2])));
527+
return callback(null, parsedDataUri.data);
478528
} else if (content.path) {
479529
return resolveStream(fs.createReadStream(content.path), callback);
480530
}

0 commit comments

Comments
 (0)