notificationeventwebhook : htmlentities suppressed for url

Author: ericferon

inc/config.class.php

@@ -35,11 +35,22 @@ class PluginWebhookConfig extends CommonDBTM {
    protected $usenotepad         = true;
    const WEBHOOK_TYPE = 99;
 
+   protected $plugin_webhook_configs_id_field = 'plugin_webhook_configs_id';
+
    static function getTypeName($nb=0) {
 
       return __('Webhooks Config', 'webhook');
    }
 
+    /**
+     * called by children (PluginWebhookConfigHeader)
+     **/
+    public function getPluginWebhookConfigIdField()
+    {
+        return $this->plugin_webhook_configs_id_field;
+    }
+
+
    // search fields from GLPI 9.3 on
    function rawSearchOptions() {
 
@@ -60,7 +71,7 @@ function rawSearchOptions() {
 		 'massiveaction' => false
       ];
 
-      $tab[] = [
+/*      $tab[] = [
          'id'            => '3',
          'table'         => $this->getTable(),
          'field'         => 'address',
@@ -84,7 +95,7 @@ function rawSearchOptions() {
          'name'     => PluginWebhookSecretType::getTypeName(1),
          'datatype' => 'dropdown'
       ];
-
+*/
       $tab[] = [
          'id'       => '10',
          'table'    => $this->getTable(),
@@ -109,6 +120,7 @@ function defineTabs($options=[]) {
 
       $ong = [];
       $this->addDefaultFormTab($ong);
+      $this->addStandardTab('PluginWebhookConfigRequest', $ong, $options);
       $this->addStandardTab('Log', $ong, $options);
 
       return $ong;
@@ -127,7 +139,7 @@ function showForm ($ID, $options=[]) {
       echo "</td>";
 	  echo "</tr>";
 
-      echo "<tr class='tab_bg_1'>";
+/*      echo "<tr class='tab_bg_1'>";
       //operation
       echo "<td>".__('REST Verb').": </td>";
       echo "<td>";
@@ -152,19 +164,19 @@ function showForm ($ID, $options=[]) {
       echo Html::input('secret',['value' => $this->fields['secret'], 'id' => "secret" , 'width' => '100%']);
       echo "</td>";
 	  echo "</tr>";
-	  
+*/	  
       echo "<tr class='tab_bg_1'>";
       //debug mode
       echo "<td>".__('Debug mode', 'webhook')."</td>";
       echo "<td>";
       Dropdown::showYesNo('debug',$this->fields['debug']);
       echo "</td>";
       //user
-      echo "<td>".__('User')."</td>";
+/*      echo "<td>".__('User')."</td>";
       echo "<td>";
       echo Html::input('user',['value' => $this->fields['user'], 'id' => "user" , 'size' => 50]);
       echo "</td>";
-	  echo "</tr>";
+*/	  echo "</tr>";
 
       $this->showFormButtons($options);
 

inc/notificationeventwebhook.class.php

@@ -30,6 +30,8 @@
 }
 
 function str_replace_deep($search, $replace, $subject) {
+	if (is_null($subject))
+		return '';
     if (is_array($subject))
     {
         foreach($subject as &$oneSubject)
@@ -158,7 +160,8 @@ static public function extraRaise($params) {
 							$key = $webhook_infos[static::getTargetFieldName()];
 							$url = $webhook_infos['additionnaloption']['address']; 
 							$url = NotificationTemplate::process($webhook_infos['additionnaloption']['address'], $data); // substitute variables in url
-							$url = str_replace(["\n", "\r", "\t"], ['', '', ''], htmlentities($url)); // translate HTML-significant characters and suppress remaining escape characters
+//							$url = str_replace(["\n", "\r", "\t"], ['', '', ''], htmlentities($url)); // translate HTML-significant characters and suppress remaining escape characters
+							$url = str_replace(["\n", "\r", "\t"], ['', '', ''], $url); // suppress remaining escape characters
 							if ($template_datas = $template->getByLanguage($webhook_infos['language']))
 							{
 								$template_datas  = Sanitizer::unsanitize($template_datas); // unescape html from DB
@@ -169,11 +172,12 @@ static public function extraRaise($params) {
 									$template = $template_datas['content_html'];
 
 								// escape double quotes (as the LF, CR and TAB characters)
-								$data = str_replace_deep(["\n", "\r", "\t", '"'], ['\\n', '\\r', '\\t', '\\"'], $data);
+								$data = str_replace_deep(["\\","\n", "\r", "\t", '"'], ['\\\\', '\\n', '\\r', '\\t', '\\"'], $data);
 
 								$content = NotificationTemplate::process($template, $data);
 								$curl = curl_init($url);
-								$secrettype = $webhook_infos['additionnaloption']['plugin_webhook_secrettypes_id'];    
+								$secrettype = $webhook_infos['additionnaloption']['plugin_webhook_secrettypes_id']; 
+								$headers = array();
 								switch ($secrettype)
 								{
 									case 1: // No Authentication
@@ -213,7 +217,7 @@ static public function extraRaise($params) {
 
 								$status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
-								if ( $status != 200 && $status != 201 ) {
+								if ( $status < 200 || $status >= 300) {
 									Session::addMessageAfterRedirect("<font color='red'>"."Error: call to URL $url failed with status $status, response $json_response, curl_error " . curl_error($curl) . ", curl_errno " . curl_errno($curl)."</font>", false, ERROR);
 									Toolbox::logInFile("webhook", "Error : call to URL $url failed with status $status, response $json_response, curl_error " . curl_error($curl) . ", curl_errno " . curl_errno($curl).PHP_EOL."HTTP Headers : ".print_r($headers,true).PHP_EOL."POST Content : ".print_r($content,true).PHP_EOL);
 								}

setup.php

@@ -111,7 +111,7 @@ function plugin_version_webhook() {
 
    return [
       'name' => _n('Webhook', 'Webhooks', 2, 'webhook'),
-      'version' => '1.0.18',
+      'version' => '1.0.19',
       'author'  => "Eric Feron",
       'license' => 'GPLv2+',
       'homepage'=> 'https://github.com/ericferon/glpi-webhook',

webhook.xml

@@ -22,6 +22,11 @@
 		<author>Eric Feron</author>
 	</authors>
 	<versions>
+		<version>
+			<num>1.0.19</num>
+			<compatibility>>=10.0.3</compatibility>
+			<download_url>https://github.com/ericferon/glpi-webhook/releases/download/v1.0.19/webhook-v1.0.19.tar.gz</download_url>
+		</version>
 		<version>
 			<num>1.0.18</num>
 			<compatibility>>=10.0.3</compatibility>