Changeset 291

Timestamp:

06/22/08 22:13:09 (7 months ago)

Author:

heyadayo

Message:

Dameonization, configuration, and logging.

Location:

branches/0.5/daemon

Files:

• orbited.cfg (added)
• orbited/config.py (modified) (3 diffs)
• orbited/control.py (added)
• orbited/logger/log.py (modified) (3 diffs)
• orbited/proxy.py (modified) (3 diffs)
• orbited/start.py (modified) (3 diffs)
• orbited/tcp.py (modified) (5 diffs)
• setup.py (modified) (1 diff)

branches/0.5/daemon/orbited/config.py

@@ +1 @@
+import os
+import sys
+
 map = {
     '[global]': {
-        'http.port': '7000',
-        'log.enabled': '0'
     },
-    '[access]': [
-        ('localhost', 9998), # Allow WebSocket test daemon
-        ('irc.freenode.net', 6667), # Allow chat demo
-        ('www.google.com', 80)
-    ],
-
     '[logging]': {
         'debug': 'SCREEN',
@@ -19 +14 @@
     },
     '[loggers]': {
+    
+    },
+    'default_config': 1, # set to 0 later if we load a config file
+    '[listen]': [
+    ],
+    '[access]': [
+    ],
+}
+
+defaults = {
+    '[access]': [
+        ('localhost', 9998), # Allow WebSocket test daemon
+        ('irc.freenode.net', 6667), # Allow chat demo
+        ('www.google.com', 80) # Telnet demo defaults
+    ],
+    '[listen]': [
+        'http://:8000',
+#        'https://:8043'
+    ],
+#    '[ssl]': {
+#        'key': 'orbited.key',
+#        'crt': 'orbited.crt'
+#    },
+    '[loggers]': {
         'WebSocket': 'debug,info,access,warn,error',
     },        
-    'default_config': 1, # set to 0 later if we load a config file
 }
 
@@ -28 +46 @@
     return True
 
-def load(filename):
+def setup():
     try:
-        f = open(filename)
-        lines = [line.strip() for line in f.readlines()]
-        map['default_config'] = 0
+        path = os.path.join('/', 'etc', 'orbited.cfg')
+        configfile = open(path, 'r')
+        print "using config file:", path
+        return load(configfile)
+    except:
+        pass
+    try:
+        path = os.path.join('/', 'Program Files', 'Orbited', 'etc', 'orbited.cfg')
+        configfile = open(path, 'r')
+        print "using config file:", path
+        return load(configfile)
+    except:
+        pass
+    try:
+        configfile = open('orbited.cfg', 'r')
+        print "using config file: ./orbited.cfg"
+        return load(configfile)
+    except:
+        pass
+    print "Could not locate configuration file. Using default configuration"
+    map.update(defaults)
     
-    except IOError:    
-        print filename, 'could not be found. Using default configuration'
-        return False
-        # lines = default.split('\n')
-    
+def load(f):
+    lines = [line.strip() for line in f.readlines()]
+    map['default_config'] = 0    
     section = None
-    for line in lines:
-        
-        # ignore comments
-        if '#' in line:
-            line, comment = line.split('#', 1)
-        if not line:
-            continue
-        
-        # start of new section; create a dictionary for it in map if one
-        # doesn't already exist
-        if line.startswith('[') and line.endswith(']'):
-            section = line
-            if section not in map:
-                map[section]  = {}
-            continue
-        
-        # assign each source in the proxy section to a target address and port
-        if section == '[access]':
-            if ':' in target:
-                addr, port = target.split(':', 1)
-                port = int(port)
-            else:
-                addr, port = target, 80
-            map[section].append((addr, port))
-            continue
-        
-        # skip lines which do not assign a value to a key
-        if '=' not in line:
-            continue
-        
-        key, value = [side.strip() for side in line.split('=', 1)]
-        
-        # in log section, value should be a tuple of one or two values
-        if section == '[log]':
-            value = tuple([val.strip() for val in value.split(',', 1)])
-        
-        map[section][key] = value
-        
+    try:
+        for (i, line) in enumerate(lines):
+            print i, line
+            # ignore comments
+            if '#' in line:
+                line, comment = line.split('#', 1)
+            if not line:
+                continue
+            
+            # start of new section; create a dictionary for it in map if one
+            # doesn't already exist
+            if line.startswith('[') and line.endswith(']'):
+                section = line
+                if section not in map:
+                    map[section]  = {}
+                continue
+            
+            # assign each source in the proxy section to a target address and port
+            if section == '[access]':
+                if ':' in line:
+                    addr, port = line.split(':', 1)
+                    port = int(port)
+                else:
+                    addr, port = target, 80
+                map[section].append((addr, port))
+                continue
+            if section == '[listen]':
+                map[section].append(line)
+                continue
+            
+            # skip lines which do not assign a value to a key
+            if '=' not in line:
+                print "Configuration parse error on line", i
+                sys.exit(0)
+            
+            key, value = [side.strip() for side in line.split('=', 1)]
+            
+            # in log section, value should be a tuple of one or two values
+            if section == '[log]':
+                value = tuple([val.strip() for val in value.split(',', 1)])
+            
+            map[section][key] = value
+    except Exception, e:
+        print e
+        sys.exit(0)
     return True
+
+setup()

branches/0.5/daemon/orbited/logger/log.py

@@ -39 +39 @@
         self.overrides = overrides
         self.loggers = {}
-        
         
     def create_logger(self, name):
@@ -147 +146 @@
             exception, instance, tb = traceback.sys.exc_info()
             output += "".join(traceback.format_tb(tb))
