WIP: Rename the Tor Browser "download" directory, again. And add automated...

WIP: Rename the Tor Browser "download" directory, again. And add automated tests for the Tor Browser.

The idea is to make sure that the AppArmor confinement doesn't break too much
functionality, and actually confines the browser a bit.

Sorry for the non-atomic commit: getting directory name changing under my feet
while the automated tests are being drafted made it too hard to split this in
a nice way.

config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js

@@ -59,7 +59,7 @@ pref("noscript.forbidPlugins", true);
 pref("noscript.untrusted", "google-analytics.com");
 
 // Other non-Torbutton, Tails-specific prefs
-pref("browser.download.dir", "/home/amnesia/Tor Browser files");
+pref("browser.download.dir", "/home/amnesia/Tor Browser");
 pref("browser.download.folderList", 2);
 pref("browser.download.manager.closeWhenDone", true);
 pref("extensions.update.enabled", false);

config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-directories.desktop

+[Desktop Entry]
+Name=create-tor-browser-directories
+GenericName=Create the Tor Browser directories
+Comment=Create the Tor Browser amnesiac and persistent directories
+Exec=/usr/local/lib/create-tor-browser-directories
+Terminal=false
+Type=Application
+Categories=GNOME;X-GNOME-PersonalSettings;
+NoDisplay=true
+MimeType=application/x-create-tor-browser-directories;

config/chroot_local-includes/etc/xdg/autostart/create-tor-browser-files-directories.desktop

-[Desktop Entry]
-Name=create-tor-browser-files-directories
-GenericName=Create the Tor Browser files directories
-Comment=Create the Tor Browser files amnesiac and persistent directories
-Exec=/usr/local/lib/create-tor-browser-files-directories
-Terminal=false
-Type=Application
-Categories=GNOME;X-GNOME-PersonalSettings;
-NoDisplay=true
-MimeType=application/x-create-tor-browser-files-directories;

config/chroot_local-includes/usr/local/lib/add-GNOME-bookmarks

@@ -16,13 +16,13 @@ add_gtk_bookmark_for() {
    fi
 }
 
-add_gtk_bookmark_for "${HOME}/Tor Browser files"
+add_gtk_bookmark_for "${HOME}/Tor Browser"
 
 if persistence_is_enabled_for "${HOME}/Persistent" ; then
     add_gtk_bookmark_for "${HOME}/Persistent"
 
     if persistence_is_enabled_read_write ; then
-	add_gtk_bookmark_for "${HOME}/Persistent/Tor Browser files" \
-                             "Tor Browser files (persistent)"
+	add_gtk_bookmark_for "${HOME}/Persistent/Tor Browser" \
+                             "Tor Browser (persistent)"
     fi
 fi

config/chroot_local-includes/usr/local/lib/create-tor-browser-files-directories → config/chroot_local-includes/usr/local/lib/create-tor-browser-directories

@@ -2,8 +2,8 @@
 
 set -eu
 
-TOR_BROWSER_AMNESIAC_DIR='/home/amnesia/Tor Browser files'
-TOR_BROWSER_PERSISTENT_DIR='/home/amnesia/Persistent/Tor Browser files'
+TOR_BROWSER_AMNESIAC_DIR='/home/amnesia/Tor Browser'
+TOR_BROWSER_PERSISTENT_DIR='/home/amnesia/Persistent/Tor Browser'
 
 . /usr/local/lib/tails-shell-library/tails-greeter.sh
 

config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch

 diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 0df7ad9..203cc11 100644
+index 0df7ad9..e0dbd82 100644
 --- a/apparmor/torbrowser.Browser.firefox
 +++ b/apparmor/torbrowser.Browser.firefox
 @@ -1,13 +1,15 @@
@@ -73,10 +73,10 @@ index 0df7ad9..203cc11 100644
 +  /usr/local/lib/tor-browser/browser/* r,
 +  /usr/local/lib/tor-browser/TorBrowser/Data/Browser/profiles.ini r,
 +
-+  owner "@{HOME}/Tor Browser files/" rw,
-+  owner "@{HOME}/Tor Browser files/**" rwk,
-+  owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser files/" rw,
-+  owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser files/**" rwk,
++  owner "@{HOME}/Tor Browser/" rw,
++  owner "@{HOME}/Tor Browser/**" rwk,
++  owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser/" rw,
++  owner "/live/persistence/TailsData_unlocked/Persistent/Tor Browser/**" rwk,
 +  owner @{HOME}/.mozilla/firefox/bookmarks/places.sqlite rwk,
 +  owner /live/persistence/TailsData_unlocked/bookmarks/places.sqlite rwk,
 +  owner @{HOME}/.tor-browser/profile.default/ r,