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

Add an Onion exception for canceling connecting Tor

Browse Source
This commit is contained in:
Micah Lee 2017-04-17 20:49:06 -07:00
parent 71dc65edee
commit 6c02984a98
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
onionshare/onion.py
View File

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
from stem.control import Controller from stem.control import Controller
from stem import ProtocolError from stem import ProtocolError, SocketClosed
from stem.connection import MissingPassword, UnreadableCookieFile, AuthenticationFailure from stem.connection import MissingPassword, UnreadableCookieFile, AuthenticationFailure
import os, sys, tempfile, shutil, urllib, platform, subprocess, time, shlex import os, sys, tempfile, shutil, urllib, platform, subprocess, time, shlex
@ -99,6 +99,12 @@ class BundledTorTimeout(Exception):
but Tor doesn't finish connecting promptly. but Tor doesn't finish connecting promptly.
""" """
class BundledTorCanceled(Exception):
"""
This exception is raised if onionshare is set to use the bundled Tor binary,
and the user cancels connecting to Tor
"""
class Onion(object): class Onion(object):
""" """
Onion is an abstraction layer for connecting to the Tor control port and Onion is an abstraction layer for connecting to the Tor control port and
@ -197,7 +203,11 @@ class Onion(object):
self.c.authenticate() self.c.authenticate()
while True: while True:
res = self.c.get_info("status/bootstrap-phase") try:
res = self.c.get_info("status/bootstrap-phase")
except SocketClosed:
raise BundledTorCanceled()
res_parts = shlex.split(res) res_parts = shlex.split(res)
progress = res_parts[2].split('=')[1] progress = res_parts[2].split('=')[1]
summary = res_parts[4].split('=')[1] summary = res_parts[4].split('=')[1]