Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-30 08:13:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't disable existing hidden services

Browse Source 
Still not perfect: can't seem to remove our temporary hs
(master branch doesn't do that either, but that's no excuse ;) )
probably something I don't understand re stem and hidden services
This commit is contained in:
The Dod 2014-10-13 11:36:10 +07:00
parent 381d046a94
commit 0302dca77f
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
onionshare/onionshare.py
View File

@ -28,9 +28,20 @@ import strings, helpers, web
class NoTor(Exception): pass
class TailsError(Exception): pass
def hsdic2list(dic):
"Convert what we get from get_conf_map to what we need for set_options"
return [
pair for pairs in [
[('HiddenServiceDir',vals[0]),('HiddenServicePort',vals[1])]
for vals in zip(dic['HiddenServiceDir'],dic['HiddenServicePort'])
] for pair in pairs
]
class OnionShare(object):
def __init__(self, debug=False, local_only=False, stay_open=False):
self.port = None
self.controller = None
self.original_hs = None
# debug mode
if debug:
@ -45,7 +56,13 @@ class OnionShare(object):
# files and dirs to delete on shutdown
self.cleanup_filenames = []
def cleanup(self):
if self.controller:
if self.original_hs:
# This doesn't seem to remove soon-to-be-stale hs. Why???
self.controller.set_options(hsdic2list(self.original_hs))
self.controller.close()
for filename in self.cleanup_filenames:
if os.path.isfile(filename):
os.remove(filename)
@ -91,23 +108,33 @@ class OnionShare(object):
self.cleanup_filenames.append(hidserv_dir)
# connect to the tor controlport
controller = False
self.controller = None
tor_control_ports = [9051, 9151]
for tor_control_port in tor_control_ports:
try:
controller = Controller.from_port(port=tor_control_port)
self.controller = Controller.from_port(port=tor_control_port)
break
except SocketError:
pass
if not controller:
if not self.controller:
raise NoTor(strings._("cant_connect_ctrlport").format(tor_control_ports))
controller.authenticate()
# set up hidden service
controller.set_options([
('HiddenServiceDir', hidserv_dir),
('HiddenServicePort', '80 127.0.0.1:{0}'.format(self.port))
])
self.original_hs = self.controller.get_conf_map('HiddenServiceOptions') or {
'HiddenServiceDir': [], 'HiddenServicePort': []
}
print hsdic2list(self.original_hs)
new_hs = self.original_hs.copy()
if not hidserv_dir in new_hs['HiddenServiceDir']:
# Unless another instance has opened
# the same persistent_hs_dir already
new_hs['HiddenServiceDir'].append(hidserv_dir)
new_hs['HiddenServicePort'].append(
'80 127.0.0.1:{0}'.format(self.port))
self.controller.set_options(hsdic2list(new_hs))
print self.controller.get_conf_map('HiddenServiceOptions')
# figure out the .onion hostname
hostname_file = '{0}/hostname'.format(hidserv_dir)
@ -249,6 +276,7 @@ def main():
t.daemon = True
t.start()
try: # Trap Ctrl-C
# wait for hs
ready = app.wait_for_hs()
if not ready:
@ -260,7 +288,6 @@ def main():
print strings._("ctrlc_to_stop")
# wait for app to close
try:
while True:
time.sleep(0.5)
except KeyboardInterrupt: