tor2web packaged for pip

Author: evilaliv3

contrib/debian/tor2web.init

@@ -24,11 +24,10 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=tor2web
 DAEMON=twistd
-DAEMON_ENV=/home/tor2web/t2wenv/bin/activate
 DAEMON_DIR=/home/tor2web/Tor2web-3.0
 DAEMON_PIDFILE=${DAEMON_DIR}/tor2web.pid
 DAEMON_USER=tor2web
-DAEMON_ARGS="--pidfile ${DAEMON_PIDFILE} --uid ${DAEMON_USER} --gid ${DAEMON_USER} -y ${DAEMON_DIR}/t2w.py"
+DAEMON_ARGS="--pidfile ${DAEMON_PIDFILE} --uid ${DAEMON_USER} --gid ${DAEMON_USER} -y ${DAEMON_DIR}/tor2web/t2w.py"
 
 NAME=$(basename $(readlink -nf $0))
 
@@ -72,7 +71,7 @@ else
         MAX_FILEDESCRIPTORS=8192
 fi
 
-do_setup_env()
+checks()
 {
     if [[ $EUID -ne 0 ]]; then
        log_failure_msg "Error: Tor2web init script must be run as root"
@@ -87,15 +86,6 @@ do_setup_env()
         exit 1
     fi
 
-    if [ ! -f ${DAEMON_ENV} ]
-    then
-        log_failure_msg "invalid DAEMON_ENV: ${DAEMON_ENV}"
-        log_end_msg 1
-        exit 1
-    fi
-
-    . ${DAEMON_ENV}
-
     DAEMON=`which twistd`
     if [ ! ${DAEMON} ]; then
         log_end_msg 1 "twistd is not installed"
@@ -105,7 +95,7 @@ do_setup_env()
 
 do_t2w_start()
 {
-    do_setup_env
+    checks
 
     if [ -n "$MAX_FILEDESCRIPTORS" ]; then
         ulimit -n "$MAX_FILEDESCRIPTORS"
@@ -128,7 +118,7 @@ do_t2w_start()
 
 do_t2w_stop()
 {
-    do_setup_env
+    checks
 
     start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile ${DAEMON_PIDFILE}
 }

tor2web.conf.example renamed to data/tor2web.conf.example

@@ -5,7 +5,7 @@
 nodename = [UNIQUE_IDENTIFIER]
 
 # path to Tor2web data directort
-datadir = ./data
+datadir = /home/tor2web/Tor2web-3.0/data
 
 # debug and logging
 debugtostdout = False
@@ -33,7 +33,8 @@ sockretryautomatically = True
 cipher_list = DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:RC4-SHA
 
 # Access Blocking
-blocklists = True
+mode = BLACKLIST
+onion = None
 blockcrawl = True
 
 # Mail configuration for automatic exceptions notification and user abuse notice

setup.cfg

@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+

setup.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+#-*- coding: utf-8 -*-
+
+from setuptools import setup
+
+data_files = []
+
+requires = [
+"twisted (==12.3.0)",
+"zope.interface (>=4.0.0)",
+"pyOpenSSL"
+]
+
+setup(
+    name="tor2web",
+    version="0.3",
+    author="Random GlobaLeaks developers",
+    author_email = "[email protected]",
+    url="https://tor2web.org/",
+    packages=["tor2web", "tor2web.utils"],
+    data_files=data_files,
+    requires=requires
+)

t2w.py renamed to tor2web/t2w.py

@@ -59,13 +59,13 @@
 from twisted.python.filepath import FilePath
 from twisted.python import log, logfile, failure
 
-from utils.config import VERSION, config
-from utils.lists import List, torExitNodeList
-from utils.mail import sendmail, MailException
-from utils.socks import SOCKS5ClientEndpoint, SOCKSError
-from utils.ssl import T2WSSLContextFactory
-from utils.storage import Storage
-from utils.templating import PageTemplate
+from tor2web.utils.config import VERSION, config
+from tor2web.utils.lists import List, torExitNodeList
+from tor2web.utils.mail import sendmail, MailException
+from tor2web.utils.socks import SOCKS5ClientEndpoint, SOCKSError
+from tor2web.utils.ssl import T2WSSLContextFactory
+from tor2web.utils.storage import Storage
+from tor2web.utils.templating import PageTemplate
 
 rexp = {
     'href': re.compile(r'<[a-z]*\s*.*?\s*href\s*=\s*[\\\'"]?([a-z0-9/#:\-\.]*)[\\\'"]?\s*.*?>', re.I),
@@ -684,7 +684,7 @@ def process(self):
         # because some checks must be done only for remote requests;
         # in fact local content is always served (css, js, and png in fact are used in errors)
 
-        if not verify_resource_is_local(request.host, request.uri, self.staticpath):
+        if not verify_resource_is_local(request.host, request.uri, self.staticmap):
             if not request.host:
                 return self.sendError(406, 'error_invalid_hostname.tpl')
 
@@ -733,7 +733,7 @@ def process(self):
                 self.obj.client_supports_gzip = True
 
         # 2: Content delivery stage
-        if verify_resource_is_local(request.host, request.uri, self.staticpath):
+        if verify_resource_is_local(request.host, request.uri, self.staticmap):
             # the requested resource is local, we deliver it directly
             try:
                 staticpath = request.uri
@@ -943,6 +943,8 @@ def startTor2webHTTPS(t2w, f, ip):
 ###############################################################################
 # Basic Safety Checks
 ###############################################################################
+config.load()
+
 if not os.path.exists(config.datadir):
     print "Tor2web Startup Failure: unexistent directory (%s)" % config.datadir
     exit(1)

utils/__init__.py renamed to tor2web/utils/__init__.py

@@ -45,30 +45,44 @@ class Config(Storage):
     A Storage-like class which loads and store each attribute into a portable
     conf file.
     """
-    def __init__(self, section, cfgfile="tor2web.conf"):
+    def __init__(self, cfgfile="/etc/tor2web.conf"):
         Storage.__init__(self)
+        self._file = cfgfile
+        self._section = 'main'
+        self._parser = ConfigParser.ConfigParser()
 
+    def load(self):
         try:
-            if (not os.path.exists(cfgfile) or
-                not os.path.isfile(cfgfile) or
-                not os.access(cfgfile, os.R_OK)):
-                print "Tor2web Startup Failure: cannot open config file (%s)" % cfgfile
+            if (not os.path.exists(self._file) or
+                not os.path.isfile(self._file) or
+                not os.access(self._file, os.R_OK)):
+                print "Tor2web Startup Failure: cannot open config file (%s)" % self._file
                 exit(1)
         except:
-            print "Tor2web Startup Failure: error while accessing config file (%s)" % cfgfile
+            print "Tor2web Startup Failure: error while accessing config file (%s)" % self._file
             exit(1)
 
         try:
-            self._cfgfile = cfgfile
-            self._cfgparser = ConfigParser.ConfigParser()
-            self._cfgparser.read([self._cfgfile])
-            self._section = section
+            self._parser.read([self._file])
 
-            for name in self._cfgparser.options(section):
-                value = self._cfgparser.get(self._section, name)
+            for name in self._parser.options(self._section):
+                value = self._parser.get(self._section, name)
                 self.__dict__[name] = self.parse(name)
         except:
-            raise Exception("Tor2web Error: invalid config file (%s)" % cfgfile)
+            raise Exception("Tor2web Error: invalid config file (%s)" % self._file)
+
+    def store(self):
+        """
+        Commit changes in config file.
+        """
+        if self._file is None:
+            raise Exception("Tor2web Error: cannot store configuration (never loaded)")
+
+        self._file = open(self._file, 'w')
+        try:
+            self._parser.write(self._file)
+        finally:
+            self._file.close()
 
     def splitlist(self, line):
         return [x[1:-1] if x[:1] == x[-1:] == '"' else x
@@ -77,7 +91,7 @@ def splitlist(self, line):
     def parse(self, name):
         try:
 
-           value = self._cfgparser.get(self._section, name)
+           value = self._parser.get(self._section, name)
            if value.isdigit():
                 value = int(value)
            elif value.lower() in ('true', 'false'):
@@ -106,19 +120,9 @@ def __setattr__(self, name, value):
         try:
 
             # XXX: Automagically discover variable type
-            self._cfgparser.set(self._section, name, value)
+            self._parser.set(self._section, name, value)
 
         except ConfigParser.NoOptionError:
             raise NameError(name)
 
-    def commit(self):
-        """
-        Commit changes in config file.
-        """
-        cfgfile = open(self._cfgfile, 'w')
-        try:
-            self._cfgparser.write(cfgfile)
-        finally:
-            cfgfile.close()
-
-config = Config("main")
+config = Config()

utils/config.py renamed to tor2web/utils/config.py

@@ -37,12 +37,12 @@
 from OpenSSL import SSL
 from StringIO import StringIO
 
-from utils.config import VERSION, config
-
 from twisted.internet import reactor
 from twisted.mail.smtp import ESMTPSenderFactory
 from twisted.internet.ssl import ClientContextFactory
 
+from tor2web.utils.config import VERSION, config
+
 def sendmail(authenticationUsername, authenticationSecret, fromAddress, toAddress, messageFile, smtpHost, smtpPort=25):
     """
     Sends an email using SSLv3 over SMTP