Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

add unit test for image in email with src=../media/ or src=base64

Browse Source
This commit is contained in:
Florian HENRY
2023-12-13 11:31:42 +01:00
parent 9bbd285c3a
commit 82c49e62d1
2 changed files with 134 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/class/CMailFile.class.php
View File

@@ -263,12 +263,23 @@ class CMailFile
// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link // This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
// TODO Exclude viewimage used for the read tracker ? // TODO Exclude viewimage used for the read tracker ?
$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias'); $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
if ($findimg<0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
$this->error = 'ErrorInAddAttachementsImageBAseOnMedia';
return;
}
} }
if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) { if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {
// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file // Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
// This convert an embedded file with src="data:image... into a cid link + attached file // This convert an embedded file with src="data:image... into a cid link + attached file
$findimg = $findimg + $this->findHtmlImagesIsSrcData($upload_dir_tmp); $resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
if ($resultImageData<0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
$this->error = 'ErrorInAddAttachementsImageBAseOnMedia';
return;
}
$findimg += $resultImageData;
} }
// Set atleastoneimage if there is at least one embedded file (into ->html_images) // Set atleastoneimage if there is at least one embedded file (into ->html_images)
@@ -1847,7 +1858,7 @@ class CMailFile
// We search (into mail body this->html), if we find some strings like "... file=xxx.img" // We search (into mail body this->html), if we find some strings like "... file=xxx.img"
// For example when: // For example when:
// <img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/picture.jpg" style="height:356px; width:1040px" /> // <img alt="" src="/src="data:image....;base64,...." />
$matches = array(); $matches = array();
preg_match_all('/src="data:image\/('.implode('|', $extensions).');base64,([^"]+)"/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found preg_match_all('/src="data:image\/('.implode('|', $extensions).');base64,([^"]+)"/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found

60
test/phpunit/CMailFileTest.php
View File

@@ -28,6 +28,7 @@ global $conf,$user,$langs,$db;
//require_once 'PHPUnit/Autoload.php'; //require_once 'PHPUnit/Autoload.php';
require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php'; require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
if (empty($user->id)) { if (empty($user->id)) {
print "Load permissions for admin user nb 1\n"; print "Load permissions for admin user nb 1\n";
@@ -116,6 +117,7 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
print __METHOD__ . "\n"; print __METHOD__ . "\n";
} }
/** /**
* End phpunit tests * End phpunit tests
* *
@@ -205,4 +207,62 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
return $result; return $result;
} }
public function testCMailFileHTMLWithImage()
{
global $conf, $user, $langs, $db;
$conf = $this->savconf;
$user = $this->savuser;
$langs = $this->savlangs;
$db = $this->savdb;
$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
dol_mkdir(DOL_DATA_ROOT . '/medias/image');
dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
$msg = '<html><body>';
$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
$msg .= '</body></html>';
$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1,'','','','','standard','','/tmp');
$result = count($localobject->html_images);
print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
$this->assertEquals($result, 2);
foreach ($localobject->html_images as $i => $val)
if ($localobject->html_images[$i]) {
if ($localobject->html_images[$i]['type'] == 'cidfromdata') {
if (preg_match('/img250x20\.png/i',$localobject->html_images[$i]['fullpath'])) {
print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
$fileSize=9744;
print __METHOD__ . " File size must be =" . $fileSize . "\n";
$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
} elseif (preg_match('/\.png/i',$localobject->html_images[$i]['fullpath'])) {
print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
$fileSize=85;
print __METHOD__ . " File size must be =" . $fileSize . "\n";
$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
}
}
}
return $result;
}
} }