#691 remove meek_lite Amazon

install/onionshare.nsi

@@ -197,7 +197,6 @@ Section "install"
     File "${BINPATH}\share\torrc_template"
     File "${BINPATH}\share\torrc_template-windows"
     File "${BINPATH}\share\torrc_template-obfs4"
-    File "${BINPATH}\share\torrc_template-meek_lite_amazon"
     File "${BINPATH}\share\torrc_template-meek_lite_azure"
     File "${BINPATH}\share\version.txt"
     File "${BINPATH}\share\wordlist.txt"
@@ -434,7 +433,6 @@ FunctionEnd
         Delete "$INSTDIR\share\torrc_template"
         Delete "$INSTDIR\share\torrc_template-windows"
         Delete "$INSTDIR\share\torrc_template-obfs4"
-        Delete "$INSTDIR\share\torrc_template-meek_lite_amazon"
         Delete "$INSTDIR\share\torrc_template-meek_lite_azure"
         Delete "$INSTDIR\share\version.txt"
         Delete "$INSTDIR\share\wordlist.txt"

install/pyinstaller.spec

@@ -14,7 +14,6 @@ a = Analysis(
         ('../share/wordlist.txt', 'share'),
         ('../share/torrc_template', 'share'),
         ('../share/torrc_template-obfs4', 'share'),
-        ('../share/torrc_template-meek_lite_amazon', 'share'),
         ('../share/torrc_template-meek_lite_azure', 'share'),
         ('../share/torrc_template-windows', 'share'),
         ('../share/images/*', 'share/images'),

onionshare/onion.py

@@ -210,11 +210,6 @@ class Onion(object):
                     with open(self.common.get_resource_path('torrc_template-obfs4')) as o:
                         for line in o:
                             f.write(line)
-                elif self.settings.get('tor_bridges_use_meek_lite_amazon'):
-                    f.write('ClientTransportPlugin meek_lite exec {}\n'.format(self.obfs4proxy_file_path))
-                    with open(self.common.get_resource_path('torrc_template-meek_lite_amazon')) as o:
-                        for line in o:
-                            f.write(line)
                 elif self.settings.get('tor_bridges_use_meek_lite_azure'):
                     f.write('ClientTransportPlugin meek_lite exec {}\n'.format(self.obfs4proxy_file_path))
                     with open(self.common.get_resource_path('torrc_template-meek_lite_azure')) as o:
@@ -281,7 +276,6 @@ class Onion(object):
                 # If using bridges, it might take a bit longer to connect to Tor
                 if self.settings.get('tor_bridges_use_custom_bridges') or \
                    self.settings.get('tor_bridges_use_obfs4') or \
-                   self.settings.get('tor_bridges_use_meek_lite_amazon') or \
                    self.settings.get('tor_bridges_use_meek_lite_azure'):
                     connect_timeout = 150
                 else:

onionshare/settings.py

@@ -66,7 +66,6 @@ class Settings(object):
             'autoupdate_timestamp': None,
             'no_bridges': True,
             'tor_bridges_use_obfs4': False,
-            'tor_bridges_use_meek_lite_amazon': False,
             'tor_bridges_use_meek_lite_azure': False,
             'tor_bridges_use_custom_bridges': '',
             'save_private_key': False,

onionshare_gui/settings_dialog.py

@@ -168,16 +168,6 @@ class SettingsDialog(QtWidgets.QDialog):
             self.tor_bridges_use_obfs4_radio = QtWidgets.QRadioButton(strings._('gui_settings_tor_bridges_obfs4_radio_option', True))
         self.tor_bridges_use_obfs4_radio.toggled.connect(self.tor_bridges_use_obfs4_radio_toggled)
 
-        # meek_lite-amazon option radio
-        # if the obfs4proxy binary is missing, we can't use meek_lite-amazon transports
-        (self.tor_path, self.tor_geo_ip_file_path, self.tor_geo_ipv6_file_path, self.obfs4proxy_file_path) = self.common.get_tor_paths()
-        if not os.path.isfile(self.obfs4proxy_file_path):
-            self.tor_bridges_use_meek_lite_amazon_radio = QtWidgets.QRadioButton(strings._('gui_settings_tor_bridges_meek_lite_amazon_radio_option_no_obfs4proxy', True))
-            self.tor_bridges_use_meek_lite_amazon_radio.setEnabled(False)
-        else:
-            self.tor_bridges_use_meek_lite_amazon_radio = QtWidgets.QRadioButton(strings._('gui_settings_tor_bridges_meek_lite_amazon_radio_option', True))
-        self.tor_bridges_use_meek_lite_amazon_radio.toggled.connect(self.tor_bridges_use_meek_lite_amazon_radio_toggled)
-
         # meek_lite-azure option radio
         # if the obfs4proxy binary is missing, we can't use meek_lite-azure transports
         (self.tor_path, self.tor_geo_ip_file_path, self.tor_geo_ipv6_file_path, self.obfs4proxy_file_path) = self.common.get_tor_paths()
@@ -190,7 +180,6 @@ class SettingsDialog(QtWidgets.QDialog):
 
         # meek_lite currently not supported on the version of obfs4proxy bundled with TorBrowser
         if self.system == 'Windows' or self.system == 'Darwin':
-            self.tor_bridges_use_meek_lite_amazon_radio.hide()
             self.tor_bridges_use_meek_lite_azure_radio.hide()
 
         # Custom bridges radio and textbox
@@ -216,7 +205,6 @@ class SettingsDialog(QtWidgets.QDialog):
         bridges_layout = QtWidgets.QVBoxLayout()
         bridges_layout.addWidget(self.tor_bridges_no_bridges_radio)
         bridges_layout.addWidget(self.tor_bridges_use_obfs4_radio)
-        bridges_layout.addWidget(self.tor_bridges_use_meek_lite_amazon_radio)
         bridges_layout.addWidget(self.tor_bridges_use_meek_lite_azure_radio)
         bridges_layout.addWidget(self.tor_bridges_use_custom_radio)
         bridges_layout.addWidget(self.tor_bridges_use_custom_textbox_options)
@@ -450,13 +438,11 @@ class SettingsDialog(QtWidgets.QDialog):
         if self.old_settings.get('no_bridges'):
             self.tor_bridges_no_bridges_radio.setChecked(True)
             self.tor_bridges_use_obfs4_radio.setChecked(False)
-            self.tor_bridges_use_meek_lite_amazon_radio.setChecked(False)
             self.tor_bridges_use_meek_lite_azure_radio.setChecked(False)
             self.tor_bridges_use_custom_radio.setChecked(False)
         else:
             self.tor_bridges_no_bridges_radio.setChecked(False)
             self.tor_bridges_use_obfs4_radio.setChecked(self.old_settings.get('tor_bridges_use_obfs4'))
-            self.tor_bridges_use_meek_lite_amazon_radio.setChecked(self.old_settings.get('tor_bridges_use_meek_lite_amazon'))
             self.tor_bridges_use_meek_lite_azure_radio.setChecked(self.old_settings.get('tor_bridges_use_meek_lite_azure'))
 
             if self.old_settings.get('tor_bridges_use_custom_bridges'):
@@ -495,16 +481,6 @@ class SettingsDialog(QtWidgets.QDialog):
         if checked:
             self.tor_bridges_use_custom_textbox_options.hide()
 
-    def tor_bridges_use_meek_lite_amazon_radio_toggled(self, checked):
-        """
-        meek_lite-amazon bridges option was toggled. If checked, disable custom bridge options.
-        """
-        if checked:
-            self.tor_bridges_use_custom_textbox_options.hide()
-            # Alert the user about meek's costliness if it looks like they're turning it on
-            if not self.old_settings.get('tor_bridges_use_meek_lite_amazon'):
-                Alert(strings._('gui_settings_meek_lite_expensive_warning', True), QtWidgets.QMessageBox.Warning)
-
     def tor_bridges_use_meek_lite_azure_radio_toggled(self, checked):
         """
         meek_lite_azure bridges option was toggled. If checked, disable custom bridge options.
@@ -700,7 +676,7 @@ class SettingsDialog(QtWidgets.QDialog):
                         'control_port_port', 'socks_address', 'socks_port',
                         'socket_file_path', 'auth_type', 'auth_password',
                         'no_bridges', 'tor_bridges_use_obfs4',
-                        'tor_bridges_use_meek_lite_amazon', 'tor_bridges_use_meek_lite_azure',
+                        'tor_bridges_use_meek_lite_azure',
                         'tor_bridges_use_custom_bridges']):
 
                         reboot_onion = True
@@ -810,31 +786,21 @@ class SettingsDialog(QtWidgets.QDialog):
         if self.tor_bridges_no_bridges_radio.isChecked():
             settings.set('no_bridges', True)
             settings.set('tor_bridges_use_obfs4', False)
-            settings.set('tor_bridges_use_meek_lite_amazon', False)
             settings.set('tor_bridges_use_meek_lite_azure', False)
             settings.set('tor_bridges_use_custom_bridges', '')
         if self.tor_bridges_use_obfs4_radio.isChecked():
             settings.set('no_bridges', False)
             settings.set('tor_bridges_use_obfs4', True)
-            settings.set('tor_bridges_use_meek_lite_amazon', False)
-            settings.set('tor_bridges_use_meek_lite_azure', False)
-            settings.set('tor_bridges_use_custom_bridges', '')
-        if self.tor_bridges_use_meek_lite_amazon_radio.isChecked():
-            settings.set('no_bridges', False)
-            settings.set('tor_bridges_use_obfs4', False)
-            settings.set('tor_bridges_use_meek_lite_amazon', True)
             settings.set('tor_bridges_use_meek_lite_azure', False)
             settings.set('tor_bridges_use_custom_bridges', '')
         if self.tor_bridges_use_meek_lite_azure_radio.isChecked():
             settings.set('no_bridges', False)
             settings.set('tor_bridges_use_obfs4', False)
-            settings.set('tor_bridges_use_meek_lite_amazon', False)
             settings.set('tor_bridges_use_meek_lite_azure', True)
             settings.set('tor_bridges_use_custom_bridges', '')
         if self.tor_bridges_use_custom_radio.isChecked():
             settings.set('no_bridges', False)
             settings.set('tor_bridges_use_obfs4', False)
-            settings.set('tor_bridges_use_meek_lite_amazon', False)
             settings.set('tor_bridges_use_meek_lite_azure', False)
 
             # Insert a 'Bridge' line at the start of each bridge.

share/locale/en.json

@@ -105,8 +105,6 @@
     "gui_settings_tor_bridges_no_bridges_radio_option": "Don't use bridges",
     "gui_settings_tor_bridges_obfs4_radio_option": "Use built-in obfs4 pluggable transports",
     "gui_settings_tor_bridges_obfs4_radio_option_no_obfs4proxy": "Use built-in obfs4 pluggable transports (requires obfs4proxy)",
-    "gui_settings_tor_bridges_meek_lite_amazon_radio_option": "Use built-in meek_lite (Amazon) pluggable transports",
-    "gui_settings_tor_bridges_meek_lite_amazon_radio_option_no_obfs4proxy": "Use built-in meek_lite (Amazon) pluggable transports (requires obfs4proxy)",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option": "Use built-in meek_lite (Azure) pluggable transports",
     "gui_settings_tor_bridges_meek_lite_azure_radio_option_no_obfs4proxy": "Use built-in meek_lite (Azure) pluggable transports (requires obfs4proxy)",
     "gui_settings_meek_lite_expensive_warning": "Warning: the meek_lite bridges are very costly for the Tor Project to run!<br><br>You should only use meek_lite bridges if you are having trouble connecting to Tor directly, via obfs4 transports or other normal bridges.",

test/test_onionshare_settings.py

@@ -58,7 +58,6 @@ class TestSettings:
             'autoupdate_timestamp': None,
             'no_bridges': True,
             'tor_bridges_use_obfs4': False,
-            'tor_bridges_use_meek_lite_amazon': False,
             'tor_bridges_use_meek_lite_azure': False,
             'tor_bridges_use_custom_bridges': '',
             'save_private_key': False,
@@ -126,7 +125,6 @@ class TestSettings:
         assert settings_obj.get('autoupdate_timestamp') is None
         assert settings_obj.get('no_bridges') is True
         assert settings_obj.get('tor_bridges_use_obfs4') is False
-        assert settings_obj.get('tor_bridges_use_meek_lite_amazon') is False
         assert settings_obj.get('tor_bridges_use_meek_lite_azure') is False
         assert settings_obj.get('tor_bridges_use_custom_bridges') == ''