diff --git a/globalist/README.md b/globalist/README.md index 8b07a23..30cb152 100644 --- a/globalist/README.md +++ b/globalist/README.md @@ -13,10 +13,10 @@ The official repository can be found at https://notabug.org/themusicgod1/cloudfl ## Usage -To use Globalist.py python3 is needed. Either run with `python3 Globalist.py` or install it as described below. +To use Globalist.py python3 is needed. Either run it from globalist directory with `python3 Globalist.py` or or install it as described below. Per default an open tor ControlPort at 9151 without authentication is expected. You can choose another port with `-C`. -For a list of options see `--help`. +For a list of option see `--help`. ### Create repository diff --git a/globalist/globalist/__init__.py b/globalist/globalist/__init__.py index 95bc070..12bad40 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 0000000..fc0520c Binary files /dev/null and b/globalist/globalist/__pycache__/__init__.cpython-36.pyc differ