diff --git a/maarch_entreprise/trunk/index.php b/maarch_entreprise/trunk/index.php index c010ce20d34525240c6ea2288f585f55c05d482d..ab6124330099477205313c489deffd03d33a592e 100644 --- a/maarch_entreprise/trunk/index.php +++ b/maarch_entreprise/trunk/index.php @@ -72,6 +72,12 @@ if (isset($_SESSION['config']['corepath'])) { $core->load_lang(); +if (isset($_REQUEST['dir']) && !empty($_REQUEST['dir'])) { + $_REQUEST['dir'] = str_replace("\\", "", $_REQUEST['dir']); + $_REQUEST['dir'] = str_replace("/", "", $_REQUEST['dir']); + $_REQUEST['dir'] = str_replace("..", "", $_REQUEST['dir']); +} + include 'apps/maarch_entreprise/tools/maarchIVS/MaarchIVS.php'; $started = MaarchIVS::start(__DIR__ . '/xml/IVS/requests_definitions.xml', 'xml'); $valid = MaarchIVS::run('silent'); diff --git a/maarch_entreprise/trunk/tools/maarchIVS/handler/JsonConfigurationHandler.php b/maarch_entreprise/trunk/tools/maarchIVS/handler/JsonConfigurationHandler.php index 45a176425a642995f523cbfd822a172e2360b4ad..4d084bb0e5e7011ca2594d680fc146e0002a3b45 100755 --- a/maarch_entreprise/trunk/tools/maarchIVS/handler/JsonConfigurationHandler.php +++ b/maarch_entreprise/trunk/tools/maarchIVS/handler/JsonConfigurationHandler.php @@ -130,7 +130,7 @@ class JsonConfigurationHandler } // Wrong method - if ($requestDefinition->method != $method) { + if (!in_array($method, explode('|', $requestDefinition->method))) { continue; } diff --git a/maarch_entreprise/trunk/tools/maarchIVS/handler/XmlConfigurationHandler.php b/maarch_entreprise/trunk/tools/maarchIVS/handler/XmlConfigurationHandler.php index 182ad2dba7625e6e8343f215d4dffb3ad79640c3..f39ad3f7a3052d774a3faae0eef2374804481d36 100644 --- a/maarch_entreprise/trunk/tools/maarchIVS/handler/XmlConfigurationHandler.php +++ b/maarch_entreprise/trunk/tools/maarchIVS/handler/XmlConfigurationHandler.php @@ -68,8 +68,8 @@ class XmlConfigurationHandler public function getValidationRules($method, $path, $parameters=array()) { $validationRules = array(); - - $requestDefinitionElements = $this->configurationXPath->query("//requestDefinition[@method='$method' and contains('$path', @path)]"); + $query = "//requestDefinition[contains(@method, '$method') and contains('$path', @path)]"; + $requestDefinitionElements = $this->configurationXPath->query($query); foreach ($requestDefinitionElements as $requestDefinitionElement) { if (!$requestDefinitionElement->hasAttribute('validationRule')) {