summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortraumschule <traumschuleriebau@riseup.net>2018-10-04 03:00:23 +0200
committertraumschule <traumschuleriebau@riseup.net>2018-10-04 03:00:23 +0200
commit2daa8328802ac0c8b369364a5eb8e13181513b2d (patch)
treefa366d9151251ddb45193048cd931c2c3e91a47a
parentbbeea90150e2ee4f2295bd7b043803cfd9d24511 (diff)
downloadcloudflare-tor-2daa8328802ac0c8b369364a5eb8e13181513b2d.tar
cloudflare-tor-2daa8328802ac0c8b369364a5eb8e13181513b2d.tar.gz
cloudflare-tor-2daa8328802ac0c8b369364a5eb8e13181513b2d.tar.lz
cloudflare-tor-2daa8328802ac0c8b369364a5eb8e13181513b2d.tar.xz
cloudflare-tor-2daa8328802ac0c8b369364a5eb8e13181513b2d.zip
globalist: IDEA to implement Tor ControlPort authentication
-rwxr-xr-xglobalist/globalist/__init__.py7
-rw-r--r--globalist/globalist/__pycache__/__init__.cpython-36.pycbin0 -> 9716 bytes
2 files changed, 7 insertions, 0 deletions
diff --git a/globalist/globalist/__init__.py b/globalist/globalist/__init__.py
index a2e7e5f0..172edfb2 100755
--- a/globalist/globalist/__init__.py
+++ b/globalist/globalist/__init__.py
@@ -336,6 +336,12 @@ def main(args=[]):
opt.add_option("-C", "--control-port", dest="a_controlport", action="store", type="int",
default=9151, metavar="PORT", help="Tor controlport")
+# opt.add_option("-CP", "--control-password", dest="a_controlpassword", action="store", type="int",
+# default="", help="Tor Control Password")
+
+# opt.add_option("-CC", "--control-cookie", dest="a_controlcookie", action="store", type="int",
+# default="", help="Tor Control Cookie")
+
opt.add_option("-a", "--await", dest="o_ap", action="store_true",
default=False, help="await publication of .onion in DHT before proceeding")
@@ -362,6 +368,7 @@ def main(args=[]):
options.a_controlport = DEFAULT_CONTROLPORT
# Extract socksport via c.get_conf and use this (-P in torsocks)
+ # TODO implement authentication token / cookie
controller = Controller.from_port(port = options.a_controlport)
controller.authenticate()
STATUS['socksport'] = controller.get_conf('SocksPort').split(" ",1)[0]
diff --git a/globalist/globalist/__pycache__/__init__.cpython-36.pyc b/globalist/globalist/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 00000000..fc0520c6
--- /dev/null
+++ b/globalist/globalist/__pycache__/__init__.cpython-36.pyc
Binary files differ