From 2daa8328802ac0c8b369364a5eb8e13181513b2d Mon Sep 17 00:00:00 2001 From: traumschule Date: Thu, 4 Oct 2018 03:00:23 +0200 Subject: globalist: IDEA to implement Tor ControlPort authentication --- globalist/globalist/__init__.py | 7 +++++++ globalist/globalist/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 9716 bytes 2 files changed, 7 insertions(+) create mode 100644 globalist/globalist/__pycache__/__init__.cpython-36.pyc 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 Binary files /dev/null and b/globalist/globalist/__pycache__/__init__.cpython-36.pyc differ -- cgit v1.2.3