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

Fix onionshare URLs non-public mode is always http basic auth

Browse Source
This commit is contained in:
Micah Lee 2019-05-20 19:22:03 -07:00
parent 29abfd8f87
commit b667fcc4f8
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
onionshare/__init__.py
View File

@ -127,6 +127,13 @@ def main(cwd=None):
app = OnionShare(common, onion, local_only, autostop_timer) app = OnionShare(common, onion, local_only, autostop_timer)
app.set_stealth(stealth) app.set_stealth(stealth)
app.choose_port() app.choose_port()
# Build the URL
if common.settings.get('public_mode'):
url = 'http://{0:s}'.format(app.onion_host)
else:
url = 'http://onionshare:{0:s}@{1:s}'.format(web.slug, app.onion_host)
# Delay the startup if a startup timer was set # Delay the startup if a startup timer was set
if autostart_timer > 0: if autostart_timer > 0:
# Can't set a schedule that is later than the auto-stop timer # Can't set a schedule that is later than the auto-stop timer
@ -135,10 +142,6 @@ def main(cwd=None):
sys.exit() sys.exit()
app.start_onion_service(False, True) app.start_onion_service(False, True)
if common.settings.get('public_mode'):
url = 'http://{0:s}'.format(app.onion_host)
else:
url = 'http://{0:s}/{1:s}'.format(app.onion_host, web.slug)
schedule = datetime.now() + timedelta(seconds=autostart_timer) schedule = datetime.now() + timedelta(seconds=autostart_timer)
if mode == 'receive': if mode == 'receive':
print("Files sent to you appear in this folder: {}".format(common.settings.get('data_dir'))) print("Files sent to you appear in this folder: {}".format(common.settings.get('data_dir')))
@ -215,12 +218,6 @@ def main(cwd=None):
common.settings.set('slug', web.slug) common.settings.set('slug', web.slug)
common.settings.save() common.settings.save()
# Build the URL
if common.settings.get('public_mode'):
url = 'http://{0:s}'.format(app.onion_host)
else:
url = 'http://onionshare:{0:s}@{1:s}'.format(web.slug, app.onion_host)
print('') print('')
if autostart_timer > 0: if autostart_timer > 0:
print("Server started") print("Server started")

4
onionshare_gui/server_status.py
View File

@ -420,8 +420,6 @@ class ServerStatus(QtWidgets.QWidget):
""" """
if self.common.settings.get('public_mode'): if self.common.settings.get('public_mode'):
url = 'http://{0:s}'.format(self.app.onion_host) url = 'http://{0:s}'.format(self.app.onion_host)
elif self.mode == ServerStatus.MODE_WEBSITE:
url = 'http://onionshare:{0:s}@{1:s}'.format(self.web.slug, self.app.onion_host)
else: else:
url = 'http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug) url = 'http://onionshare:{0:s}@{1:s}'.format(self.web.slug, self.app.onion_host)
return url return url