Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed call to create_ephemeral_hidden_service, and also await_publication=True to make the app.wait_for_hs() call obsolete

Browse Source
This commit is contained in:
Micah Lee 2015-09-08 17:28:23 -07:00
parent eba6dbb843
commit 629a70c249
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locale/en.json
View File

@ -44,5 +44,5 @@
"gui_please_wait": "Please wait...", "gui_please_wait": "Please wait...",
"error_hs_dir_cannot_create": "Cannot create hidden service dir {0:s}", "error_hs_dir_cannot_create": "Cannot create hidden service dir {0:s}",
"error_hs_dir_not_writable": "Hidden service dir {0:s} is not writable", "error_hs_dir_not_writable": "Hidden service dir {0:s} is not writable",
"using_ephemeral": "Using ephemeral Tor hidden service" "using_ephemeral": "Staring ephemeral Tor hidden service and awaiting publication"
} }

3
onionshare/hs.py
View File

@ -55,9 +55,10 @@ class HS(object):
self.supports_ephemeral = callable(list_ephemeral_hidden_services) and tor_version >= '0.2.7.1' self.supports_ephemeral = callable(list_ephemeral_hidden_services) and tor_version >= '0.2.7.1'
def start(self, port): def start(self, port):
print strings._("connecting_ctrlport").format(int(port))
if self.supports_ephemeral: if self.supports_ephemeral:
print strings._('using_ephemeral') print strings._('using_ephemeral')
res = self.c.create_ephemeral_hidden_service(port) res = self.c.create_ephemeral_hidden_service({ 80: port }, await_publication = True)
onion_host = res.content()[0][2].split('=')[1] + '.onion' onion_host = res.content()[0][2].split('=')[1] + '.onion'
return onion_host return onion_host

9
onionshare/onionshare.py
View File

@ -65,6 +65,7 @@ class OnionShare(object):
self.onion_host = self.hs.start(self.port) self.onion_host = self.hs.start(self.port)
def wait_for_hs(self): def wait_for_hs(self):
# legacy only, this function is no longer required with ephemeral hidden services
if self.local_only: if self.local_only:
return True return True
@ -162,7 +163,6 @@ def main(cwd=None):
try: try:
app = OnionShare(debug, local_only, stay_open, transparent_torification) app = OnionShare(debug, local_only, stay_open, transparent_torification)
app.choose_port() app.choose_port()
print strings._("connecting_ctrlport").format(int(app.port))
app.start_hidden_service() app.start_hidden_service()
except hs.NoTor as e: except hs.NoTor as e:
sys.exit(e.args[0]) sys.exit(e.args[0])
@ -187,9 +187,10 @@ def main(cwd=None):
try: # Trap Ctrl-C try: # Trap Ctrl-C
# wait for hs # wait for hs
ready = app.wait_for_hs() if not app.hs.supports_ephemeral:
if not ready: ready = app.wait_for_hs()
sys.exit() if not ready:
sys.exit()
print strings._("give_this_url") print strings._("give_this_url")
print 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug) print 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug)