Fix XSS issue where external pages could alter DOM.

[irc/quakenet/qwebirc.git] / run.py

diff --git a/run.py b/run.py
old mode 100644 (file)
new mode 100755 (executable)
index 538e359..4a00ad0
--- a/run.py
+++ b/run.py
@@ -5,11 +5,11 @@ bin.compile.vcheck()
 
 DEFAULT_PORT = 9090
 
-from twisted.scripts.twistd import run
 from optparse import OptionParser
 import sys, os, config
 
 def run_twistd(args1=None, args2=None):
+  from twisted.scripts.twistd import run
   args = [sys.argv[0]]
   if args1 is not None:
     args.extend(args1)
@@ -23,7 +23,19 @@ def help_reactors(*args):
   run_twistd(["--help-reactors"])
   sys.exit(1)
 
-DEFAULT_REACTOR = "select" if os.name == "nt" else "poll"  
+try:
+  from select import epoll
+  DEFAULT_REACTOR = "epoll"
+except ImportError:
+  try:
+    from select import kqueue
+    DEFAULT_REACTOR = "kqueue"
+  except ImportError:
+    try:
+      from select import poll
+      DEFAULT_REACTOR = "poll"
+    except ImportError:
+      DEFAULT_REACTOR = "select"
 
 parser = OptionParser()
 parser.add_option("-n", "--no-daemon", help="Don't run in the background.", action="store_false", dest="daemonise", default=True)
@@ -37,8 +49,12 @@ parser.add_option("-l", "--logfile", help="Path to twisted log file.", dest="log
 parser.add_option("-c", "--clf", help="Path to web CLF (Combined Log Format) log file.", dest="clogfile")
 parser.add_option("-C", "--certificate", help="Path to SSL certificate.", dest="sslcertificate")
 parser.add_option("-k", "--key", help="Path to SSL key.", dest="sslkey")
+parser.add_option("-H", "--certificate-chain", help="Path to SSL certificate chain file.", dest="sslchain")
 parser.add_option("-P", "--pidfile", help="Path to store PID file", dest="pidfile")
 parser.add_option("-s", "--syslog", help="Log to syslog", action="store_true", dest="syslog", default=False)
+parser.add_option("-f", "--flash-port", help="Port to listen for flash policy connections on.", type="int", dest="flashPort")
+parser.add_option("--profile", help="Run in profile mode, dumping results to this file", dest="profile")
+parser.add_option("--profiler", help="Name of profiler to use", dest="profiler")
 parser.add_option("--syslog-prefix", help="Syslog prefix", dest="syslog_prefix", default="qwebirc")
 
 sargs = sys.argv[1:]
@@ -56,14 +72,20 @@ if options.debug:
   args1.append("-b")
 
 if options.reactor != DEFAULT_REACTOR:
-  args1+=["--reactor", options.reactor]
+  rn = options.reactor + "reactor"
+  getattr(__import__("twisted.internet", fromlist=[rn]), rn).install()
 if options.logfile:
   args1+=["--logfile", options.logfile]
 if options.pidfile:
   args1+=["--pidfile", options.pidfile]
 if options.syslog:
   args1+=["--syslog"]
-if options.syslog_prefix:
+if options.profile:
+  args1+=["--profile", options.profile]
+if options.profiler:
+  args1+=["--profiler", options.profiler]
+
+if options.syslog and options.syslog_prefix:
   import syslog
   syslog.openlog(options.syslog_prefix)
 
@@ -72,8 +94,13 @@ if not options.tracebacks:
 if options.clogfile:
   args2+=["--logfile", options.clogfile]
 
+if options.flashPort:
+  args2+=["--flashPort", options.flashPort]
+
 if options.sslcertificate and options.sslkey:
   args2+=["--certificate", options.sslcertificate, "--privkey", options.sslkey, "--https", options.port]
+  if options.sslchain:
+    args2+=["--certificate-chain", options.sslchain]
 else:
   args2+=["--port", options.port]