lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: regression, replace triggers by hooks

Browse Source
This commit is contained in:
Regis Houssin 2012-09-12 12:27:11 +02:00
parent 8fd384373a
commit b75efdcf10
2 changed files with 163 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
htdocs/core/lib/files.lib.php
View File

@ -565,78 +565,43 @@ function dol_unescapefile($filename)
* @param int $allowoverwrite 1=Overwrite target file if it already exists * @param int $allowoverwrite 1=Overwrite target file if it already exists
* @param int $disablevirusscan 1=Disable virus scan * @param int $disablevirusscan 1=Disable virus scan
* @param string $uploaderrorcode Value of PHP upload error code ($_FILES['field']['error']) * @param string $uploaderrorcode Value of PHP upload error code ($_FILES['field']['error'])
* @param int $notrigger Disable all triggers * @param int $nohook Disable all hooks
* @param string $varfiles _FILES var name * @param string $varfiles _FILES var name
* @return int >0 if OK, <0 or string if KO * @return int >0 if OK, <0 or string if KO
* @see dolCheckUploadedFile, dol_move * @see dolCheckUploadedFile, dol_move
*/ */
function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $notrigger=0, $varfiles='addedfile') function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disablevirusscan=0, $uploaderrorcode=0, $nohook=0, $varfiles='addedfile')
{ {
global $db, $hookmanager; global $conf, $db, $user, $langs;
global $object; global $object, $hookmanager;
$error=0; $error=0;
// Check uploaded file
$dest_file=dolCheckUploadedFile($src_file, $dest_file, $disablevirusscan, $uploaderrorcode);
if (is_array($dest_file) && isset($dest_file['error'])) return $dest_file['error'];
if (! is_object($hookmanager))
{
if (! class_exists('HookManager')) {
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager=new HookManager($db);
}
}
$hookmanager->initHooks(array('fileslib'));
$parameters=array('dest_file' => $dest_file, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite, 'notrigger' => $notrigger);
$reshook=$hookmanager->executeHooks('dolMoveUploadedFile', $parameters, $object);
if (empty($reshook)) {
return dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger);
}
}
/**
* Check an uploaded file.
* If there is errors (virus found, antivir in error, bad filename), file is not moved.
*
* @param string $src_file Source full path filename ($_FILES['field']['tmp_name'])
* @param string $dest_file Target full path filename ($_FILES['field']['name'])
* @param int $disablevirusscan 1=Disable virus scan
* @param string $uploaderrorcode Value of PHP upload error code ($_FILES['field']['error'])
* @return int >0 if OK, <0 or string if KO
* @see dol_move_uploaded_file
*/
function dolCheckUploadedFile($src_file, $dest_file, $disablevirusscan=0, $uploaderrorcode=0)
{
global $conf;
$file_name = $dest_file; $file_name = $dest_file;
if (empty($nohook))
{
// If an upload error has been reported // If an upload error has been reported
if ($uploaderrorcode) if ($uploaderrorcode)
{ {
switch($uploaderrorcode) switch($uploaderrorcode)
{ {
case UPLOAD_ERR_INI_SIZE: // 1 case UPLOAD_ERR_INI_SIZE: // 1
return array('error' => 'ErrorFileSizeTooLarge'); return 'ErrorFileSizeTooLarge';
break; break;
case UPLOAD_ERR_FORM_SIZE: // 2 case UPLOAD_ERR_FORM_SIZE: // 2
return array('error' => 'ErrorFileSizeTooLarge'); return 'ErrorFileSizeTooLarge';
break; break;
case UPLOAD_ERR_PARTIAL: // 3 case UPLOAD_ERR_PARTIAL: // 3
return array('error' => 'ErrorPartialFile'); return 'ErrorPartialFile';
break; break;
case UPLOAD_ERR_NO_TMP_DIR: // case UPLOAD_ERR_NO_TMP_DIR: //
return array('error' => 'ErrorNoTmpDir'); return 'ErrorNoTmpDir';
break; break;
case UPLOAD_ERR_CANT_WRITE: case UPLOAD_ERR_CANT_WRITE:
return array('error' => 'ErrorFailedToWriteInDir'); return 'ErrorFailedToWriteInDir';
break; break;
case UPLOAD_ERR_EXTENSION: case UPLOAD_ERR_EXTENSION:
return array('error' => 'ErrorUploadBlockedByAddon'); return 'ErrorUploadBlockedByAddon';
break; break;
default: default:
break; break;
@ -654,15 +619,15 @@ function dolCheckUploadedFile($src_file, $dest_file, $disablevirusscan=0, $uploa
if ($result < 0) // If virus or error, we stop here if ($result < 0) // If virus or error, we stop here
{ {
$reterrors=$antivir->errors; $reterrors=$antivir->errors;
dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$file_name.'") KO with antivirus: result='.$result.' errors='.join(',',$antivir->errors), LOG_WARNING); dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: result='.$result.' errors='.join(',',$antivir->errors), LOG_WARNING);
return array('error' => 'ErrorFileIsInfectedWithAVirus: '.join(',',$reterrors)); return 'ErrorFileIsInfectedWithAVirus: '.join(',',$reterrors);
} }
} }
// Security: // Security:
// Disallow file with some extensions. We renamed them. // Disallow file with some extensions. We renamed them.
// Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande. // Car si on a mis le rep documents dans un rep de la racine web (pas bien), cela permet d'executer du code a la demande.
if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$file_name)) if (preg_match('/\.htm|\.html|\.php|\.pl|\.cgi$/i',$dest_file))
{ {
$file_name.= '.noexe'; $file_name.= '.noexe';
} }
@ -672,7 +637,7 @@ function dolCheckUploadedFile($src_file, $dest_file, $disablevirusscan=0, $uploa
if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file)) if (preg_match('/^\./',$src_file) || preg_match('/\.\./',$src_file) || preg_match('/[<>|]/',$src_file))
{ {
dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING); dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
return array('error' => -1); return -1;
} }
// Security: // Security:
@ -681,32 +646,28 @@ function dolCheckUploadedFile($src_file, $dest_file, $disablevirusscan=0, $uploa
if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file)) if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
{ {
dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING); dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
return array('error' => -2); return -2;
} }
return $file_name; if (! is_object($hookmanager))
} {
if (! class_exists('HookManager')) {
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager=new HookManager($db);
}
}
$hookmanager->initHooks(array('fileslib'));
/** $parameters=array('filename' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
* Move an uploaded file after some controls. $reshook=$hookmanager->executeHooks('dolMoveUploadedFile', $parameters, $object);
* If there is errors (virus found, antivir in error, bad filename), file is not moved. }
*
* @param string $src_file Source full path filename ($_FILES['field']['tmp_name'])
* @param string $dest_file Target full path filename ($_FILES['field']['name'])
* @param int $allowoverwrite 1=Overwrite target file if it already exists
* @param int $notrigger Disable all triggers
* @return int >0 if OK, <0 or string if KO
*/
function dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger=0)
{
global $conf, $user, $langs, $db;
global $object;
$error=0;
if (empty($reshook))
{
// The file functions must be in OS filesystem encoding. // The file functions must be in OS filesystem encoding.
$src_file_osencoded=dol_osencode($src_file); $src_file_osencoded=dol_osencode($src_file);
$file_name_osencoded=dol_osencode($dest_file); $file_name_osencoded=dol_osencode($file_name);
// Check if destination dir is writable // Check if destination dir is writable
// TODO // TODO
@ -716,7 +677,7 @@ function dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger=
{ {
if (file_exists($file_name_osencoded)) if (file_exists($file_name_osencoded))
{ {
dol_syslog("Files.lib::dol_move_uploaded_file File ".$dest_file." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING); dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
return 'ErrorFileAlreadyExists'; return 'ErrorFileAlreadyExists';
} }
} }
@ -726,29 +687,7 @@ function dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger=
if ($return) if ($return)
{ {
if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK)); if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$dest_file." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
if (! $notrigger)
{
if (is_object($object))
{
$object->src_file=$dest_file;
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db);
$result=$interface->run_triggers('FILE_UPLOAD',$object,$user,$langs,$conf);
if ($result < 0) {
$error++; $errors=$interface->errors;
}
// Fin appel triggers
}
else
{
dol_syslog("Files.lib::dol_move_uploaded_file Object not find", LOG_WARNING);
}
}
return 1; // Success return 1; // Success
} }
else else
@ -756,6 +695,7 @@ function dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger=
dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR); dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
return -3; // Unknown error return -3; // Unknown error
} }
}
} }
/** /**
@ -764,14 +704,20 @@ function dolMoveUploadedFile($src_file, $dest_file, $allowoverwrite, $notrigger=
* @param string $file File to delete or mask of file to delete * @param string $file File to delete or mask of file to delete
* @param int $disableglob Disable usage of glob like * * @param int $disableglob Disable usage of glob like *
* @param int $nophperrors Disable all PHP output errors * @param int $nophperrors Disable all PHP output errors
* @param int $notrigger Disable all triggers * @param int $nohook Disable all hooks
* @param object $object Current object in use * @param object $object Current object in use
* @return boolean True if file is deleted, False if error * @return boolean True if file is deleted, False if error
*/ */
function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$object=null) function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=null)
{ {
global $db, $hookmanager; global $db, $conf, $user, $langs;
global $hookmanager;
$langs->load("other");
$langs->load("errors");
if (empty($nohook))
{
if (! is_object($hookmanager)) if (! is_object($hookmanager))
{ {
if (! class_exists('HookManager')) { if (! class_exists('HookManager')) {
@ -785,40 +731,17 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$objec
$parameters=array( $parameters=array(
'file' => $file, 'file' => $file,
'disableglob'=> $disableglob, 'disableglob'=> $disableglob,
'nophperrors' => $nophperrors, 'nophperrors' => $nophperrors
'notrigger' => $notrigger
); );
$reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object); $reshook=$hookmanager->executeHooks('deleteFile', $parameters, $object);
}
if (isset($reshook) && $reshook != '') // 0:not deleted, 1:deleted, null or '' for bypass if (empty($nohook) && isset($reshook) && $reshook != '') // 0:not deleted, 1:deleted, null or '' for bypass
{ {
return $reshook; return $reshook;
} }
else else
{ {
return _dolDeleteFile($file, $disableglob, $nophperrors, $notrigger, $object);
}
}
/**
* Remove a file or several files with a mask.
* Never call this function ! Call dol_delete_file file instead.
*
* @param string $file File to delete or mask of file to delete
* @param int $disableglob Disable usage of glob like *
* @param int $nophperrors Disable all PHP output errors
* @param int $notrigger Disable all triggers
* @param object $object Current object in use
* @return boolean True if file is deleted, False if error
* @see dol_delete_file
*/
function _dolDeleteFile($file,$disableglob=0,$nophperrors=0,$notrigger=0,$object=null)
{
global $db, $conf, $user, $langs;
$langs->load("other");
$langs->load("errors");
$error=0; $error=0;
//print "x".$file." ".$disableglob; //print "x".$file." ".$disableglob;
@ -830,29 +753,8 @@ function _dolDeleteFile($file,$disableglob=0,$nophperrors=0,$notrigger=0,$object
{ {
if ($nophperrors) $ok=@unlink($filename); // The unlink encapsulated by dolibarr if ($nophperrors) $ok=@unlink($filename); // The unlink encapsulated by dolibarr
else $ok=unlink($filename); // The unlink encapsulated by dolibarr else $ok=unlink($filename); // The unlink encapsulated by dolibarr
if ($ok) if ($ok) dol_syslog("Removed file ".$filename, LOG_DEBUG);
{ else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
dol_syslog("Removed file ".$filename, LOG_DEBUG);
if (! $notrigger)
{
if (! is_object($object)) $object=(object) 'dummy';
$object->src_file=$file;
// TODO Replace trigger by a hook. Triggers must be used for business events only.
// REGIS just after of hook testing
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($db);
$result=$interface->run_triggers('FILE_DELETE',$object,$user,$langs,$conf);
if ($result < 0) {
$error++; $errors=$interface->errors;
}
// Fin appel triggers
}
}
else {
dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
}
} }
} }
else else
@ -868,6 +770,7 @@ function _dolDeleteFile($file,$disableglob=0,$nophperrors=0,$notrigger=0,$object
} }
return $ok; return $ok;
}
} }
/** /**

10
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
View File

@ -529,16 +529,6 @@ class InterfaceDemo
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
elseif ($action == 'SHIPPING_BUILDDOC') elseif ($action == 'SHIPPING_BUILDDOC')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
// File
elseif ($action == 'FILE_UPLOAD')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'FILE_DELETE')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }