Changeset 3841

Timestamp:

12/16/08 13:16:38 (4 years ago)

Author:

rcarvalho

Message:

 

Location:

branch/UmitWeb

Files:

• share/umit/config/umitweb.conf (modified) (2 diffs)
• umitCore/BasePaths.py (modified) (2 diffs)
• umitWeb/Database.py (modified) (2 diffs)
• umitWeb/Server.py (modified) (2 diffs)
• umitWeb/WebPaths.py (modified) (4 diffs)
• umitweb.py (modified) (1 diff)

branch/UmitWeb/share/umit/config/umitweb.conf

@@ -98 +98 @@
 enable_highlight = True
 
-[paths]
-config_file = config/umit.conf
-umit_icon = share/icons/umit/umit_48.ico
-nmap_command_path = nmap
-locale_dir = share/locale
-misc_dir = misc
-icons_dir = share/icons/umit
-pixmaps_dir = share/pixmaps
-config_dir = /home/rodox/.umit
-docs_dir = docs
-
 [port_list_highlight]
 regex = PORT\s+STATE\s+SERVICE(\s+VERSION)?.*
@@ -117 +106 @@
 underline = 0
 
+[web]
+server_port = 8859
+server_address = 0.0.0.0
+requires_root = true

branch/UmitWeb/umitCore/BasePaths.py

@@ -47 +47 @@
 
 base_paths = dict(config_file = 'umit.conf',
-                  webconfig_file = 'umitweb.conf',
-                  security_file = 'security.xml',
                   config_dir = '.umit',
                   user_dir = os.path.join(HOME, '.umit'),
@@ -73 +71 @@
                   i18n_search_sequence = [os.path.join(CURRENT_DIR, LOCALE_DIR), HOME],
                   umitdb = "umit.db",
-                  umitdb_web = "umitweb.db",
 
                   services = "nmap-services",

branch/UmitWeb/umitWeb/Database.py

@@ -24 +24 @@
 from types import ListType
 from traceback import print_exc
+from umitWeb.WebPaths import WPath as Path
 
 try:
@@ -32 +33 @@
     import pysqlite2 as sqlite
 
-#Temporary - waiting instructions about UmitConf
-__connection__ = dbmodule.connect(os.path.join("web.db"))
+try:
+    webdb = Path.web_db
+except:
+    webdb = os.path.join(Path.config_dir, "web.db")
+    Path.web_db = webdb
+    
+__connection__ = dbmodule.connect(Path.web_db)
 
 

branch/UmitWeb/umitWeb/Server.py

@@ -34 +34 @@
 from umitWeb.WebLogger import getLogger
 from umitWeb.Security import Context
+from umitWeb.WebPaths import WPath as Path
 from threading import Thread
 
@@ -260 +261 @@
     
     def __init__(self):
-        HTTPServer.__init__(self, ("0.0.0.0", 8059), UmitRequestHandler)
+        HTTPServer.__init__(self, (Path.web_server_address, int(Path.web_server_port)), UmitRequestHandler)
         UmitWebServer.currentInstance = self
         

branch/UmitWeb/umitWeb/WebPaths.py

@@ -17 +17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from os.path import join, split, exists
-from umitCore.BasePaths import base_paths, HOME
+from os.path import join, split, exists, dirname
+import re
+from umitCore.BasePaths import base_paths, HOME, CONFIG_DIR
 from umitCore.Paths import Paths, Path, copy_config_file
 
@@ -25 +26 @@
 
 base_paths.update(dict(webconfig_file='umitweb.conf',
-                       security_file='security.xml'))
+                       config_file='umitweb.conf',
+                       security_file='security.xml',
+                       web_db=join('share', 'config', 'web.db')))
                        
 class WebPaths(Paths):
     templates_dir = TEMPLATES_DIR
     media_dir = MEDIA_DIR
+    web_section = "web"
     
     def __init__(self):
@@ -41 +45 @@
             "webconfig_file",
             "security_file",
-            "umitdb_web"
+            "web_db"
+        ]
+        
+        self.web_settings = [
+            "web_server_port",
+            "web_server_address",
+            "web_requires_root"
         ]
     
@@ -50 +60 @@
            not exists(join(self.config_dir, "umitweb.conf")):
            create_web_files(self.config_file, HOME)
+           
+    def __getattr__(self, name):
+        if self.config_file_set:
+            try:
+                attr = Paths.__getattr__(self, name)
+                return attr
+            except NameError, e:
+                if name in self.web_settings:
+                    return self.config_parser.get(self.web_section, re.sub(r"^web_", "", name))
+                else:
+                    raise e
+        else:
+            raise Exception("Must set config file location first")
 
 
 def create_web_files(config_file, user_home):
     user_dir = join(user_home, base_paths['config_dir'])
-    main_dir = split(config_file)[0]
+    main_dir = join(dirname(__file__), CONFIG_DIR)
     copy_config_file("security.xml", main_dir, user_dir)
     copy_config_file("umitweb.conf", main_dir, user_dir)

branch/UmitWeb/umitweb.py

@@ -40 +40 @@
 
 def main():
-    if sys.platform in ["linux", "darwin"]:
-        if os.getuid() != 0:
-            raise Exception, "Server MUST run as root."
+    if Path.web_requires_root in ["true", "on", "1"]:
+        if sys.platform in ["linux", "darwin"]:
+            if os.getuid() != 0:
+                raise Exception, "Server MUST run as root."
         
     server = UmitWebServer()
     try:
-        print "UmitWebServer started on 0.0.0.0:8059"
+        print "UmitWebServer started on %s:%d" % (Path.web_server_address, int(Path.web_server_port))
         server.run()
     except KeyboardInterrupt: