crimeflare
/
cloudflare-tor
mirror of https://codeberg.org/crimeflare/cloudflare-tor
0
0
Fork 0
Code Issues Releases Activity

Merge branch 'socks' of ts/cloudflare-tor into master

This commit is contained in:
Jeff Cliff 2019-01-05 05:14:33 +00:00 committed by Gogs
parent 1d38d21aa4 820023341b
commit 4eb3014f95
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
globalist/README.md
View File

@ -13,10 +13,10 @@ The official repository can be found at https://notabug.org/themusicgod1/cloudfl
## Usage ## 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`. 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 ### Create repository

14
globalist/globalist/__init__.py
View File

@ -248,7 +248,7 @@ def clone(config):
where += ".git" where += ".git"
how = ["--bare", "--mirror"] how = ["--bare", "--mirror"]
cloneproc = subprocess.Popen(["torsocks", "-P", STATUS['socksport'], "git", "clone"] + how + [what, where]) cloneproc = subprocess.Popen(["torsocks", "-P", str(STATUS['socksport']), "git", "clone"] + how + [what, where])
if cloneproc.wait() != 0: if cloneproc.wait() != 0:
print ("Error cloning, exiting.") print ("Error cloning, exiting.")
return -1 return -1
@ -336,6 +336,12 @@ def main(args=[]):
opt.add_option("-C", "--control-port", dest="a_controlport", action="store", type="int", opt.add_option("-C", "--control-port", dest="a_controlport", action="store", type="int",
default=9151, metavar="PORT", help="Tor controlport") 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", opt.add_option("-a", "--await", dest="o_ap", action="store_true",
default=False, help="await publication of .onion in DHT before proceeding") default=False, help="await publication of .onion in DHT before proceeding")
@ -362,9 +368,13 @@ def main(args=[]):
options.a_controlport = DEFAULT_CONTROLPORT options.a_controlport = DEFAULT_CONTROLPORT
# Extract socksport via c.get_conf and use this (-P in torsocks) # 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 = Controller.from_port(port = options.a_controlport)
controller.authenticate() controller.authenticate()
STATUS['socksport'] = controller.get_conf('SocksPort').split(" ",1)[0] if controller.get_conf('SocksPort'):
STATUS['socksport'] = controller.get_conf('SocksPort').split(" ",1)[0]
else:
STATUS['socksport'] = 9050
controller.close() controller.close()
config = cp.ConfigParser() config = cp.ConfigParser()

BIN
globalist/globalist/__pycache__/__init__.cpython-36.pyc Normal file
View File

Binary file not shown.