+            self.debug(output)
         if kwargs.get('stack', False):
             output += "".join(traceback.format_stack()[:-1])
@@ -155 +155 @@
 class ScreenLog(object):
     def __init__(self):
+        self.enabled = True
         pass
     
     def log(self, data):
-        sys.stdout.write(data)
-
+        if not self.enabled:
+            return
+        # Something weird was happening with the daemonization stuff
+        # that made this just break.
+        try:
+            sys.stdout.write(data)
+        except:
+            self.enabled = False
     def open(self):
         pass

branches/0.5/daemon/orbited/proxy.py

@@ -5 +5 @@
 from logger import get_logger
 
-log = get_logger("TCPConnection")
+logger = get_logger("Proxy")
 class ProxyProtocol(Protocol):
-       
     def send(self, msg):
-#        print "%s:%s (%s) -> %s" % ( self.host, self.port, len(msg),  msg.replace('\r', '\\r').replace('\n', '\\n'))
+        logger.debug("%s:%s (%s) -> %s" % ( self.host, self.port, len(msg),  msg.replace('\r', '\\r').replace('\n', '\\n')))
         self.transport.write(msg)
         
     def dataReceived(self, data):
+        logger.debug("%s:%s (%s) <- %s" % ( self.host, self.port, len(data),  data.replace('\r', '\\r').replace('\n', '\\n\n')))
         self.proxy_conn.send(data)
 
@@ -25 +25 @@
     def connect(self, host, port):
         d = defer.Deferred()
-#        print "opening remote connection to %s:%s" % (host, port)
+        logger.debug("opening remote connection to %s:%s" % (host, port))
         self.c.connectTCP(host, port).addCallback(self.connected, d, host, port)
         return d
@@ -59 +59 @@
             self.port = int(port)
             if (self.host, self.port) not in config['[access]']:
-                print 'unauthorized', data
+                logger.warn('unauthorized', data)
                 raise (Exception("Unauthorized"), "(host, port) pair not authorized for proxying")
-            log.access(self.getClientIP(), "TCP/raw", " -> ", self.host, ":", self.port, " [ ", self.getClientIP(), " ]")
+            logger.access(self.getClientIP(), "TCP/raw", " -> ", self.host, ":", self.port, " [ ", self.getClientIP(), " ]")
             self.factory.client.connect(self.host, self.port).addCallback(self.connected_remote)
             self.state = 'proxy'
         except Exception, x:
+            logger.warn("Invalid handshake: " + str(x) + " (payload: %s)" % data)
             self.send("Invalid handshake: " + str(x) + " (payload: %s)" % data)
             self.loseConnection()

branches/0.5/daemon/orbited/start.py

@@ +1 @@
+import urlparse
 import sys
 import os
@@ -16 +17 @@
     from echo import EchoFactory
     from proxy import SimpleProxyFactory
-#    from jsonproxy import JsonProxyFactory
     from binaryproxy import BinaryProxyFactory
     from websocket import WebSocketFactory
@@ -23 +23 @@
     root.putChild('binaryproxy', BinaryProxyFactory())
     root.putChild('websocket', WebSocketFactory())
-    port = int(config['[global]']['http.port'])
-    logger.info('Listening HTTP@%s' % port)
-    reactor.listenTCP(port, site)
-    # Listen on SSL port
-#    reactor.listenSSL(8043, site, ssl.DefaultOpenSSLContextFactory("orbited.key", "orbited.crt"))
+    for addr in config['[listen]']:
+        url = urlparse.urlparse(addr)
+        hostname = url.hostname
+        if hostname == None:
+            hostname = ''
+        if url.scheme == 'http':
+            logger.info('Listening http@%s' % url.port)
+            reactor.listenTCP(url.port, site, interface=hostname)
+        elif url.scheme == 'https':
+            crt = config['[ssl]']['crt']
+            key = config['[ssl]']['key']
+            try:
+                ssl_context = ssl.DefaultOpenSSLContextFactory(key, crt)
+            except ImportError:
+                raise
+            except:
+                logger.error("Error opening key or crt file: %s, %s" % (key, crt))
+                sys.exit(0)
+            logger.info('Listening https@%s (%s, %s)' % (url.port, key, crt))
+            reactor.listenSSL(url.port, site, ssl_context)
+        else:
+            logger.error("Invalid Listen URI: %s" % addr)
+            sys.exit(0)
     reactor.run()
 

branches/0.5/daemon/orbited/tcp.py

@@ -3 +3 @@
 from twisted.web import server, resource, static, error
 from twisted.internet import reactor, defer
+from logger import get_logger
 import transports
 
@@ -10 +11 @@
 
 class TCPConnection(resource.Resource):
+    logger = get_logger("TCPConnection")
     ping_timeout = 20
     ping_interval = 20
@@ -132 +134 @@
         
     def render(self, request):
-#        print '==='
-#        print request
-        print request
-#        print request
-#        print request
-#        print request
-#        print request
-#        print '==='
+        self.logger.debug(request)
         transport_name = request.args.get('transport', [None])[0]
         if transport_name:
@@ -204 +199 @@
 class TCPConnectionFactory(resource.Resource):
     protocol = TCPConnection
+    logger = get_logger("TCPConnectionFactory")
     def __init__(self):
         resource.Resource.__init__(self)
@@ -215 +211 @@
     
     def render(self, request):
+        self.logger.debug(request)
         id = self.create_session(request)
         return id

branches/0.5/daemon/setup.py

@@ -35 +35 @@
         [console_scripts]
         orbited = orbited.start:main
+        orbitedctl = orbited.control:main
     ''',