From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 12 Jun 2016 16:43:02 +0000 (+0300)
Subject: monitor output is now escaped
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=bc0c73188046d75e74a3b91d1d6d3ed785b8998d;p=motioneye-debian

monitor output is now escaped
---

diff --git a/motioneye/monitor.py b/motioneye/monitor.py
index 6612507..a3da581 100644
--- a/motioneye/monitor.py
+++ b/motioneye/monitor.py
@@ -16,9 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 
 import logging
-import re
 import subprocess
 import time
+import urllib
 
 import config
 
@@ -43,12 +43,12 @@ def get_monitor_info(camera_id):
     interval = _interval_by_camera_id.get(camera_id, DEFAULT_INTERVAL)
     if monitor_info is None or now - last_call_time > interval:
         monitor_info, interval = _exec_monitor_command(command)
-        monitor_info = re.sub('[\x00-\x20]', '&nbsp', monitor_info)
+        monitor_info = urllib.quote(monitor_info, safe='')
         _interval_by_camera_id[camera_id] = interval
         _monior_info_cache_by_camera_id[camera_id] = monitor_info
         _last_call_time_by_camera_id[camera_id] = now
-    
-    return monitor_info
+
+    return monitor_info 
 
 
 def _exec_monitor_command(command):
diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index b273a24..58768a0 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -4123,7 +4123,8 @@ function addCameraFrameUi(cameraConfig) {
                 info += ' fps';
                 
                 if (monitorInfo) {
-                    if (monitorInfo.charAt(0) == monitorInfo.charAt(monitorInfo.length - 1)) {
+                    monitorInfo = decodeURIComponent(monitorInfo);
+                    if (monitorInfo.charAt(0) == monitorInfo.charAt(monitorInfo.length - 1) == '"') {
                         monitorInfo = monitorInfo.substring(1, monitorInfo.length - 1);
                     }
                     info += '<br>' + monitorInfo;