Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-10-31 06:19:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ask BridgeDB for obfs4 and snowflake bridges, because that is what OnionShare supports

Browse source
This commit is contained in:
Micah Lee 2021-10-19 08:41:40 -07:00
parent 072f90df4f
commit 1f5dcd1689
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
desktop/src/onionshare/moat_dialog.py
View file

@ -22,6 +22,7 @@ from PySide2 import QtCore, QtWidgets, QtGui
import requests import requests
import os import os
import base64 import base64
import json
from . import strings from . import strings
from .gui_common import GuiCommon from .gui_common import GuiCommon
@ -133,7 +134,11 @@ class MoatDialog(QtWidgets.QDialog):
self.t_check = MoatThread( self.t_check = MoatThread(
self.common, self.common,
"check", "check",
{"challenge": self.challenge, "solution": self.solution_lineedit.text()}, {
"transport": self.transport,
"challenge": self.challenge,
"solution": self.solution_lineedit.text(),
},
) )
self.t_check.bridgedb_error.connect(self.bridgedb_error) self.t_check.bridgedb_error.connect(self.bridgedb_error)
self.t_check.captcha_error.connect(self.captcha_error) self.t_check.captcha_error.connect(self.captcha_error)
@ -164,9 +169,10 @@ class MoatDialog(QtWidgets.QDialog):
self.solution_lineedit.setEnabled(True) self.solution_lineedit.setEnabled(True)
def captcha_ready(self, image, challenge): def captcha_ready(self, transport, image, challenge):
self.common.log("MoatDialog", "captcha_ready") self.common.log("MoatDialog", "captcha_ready")
self.transport = transport
self.challenge = challenge self.challenge = challenge
# Save captcha image to disk, so we can load it # Save captcha image to disk, so we can load it
@ -208,7 +214,7 @@ class MoatThread(QtCore.QThread):
bridgedb_error = QtCore.Signal() bridgedb_error = QtCore.Signal()
captcha_error = QtCore.Signal(str) captcha_error = QtCore.Signal(str)
captcha_ready = QtCore.Signal(str, str) captcha_ready = QtCore.Signal(str, str, str)
bridges_ready = QtCore.Signal(str) bridges_ready = QtCore.Signal(str)
def __init__(self, common, action, data={}): def __init__(self, common, action, data={}):
@ -216,7 +222,6 @@ class MoatThread(QtCore.QThread):
self.common = common self.common = common
self.common.log("MoatThread", "__init__", f"action={action}") self.common.log("MoatThread", "__init__", f"action={action}")
self.transport = "obfs4"
self.action = action self.action = action
self.data = data self.data = data
@ -235,7 +240,10 @@ class MoatThread(QtCore.QThread):
{ {
"version": "0.1.0", "version": "0.1.0",
"type": "client-transports", "type": "client-transports",
"supported": [self.transport], "supported": [
"obfs4",
"snowflake",
],
} }
] ]
}, },
@ -259,17 +267,12 @@ class MoatThread(QtCore.QThread):
self.common.log("MoatThread", "run", f"type != moat-challange") self.common.log("MoatThread", "run", f"type != moat-challange")
self.bridgedb_error.emit() self.bridgedb_error.emit()
return return
if moat_res["data"][0]["transport"] != self.transport:
self.common.log(
"MoatThread", "run", f"transport != {self.transport}"
)
self.bridgedb_error.emit()
return
transport = moat_res["data"][0]["transport"]
image = moat_res["data"][0]["image"] image = moat_res["data"][0]["image"]
challenge = moat_res["data"][0]["challenge"] challenge = moat_res["data"][0]["challenge"]
self.captcha_ready.emit(image, challenge) self.captcha_ready.emit(transport, image, challenge)
except Exception as e: except Exception as e:
self.common.log("MoatThread", "run", f"hit exception: {e}") self.common.log("MoatThread", "run", f"hit exception: {e}")
self.bridgedb_error.emit() self.bridgedb_error.emit()
@ -288,7 +291,7 @@ class MoatThread(QtCore.QThread):
"id": "2", "id": "2",
"type": "moat-solution", "type": "moat-solution",
"version": "0.1.0", "version": "0.1.0",
"transport": self.transport, "transport": self.data["transport"],
"challenge": self.data["challenge"], "challenge": self.data["challenge"],
"solution": self.data["solution"], "solution": self.data["solution"],
"qrcode": "false", "qrcode": "false",
@ -303,6 +306,11 @@ class MoatThread(QtCore.QThread):
try: try:
moat_res = r.json() moat_res = r.json()
self.common.log(
"MoatThread",
"run",
f"got bridges:\n{json.dumps(moat_res,indent=2)}",
)
if "errors" in moat_res: if "errors" in moat_res:
self.common.log("MoatThread", "run", f"errors={moat_res['errors']}") self.common.log("MoatThread", "run", f"errors={moat_res['errors']}")