Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-05 07:55:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Validate syntax of custom bridges

Browse source
This commit is contained in:
Miguel Jacq 2018-01-14 20:12:24 +11:00
parent ed8c4c8302
commit bf01fcaa6e
No known key found for this signature in database
GPG key ID: 5418373DFF79BA19
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
onionshare_gui/settings_dialog.py
View file

@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
from PyQt5 import QtCore, QtWidgets, QtGui
import sys, platform, datetime
import sys, platform, datetime, re
from onionshare import strings, common
from onionshare.settings import Settings
@ -688,11 +688,20 @@ class SettingsDialog(QtWidgets.QDialog):
# provided from https://bridges.torproject.org
new_bridges = []
bridges = self.tor_bridges_use_custom_textbox.toPlainText().split('\n')
bridges_valid = False
for bridge in bridges:
if bridge != '':
new_bridges.append(''.join(['Bridge ', bridge, '\n']))
new_bridges = ''.join(new_bridges)
settings.set('tor_bridges_use_custom_bridges', new_bridges)
# Check the syntax of the custom bridge to make sure it looks legitimate
pattern = re.compile("[0-9.]+:[0-9]+\s[A-Z0-9]+$")
if pattern.match(bridge):
new_bridges.append(''.join(['Bridge ', bridge, '\n']))
bridges_valid = True
if bridges_valid:
new_bridges = ''.join(new_bridges)
settings.set('tor_bridges_use_custom_bridges', new_bridges)
else:
Alert(strings._('gui_settings_tor_bridges_invalid', True))
settings.set('no_bridges', True)
return settings