From 20371895c9542026ce83286db157d915d87b5d3f Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Thu, 2 May 2019 18:02:56 +0200
Subject: [PATCH] Rev4090, Remove fs paths from error responses

---
 src/Config.py         | 2 +-
 src/Debug/Debug.py    | 7 +++++++
 src/Ui/UiWebsocket.py | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Config.py b/src/Config.py
index baa558a4..8c46554a 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.0"
-        self.rev = 4089
+        self.rev = 4090
         self.argv = argv
         self.action = None
         self.pending_changes = {}
diff --git a/src/Debug/Debug.py b/src/Debug/Debug.py
index b4a84d6c..4c4099f7 100644
--- a/src/Debug/Debug.py
+++ b/src/Debug/Debug.py
@@ -13,6 +13,12 @@ class Notify(Exception):
         return self.message
 
 
+def formatExceptionMessage(err):
+    err_type = err.__class__.__name__
+    err_message = str(err.args[-1])
+    return "%s: %s" % (err_type, err_message)
+
+
 def formatException(err=None, format="text"):
     import traceback
     if type(err) == Notify:
@@ -56,6 +62,7 @@ import logging
 import gevent
 import time
 
+
 def testBlock():
     logging.debug("Gevent block checker started")
     last_time = time.time()
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index ba84f3a3..31a28c7b 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -677,7 +677,7 @@ class UiWebsocket(object):
             return list(self.site.storage.walk(inner_path))
         except Exception as err:
             self.log.error("fileList %s error: %s" % (inner_path, Debug.formatException(err)))
-            return {"error": str(err)}
+            return {"error": Debug.formatExceptionMessage(err)}
 
     # List directories in a directory
     def actionDirList(self, to, inner_path):
@@ -685,7 +685,7 @@ class UiWebsocket(object):
             return list(self.site.storage.list(inner_path))
         except Exception as err:
             self.log.error("dirList %s error: %s" % (inner_path, Debug.formatException(err)))
-            return {"error": str(err)}
+            return {"error": Debug.formatExceptionMessage(err)}
 
     # Sql query
     def actionDbQuery(self, to, query, params=None, wait_for=None):
@@ -696,7 +696,7 @@ class UiWebsocket(object):
             res = self.site.storage.query(query, params)
         except Exception as err:  # Response the error to client
             self.log.error("DbQuery error: %s" % err)
-            return self.response(to, {"error": str(err)})
+            return self.response(to, {"error": Debug.formatExceptionMessage(err)})
         # Convert result to dict
         for row in res:
             rows.append(dict(row))
@@ -729,7 +729,7 @@ class UiWebsocket(object):
             with gevent.Timeout(timeout):
                 self.site.needFile(inner_path, priority=6)
         except Exception as err:
-            return self.response(to, {"error": str(err)})
+            return self.response(to, {"error": Debug.formatExceptionMessage(err)})
         return self.response(to, "ok")
 
     def actionFileRules(self, to, inner_path, use_my_cert=False, content=None):