From 27368a2d98458babe6e9c97e598d611a822b18a9 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 25 Dec 2017 15:51:31 +0000
Subject: [PATCH] webui: Stop stripping html tags from snmp creds (#7951)

---
 html/pages/addhost.inc.php | 10 +++++-----
 includes/common.php        |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index 8be5efdc2e4a..8aa464d05e36 100644
--- a/html/pages/addhost.inc.php
+++ b/html/pages/addhost.inc.php
@@ -52,7 +52,7 @@
             );
         } elseif ($_POST['snmpver'] === 'v2c' || $_POST['snmpver'] === 'v1') {
             if ($_POST['community']) {
-                $config['snmp']['community'] = array(clean($_POST['community']));
+                $config['snmp']['community'] = array(clean($_POST['community'], false));
             }
 
             $snmpver = clean($_POST['snmpver']);
@@ -60,11 +60,11 @@
         } elseif ($_POST['snmpver'] === 'v3') {
             $v3 = array(
                    'authlevel'  => clean($_POST['authlevel']),
-                   'authname'   => clean($_POST['authname']),
-                   'authpass'   => clean($_POST['authpass']),
+                   'authname'   => clean($_POST['authname'], false),
+                   'authpass'   => clean($_POST['authpass'], false),
                    'authalgo'   => clean($_POST['authalgo']),
-                   'cryptopass' => clean($_POST['cryptopass']),
-                   'cryptoalgo' => clean($_POST['cryptoalgo']),
+                   'cryptopass' => clean($_POST['cryptopass'], false),
+                   'cryptoalgo' => clean($_POST['cryptoalgo'], false),
                   );
 
             array_push($config['snmp']['v3'], $v3);
diff --git a/includes/common.php b/includes/common.php
index 32a2587565e9..0de727b9575c 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -1513,11 +1513,16 @@ function print_list($list, $format, $max = 10)
 
 /**
  * @param $value
+ * @param bool $strip_tags
  * @return string
  */
-function clean($value)
+function clean($value, $strip_tags = true)
 {
-    return strip_tags(mres($value));
+    if ($strip_tags === true) {
+        return strip_tags(mres($value));
+    } else {
+        return mres($value);
+    }
 }
 
 /**