summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-06-01 08:29:46 +0000
committerintrigeri <intrigeri@boum.org>2017-06-01 08:29:46 +0000
commitdd35289e03b0b2e7c34e82b72bae16579e0712a8 (patch)
tree55d1da07c103f3b2da1e7851a0f0f354eb9b3fe3
parent2402c4dd90365aebbf4f4fdf345f0a375c9e2750 (diff)
parente59cc22c01468d32ab9b2f59bf4a4eb2fb6ebf45 (diff)
Merge branch 'bugfix/12540-disable-search-in-unsafe-browser' into testing (Fix-committed: #12540, #10253, #12573)
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js17
-rw-r--r--config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css3
-rw-r--r--wiki/src/contribute/release_process/test.mdwn2
3 files changed, 9 insertions, 13 deletions
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
index e69a892..e3c83d8 100644
--- a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
@@ -2,17 +2,6 @@
pref("network.proxy.type", 0);
pref("network.proxy.socks_remote_dns", false);
-/* Google seems like the least suspicious choice of default search
- engine for the Unsafe Browser's in-the-clear traffic. */
-user_pref("browser.search.defaultenginename", "Google");
-user_pref("browser.search.selectedEngine", "Google");
-
-// Don't use geographically specific search prefs, like
-// browser.search.*.US for US locales. Our generated amnesia branding
-// add-on localizes search-engines in an incompatible but equivalent
-// way.
-pref("browser.search.geoSpecificDefaults", false);
-
// Without setting this, the Download Management page will not update
// the progress being made.
pref("browser.download.panel.shown", true);
@@ -20,3 +9,9 @@ pref("browser.download.panel.shown", true);
// Web pages does not render when e10s is enabled, so we have to
// disable it. Note that the "user_"-prefix is required.
user_pref("browser.tabs.remote.autostart.2", false);
+
+// Disable searching from the URL bar. Mistyping e.g. the IP address
+// to your router or some LAN resource could leak to the default
+// search engine (this could include credentials, e.g. if something
+// like the following is mistyped: ftp://user:password@host).
+pref("keyword.enabled", false);
diff --git a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
index e4d1062..238b851 100644
--- a/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
+++ b/config/chroot_local-includes/usr/share/tails/chroot-browsers/unsafe-browser/userChrome.css
@@ -1 +1,4 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Let's discourage unsupported usage by making web searching harder. */
+#search-container {display: none !important}
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 119473f..cf67d60 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -234,8 +234,6 @@ tracked by tickets prefixed with `todo/test_suite:`.
* Browsing (by IP) a FTP server on the LAN should be possible. (automate: [[!tails_ticket 10252]])
-* Google must be the default, pre-selected search plugin. (automate: [[!tails_ticket 10253]])
-
# Real (non-VM) hardware
`[can't-automate]`