Rev493, Fix trayicon autostart detect, Dont leak details on ui_restrict

plugins/Trayicon/TrayiconPlugin.py

@@ -66,8 +66,8 @@ class ActionsPlugin(object):
         self.icon.die()
         time.sleep(0.1)
         sys.exit()
-        #self.main.ui_server.stop()
-        #self.main.file_server.stop()
+        # self.main.ui_server.stop()
+        # self.main.file_server.stop()
 
     def opensite(self, url):
         import webbrowser
@@ -117,7 +117,7 @@ class ActionsPlugin(object):
         cmd = " ".join(args)
 
         # Dont open browser on autorun
-        cmd = cmd.replace("start.py", "zeronet.py").replace('"--open_browser"', "").replace('"default_browser"', "")
+        cmd = cmd.replace("start.py", "zeronet.py").replace('"--open_browser"', "").replace('"default_browser"', "").strip()
 
         return "@echo off\ncd /D %s \n%s" % (os.getcwd(), cmd)
 

src/Config.py

@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.3.2"
-        self.rev = 480
+        self.rev = 493
         self.argv = argv
         self.action = None
         self.createParser()

src/Ui/UiRequest.py

@@ -4,8 +4,6 @@ import os
 import mimetypes
 import json
 import cgi
-import string
-import random
 
 from Config import config
 from Site import SiteManager
@@ -44,7 +42,7 @@ class UiRequest(object):
     # Call the request handler function base on path
     def route(self, path):
         if config.ui_restrict and self.env['REMOTE_ADDR'] not in config.ui_restrict:  # Restict Ui access by ip
-            return self.error403()
+            return self.error403(details=False)
 
         path = re.sub("^http://zero[/]+", "/", path)  # Remove begining http://zero/ for chrome extension
         path = re.sub("^http://", "/", path)  # Remove begining http for chrome extension .bit access
@@ -336,7 +334,7 @@ class UiRequest(object):
                     else:
                         self.log.debug("File not found: %s" % match.group("inner_path"))
                         # Site larger than allowed, re-add wrapper nonce to allow reload
-                        if site.settings.get("size", 0) > site.getSizeLimit()*1024*1024:
+                        if site.settings.get("size", 0) > site.getSizeLimit() * 1024 * 1024:
                             self.server.wrapper_nonces.append(self.get.get("wrapper_nonce"))
                         return self.error404(match.group("inner_path"))
 
@@ -454,9 +452,9 @@ class UiRequest(object):
         return self.formatError("Bad Request", message)
 
     # You are not allowed to access this
-    def error403(self, message=""):
+    def error403(self, message="", details=True):
         self.sendHeader(403)
-        return self.formatError("Forbidden", message)
+        return self.formatError("Forbidden", message, details=details)
 
     # Send file not found error
     def error404(self, path=""):
@@ -468,7 +466,7 @@ class UiRequest(object):
         self.sendHeader(500)
         return self.formatError("Server error", cgi.escape(message))
 
-    def formatError(self, title, message, details = True):
+    def formatError(self, title, message, details=True):
         import sys
         import gevent
 

src/Ui/UiServer.py

@@ -134,8 +134,8 @@ class UiServer:
             try:
                 sock.send("bye")
                 sock.shutdown(socket.SHUT_RDWR)
-                #sock._sock.close()
-                #sock.close()
+                # sock._sock.close()
+                # sock.close()
                 sock_closed += 1
             except Exception, err:
                 self.log.debug("Http connection close error: %s" % err)