- tor-commits - lists.torproject.org

[tor-browser/tor-browser-38.7.1esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 30 Mar '16

30 Mar '16

commit b9a6bef70d96a5aab0cea088d2dc3da4a17354a0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 30 10:59:23 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle On Mac OS, store user data under ~/Library/Application Support/TorBrowser-Data if the application is installed in a directory whose path contains "/Applications" or if the user lacks write permission to the directory that contains TorBrowser.app. Since the TorBrowser-Data directory may be shared among different installations of the application on Mac OS, embed the app path in the update dir so that the update history is partitioned. --- toolkit/xre/nsAppRunner.cpp | 34 +++++---- toolkit/xre/nsXREDirProvider.cpp | 118 ++++++++++++------------------ toolkit/xre/nsXREDirProvider.h | 7 +- xpcom/io/TorFileUtils.cpp | 130 +++++++++++++++++++++++++++++++++ xpcom/io/TorFileUtils.h | 35 +++++++++ xpcom/io/moz.build | 2 + xpcom/io/nsAppFileLocationProvider.cpp | 52 ++++--------- 7 files changed, 255 insertions(+), 123 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 4eb084b..700afb8 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2413,13 +2413,16 @@ static nsresult GetAppRootDir(nsIFile *aAppDir, nsIFile **aAppRootDir) static ProfileStatus CheckTorBrowserDataWriteAccess(nsIFile *aAppDir) { // Check whether we can write to the directory that will contain - // TorBrowser-Data, i.e., the directory that is above the application - // root directory. - nsCOMPtr<nsIFile> appRootDir; - nsresult rv = GetAppRootDir(aAppDir, getter_AddRefs(appRootDir)); + // TorBrowser-Data. + nsCOMPtr<nsIFile> tbDataDir; + nsXREDirProvider* dirProvider = nsXREDirProvider::GetSingleton(); + if (!dirProvider) + return PROFILE_STATUS_OTHER_ERROR; + nsresult rv = + dirProvider->GetTorBrowserUserDataDir(getter_AddRefs(tbDataDir)); NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR); nsCOMPtr<nsIFile> tbDataDirParent; - rv = appRootDir->GetParent(getter_AddRefs(tbDataDirParent)); + rv = tbDataDir->GetParent(getter_AddRefs(tbDataDirParent)); NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR); return CheckProfileWriteAccess(tbDataDirParent); } @@ -2550,12 +2553,12 @@ migrateInAppTorBrowserProfile(nsIToolkitProfile *aProfile, nsIFile *aAppDir) NS_LITERAL_CSTRING("TorBrowser")); NS_ENSURE_SUCCESS(rv, rv); - // Create an nsIFile for the TorBrowser-Data directory (next to the app). + // Get an nsIFile for the TorBrowser-Data directory. nsCOMPtr<nsIFile> newTBDataDir; - rv = appRootDir->GetParent(getter_AddRefs(newTBDataDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = newTBDataDir->AppendRelativeNativePath( - NS_LITERAL_CSTRING("TorBrowser-Data")); + nsXREDirProvider* dirProvider = nsXREDirProvider::GetSingleton(); + if (!dirProvider) + return NS_ERROR_UNEXPECTED; + rv = dirProvider->GetTorBrowserUserDataDir(getter_AddRefs(newTBDataDir)); NS_ENSURE_SUCCESS(rv, rv); // Try to migrate the browser profile. If this fails, we return an error @@ -2588,9 +2591,14 @@ migrateInAppTorBrowserProfile(nsIToolkitProfile *aProfile, nsIFile *aAppDir) } // Try to migrate the UpdateInfo directory. - nsAutoCString updateInfoPath(NS_LITERAL_CSTRING("UpdateInfo")); - nsresult rv2 = migrateOneTorBrowserDataDir(oldTorBrowserDir, updateInfoPath, - newTBDataDir, updateInfoPath); + nsCOMPtr<nsIFile> newUpdateInfoDir; + nsresult rv2 = dirProvider->GetUpdateRootDir( + getter_AddRefs(newUpdateInfoDir)); + if (NS_SUCCEEDED(rv2)) { + nsAutoCString updateInfoPath(NS_LITERAL_CSTRING("UpdateInfo")); + rv2 = migrateOneTorBrowserDataDir(oldTorBrowserDir, updateInfoPath, + newUpdateInfoDir, NS_LITERAL_CSTRING("")); + } // If all pieces of the migration succeeded, remove the old TorBrowser // directory. diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 675039e..28f0210 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -39,6 +39,8 @@ #include "mozilla/Preferences.h" #include "mozilla/Telemetry.h" +#include "TorFileUtils.h" + #include <stdlib.h> #ifdef XP_WIN @@ -1023,40 +1025,48 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) getter_AddRefs(updRoot)); NS_ENSURE_SUCCESS(rv, rv); -#else +#elif defined(TOR_BROWSER_UPDATE) + // For Tor Browser, we store update history, etc. within the UpdateInfo + // directory under the user data directory. + nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(updRoot)); + NS_ENSURE_SUCCESS(rv, rv); + rv = updRoot->AppendNative(NS_LITERAL_CSTRING("UpdateInfo")); + NS_ENSURE_SUCCESS(rv, rv); +#if defined(XP_MACOSX) && defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) + // Since the TorBrowser-Data directory may be shared among different + // installations of the application, embed the app path in the update dir + // so that the update history is partitioned. This is much less likely to + // be an issue on Linux or Windows because the Tor Browser packages for + // those platforms include a "container" folder that provides partitioning + // by default, and we do not support use of a shared, OS-recommended area + // for user data on those platforms. nsCOMPtr<nsIFile> appFile; bool per = false; - nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(appFile)); - NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(updRoot)); + rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr<nsIFile> appRootDirFile; + nsAutoString appDirPath; + if (NS_FAILED(appFile->GetParent(getter_AddRefs(appRootDirFile))) || + NS_FAILED(appRootDirFile->GetPath(appDirPath))) { + return NS_ERROR_FAILURE; + } -#ifdef XP_MACOSX -#ifdef TOR_BROWSER_UPDATE -#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR - // For Tor Browser, we cannot store update history, etc. under the user's - // home directory. Instead, we place it under - // Tor Browser.app/../TorBrowser-Data/UpdateInfo/ - nsCOMPtr<nsIFile> appRootDir; - rv = GetAppRootDir(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr<nsIFile> localDir; - rv = appRootDir->GetParent(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser-Data" - XPCOM_FILE_PATH_SEPARATOR "UpdateInfo")); -#else - // For Tor Browser, we cannot store update history, etc. under the user's home directory. - // Instead, we place it under Tor Browser.app/TorBrowser/UpdateInfo/ - nsCOMPtr<nsIFile> localDir; - rv = GetAppRootDir(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = localDir->AppendNative(NS_LITERAL_CSTRING("TorBrowser")); + int32_t dotIndex = appDirPath.RFind(".app"); + if (dotIndex == kNotFound) { + dotIndex = appDirPath.Length(); + } + appDirPath = Substring(appDirPath, 1, dotIndex - 1); + rv = updRoot->AppendRelativePath(appDirPath); NS_ENSURE_SUCCESS(rv, rv); - rv = localDir->AppendNative(NS_LITERAL_CSTRING("UpdateInfo")); #endif +#else // ! TOR_BROWSER_UPDATE + nsCOMPtr<nsIFile> appFile; + bool per = false; + nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); -#else + rv = appFile->GetParent(getter_AddRefs(updRoot)); + NS_ENSURE_SUCCESS(rv, rv); +#ifdef XP_MACOSX nsCOMPtr<nsIFile> appRootDirFile; nsCOMPtr<nsIFile> localDir; nsAutoString appDirPath; @@ -1087,7 +1097,6 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) NS_FAILED(localDir->AppendRelativePath(appDirPath))) { return NS_ERROR_FAILURE; } -#endif NS_ADDREF(*aResult = localDir); return NS_OK; @@ -1182,7 +1191,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) NS_ENSURE_SUCCESS(rv, rv); #endif // XP_WIN -#endif +#endif // ! TOR_BROWSER_UPDATE NS_ADDREF(*aResult = updRoot); return NS_OK; } @@ -1235,20 +1244,13 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) // Copied from nsAppFileLocationProvider (more or less) NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr<nsIFile> localDir; + nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR - nsCOMPtr<nsIFile> appRootDir; - nsresult rv = GetAppRootDir(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = appRootDir->GetParent(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser-Data" - XPCOM_FILE_PATH_SEPARATOR "Browser")); + rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); #else - nsresult rv = GetAppRootDir(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" - XPCOM_FILE_PATH_SEPARATOR "Data" + rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); #endif NS_ENSURE_SUCCESS(rv, rv); @@ -1354,43 +1356,17 @@ nsXREDirProvider::GetUserDataDirectory(nsIFile** aFile, bool aLocal, } nsresult -nsXREDirProvider::GetAppRootDir(nsIFile* *aFile) +nsXREDirProvider::GetTorBrowserUserDataDir(nsIFile* *aFile) { NS_ENSURE_ARG_POINTER(aFile); - nsCOMPtr<nsIFile> appRootDir; - nsresult rv = GetAppDir()->Clone(getter_AddRefs(appRootDir)); + nsCOMPtr<nsIFile> exeFile; + bool per = false; + nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(exeFile)); NS_ENSURE_SUCCESS(rv, rv); - - int levelsToRemove = 1; // In FF21+, appDir points to browser subdirectory. -#if defined(XP_MACOSX) - levelsToRemove += 2; -#endif - while (appRootDir && (levelsToRemove > 0)) { - // When crawling up the hierarchy, components named "." do not count. - nsAutoCString removedName; - rv = appRootDir->GetNativeLeafName(removedName); - NS_ENSURE_SUCCESS(rv, rv); - bool didRemove = !removedName.Equals("."); - - // Remove a directory component. - nsCOMPtr<nsIFile> parentDir; - rv = appRootDir->GetParent(getter_AddRefs(parentDir)); - NS_ENSURE_SUCCESS(rv, rv); - appRootDir = parentDir; - - if (didRemove) - --levelsToRemove; - } - - if (!appRootDir) - return NS_ERROR_FAILURE; - - NS_ADDREF(*aFile = appRootDir); - return NS_OK; + return TorBrowser_GetUserDataDir(exeFile, aFile); } - nsresult nsXREDirProvider::EnsureDirectoryExists(nsIFile* aDirectory) { diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h index be9a11c..4eb2d87 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -100,6 +100,12 @@ public: */ nsresult GetProfileDir(nsIFile* *aResult); + /** + * Get the TorBrowser user data directory by calling the + * TorBrowser_GetUserDataDir() utility function. + */ + nsresult GetTorBrowserUserDataDir(nsIFile* *aFile); + protected: nsresult GetFilesInternal(const char* aProperty, nsISimpleEnumerator** aResult); nsresult GetUserDataDirectoryHome(nsIFile* *aFile, bool aLocal); @@ -107,7 +113,6 @@ protected: #if defined(XP_UNIX) || defined(XP_MACOSX) static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif - nsresult GetAppRootDir(nsIFile* *aFile); static nsresult EnsureDirectoryExists(nsIFile* aDirectory); void EnsureProfileFileExists(nsIFile* aFile); diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp new file mode 100644 index 0000000..7e42071 --- /dev/null +++ b/xpcom/io/TorFileUtils.cpp @@ -0,0 +1,130 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "TorFileUtils.h" + +static nsresult GetAppRootDir(nsIFile *aExeFile, nsIFile** aFile); + +//----------------------------------------------------------------------------- +NS_METHOD +TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile) +{ + NS_ENSURE_ARG_POINTER(aFile); + nsCOMPtr<nsIFile> tbDataDir; + +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data")); + nsCOMPtr<nsIFile> appRootDir; + nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); + NS_ENSURE_SUCCESS(rv, rv); +#ifndef XP_MACOSX + // On all platforms except Mac OS, we always operate in a "portable" mode + // where the TorBrowser-Data directory is located next to the application. + rv = appRootDir->GetParent(getter_AddRefs(tbDataDir)); + NS_ENSURE_SUCCESS(rv, rv); + rv = tbDataDir->AppendNative(tbDataLeafName); + NS_ENSURE_SUCCESS(rv, rv); +#else + // For Mac OS, determine whether we should store user data in the OS's + // standard location (i.e., under ~/Library/Application Support). We use + // the OS location if (1) the application is installed in a directory whose + // path contains "/Applications" or (2) the TorBrowser-Data directory does + // not exist and cannot be created (which probably means we lack write + // permission to the directory that contains the application). + nsAutoString appRootPath; + rv = appRootDir->GetPath(appRootPath); + NS_ENSURE_SUCCESS(rv, rv); + bool useOSLocation = (appRootPath.Find("/Applications", + true /* ignore case */) >= 0); + if (!useOSLocation) { + // We hope to use the portable (aka side-by-side) approach, but before we + // commit to that, let's ensure that we can create the TorBrowser-Data + // directory. If it already exists, we will try to use it; if not and we + // fail to create it, we will switch to ~/Library/Application Support. + rv = appRootDir->GetParent(getter_AddRefs(tbDataDir)); + NS_ENSURE_SUCCESS(rv, rv); + rv = tbDataDir->AppendNative(tbDataLeafName); + NS_ENSURE_SUCCESS(rv, rv); + bool exists = false; + rv = tbDataDir->Exists(&exists); + if (NS_SUCCEEDED(rv) && !exists) + rv = tbDataDir->Create(nsIFile::DIRECTORY_TYPE, 0700); + useOSLocation = NS_FAILED(rv); + } + + if (useOSLocation) { + // We are using ~/Library/Application Support/TorBrowser-Data. We do not + // need to create that directory here because the code in nsXREDirProvider + // will do so (and the user should always have write permission for + // ~/Library/Application Support; if they do not we have no more options). + FSRef fsRef; + OSErr err = ::FSFindFolder(kUserDomain, kApplicationSupportFolderType, + kCreateFolder, &fsRef); + NS_ENSURE_FALSE(err, NS_ERROR_FAILURE); + // To convert the FSRef returned by FSFindFolder() into an nsIFile that + // points to ~/Library/Application Support, we first create an empty + // nsIFile object (no path) and then use InitWithFSRef() to set the + // path. + nsresult rv = NS_NewNativeLocalFile(EmptyCString(), true, + getter_AddRefs(tbDataDir)); + NS_ENSURE_SUCCESS(rv, rv); + nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(tbDataDir); + if (!dirFileMac) + return NS_ERROR_UNEXPECTED; + rv = dirFileMac->InitWithFSRef(&fsRef); + NS_ENSURE_SUCCESS(rv, rv); + rv = tbDataDir->AppendNative(tbDataLeafName); + NS_ENSURE_SUCCESS(rv, rv); + } +#endif + +#else + // User data is embedded within the application directory (i.e., + // TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined). + nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(tbDataDir)); + NS_ENSURE_SUCCESS(rv, rv); + rv = tbDataDir->AppendNative(NS_LITERAL_CSTRING("TorBrowser")); + NS_ENSURE_SUCCESS(rv, rv); +#endif + + NS_ADDREF(*aFile = tbDataDir); + return NS_OK; +} + +static nsresult +GetAppRootDir(nsIFile *aExeFile, nsIFile** aFile) +{ + NS_ENSURE_ARG_POINTER(aExeFile); + NS_ENSURE_ARG_POINTER(aFile); + nsCOMPtr<nsIFile> appRootDir = aExeFile; + + int levelsToRemove = 1; // Remove firefox (the executable file). +#if defined(XP_MACOSX) + levelsToRemove += 2; // On Mac OS, we must also remove Contents/MacOS. +#endif + while (appRootDir && (levelsToRemove > 0)) { + // When crawling up the hierarchy, components named "." do not count. + nsAutoCString removedName; + nsresult rv = appRootDir->GetNativeLeafName(removedName); + NS_ENSURE_SUCCESS(rv, rv); + bool didRemove = !removedName.Equals("."); + + // Remove a directory component. + nsCOMPtr<nsIFile> parentDir; + rv = appRootDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + appRootDir = parentDir; + + if (didRemove) + --levelsToRemove; + } + + if (!appRootDir) + return NS_ERROR_FAILURE; + + NS_ADDREF(*aFile = appRootDir); + return NS_OK; +} diff --git a/xpcom/io/TorFileUtils.h b/xpcom/io/TorFileUtils.h new file mode 100644 index 0000000..293ed04 --- /dev/null +++ b/xpcom/io/TorFileUtils.h @@ -0,0 +1,35 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef TorFileUtils_h__ +#define TorFileUtils_h__ + +#include "nsIFile.h" + +class nsIFile; + +/** + * TorBrowser_GetUserDataDir + * + * Retrieve the Tor Browser user data directory. + * When built with --enable-tor-browser-data-outside-app-dir, the directory + * is next to the application directory, except on Mac OS where it may be + * there or it may be at ~/Library/Application Support/TorBrowser-Data (the + * latter location is used if the .app bundle is in a directory whose path + * contains /Applications or if we lack write access to the directory that + * contains the .app). + * When built without --enable-tor-browser-data-outside-app-dir, this + * directory is TorBrowser.app/TorBrowser. + * + * @param aExeFile The firefox executable. + * @param aFile Out parameter that is set to the Tor Browser user data + * directory. + * @return NS_OK on success. Error otherwise. + */ +extern NS_METHOD +TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile); + +#endif // !TorFileUtils_h__ diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index 6e1936f..00a061b 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -80,6 +80,7 @@ EXPORTS += [ 'nsUnicharInputStream.h', 'nsWildCard.h', 'SpecialSystemDirectory.h', + 'TorFileUtils.h', ] EXPORTS.mozilla += [ @@ -116,6 +117,7 @@ UNIFIED_SOURCES += [ 'SnappyFrameUtils.cpp', 'SnappyUncompressInputStream.cpp', 'SpecialSystemDirectory.cpp', + 'TorFileUtils.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index 4948dbe..022dfd8 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -28,6 +28,7 @@ #include <sys/param.h> #endif +#include "TorFileUtils.h" // WARNING: These hard coded names need to go away. They need to // come from localizable resources @@ -282,7 +283,8 @@ nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) // #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR // UNIX and WIN : <App Folder>/../TorBrowser-Data/Browser -// Mac : <App Folder>/../../../TorBrowser-Data/Browser +// Mac : <App Folder>/../../../TorBrowser-Data/Browser OR +// ~/Library/Application Support/TorBrowser-Data/Browser #else // UNIX and WIN : <App Folder>/TorBrowser/Data/Browser // Mac : <App Folder>/../../TorBrowser/Data/Browser @@ -296,49 +298,23 @@ nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, return NS_ERROR_INVALID_ARG; } - nsresult rv; + nsresult rv = NS_ERROR_UNEXPECTED; bool exists; - nsCOMPtr<nsIFile> localDir; + nsCOMPtr<nsIFile> localDir, exeFile; - rv = CloneMozBinDirectory(getter_AddRefs(localDir)); + nsCOMPtr<nsIProperties> directoryService( + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); + NS_ENSURE_SUCCESS(rv, rv); + rv = directoryService->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, rv); + rv = TorBrowser_GetUserDataDir(exeFile, getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR - int levelsToRemove = 2; // In FF21+, bin dir points to browser subdirectory. -#else - int levelsToRemove = 1; // In FF21+, bin dir points to browser subdirectory. -#endif -#if defined(XP_MACOSX) - levelsToRemove += 2; -#endif - while (localDir && (levelsToRemove > 0)) { - // When crawling up the hierarchy, components named "." do not count. - nsAutoCString removedName; - rv = localDir->GetNativeLeafName(removedName); - NS_ENSURE_SUCCESS(rv, rv); - bool didRemove = !removedName.Equals("."); - - // Remove a directory component. - nsCOMPtr<nsIFile> parentDir; - rv = localDir->GetParent(getter_AddRefs(parentDir)); - NS_ENSURE_SUCCESS(rv, rv); - localDir = parentDir; - - if (didRemove) { - --levelsToRemove; - } - } - - if (!localDir) { - return NS_ERROR_FAILURE; - } - -#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser-Data" - XPCOM_FILE_PATH_SEPARATOR "Browser")); + rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); #else - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser" - XPCOM_FILE_PATH_SEPARATOR "Data" + rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Data" XPCOM_FILE_PATH_SEPARATOR "Browser")); #endif NS_ENSURE_SUCCESS(rv, rv);

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit 7086a333e72dc0cf00c1e2570eed74fa228a0970 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 18:46:50 2016 +0000 Update translations for tails-onioncircuits --- pt_BR/onioncircuits.pot | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pt_BR/onioncircuits.pot b/pt_BR/onioncircuits.pot index e9d408c..b730f1f 100644 --- a/pt_BR/onioncircuits.pot +++ b/pt_BR/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Communia <ameaneantie(a)riseup.net>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2016-03-30 18:37+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,12 +75,12 @@ msgstr "" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" @@ -88,4 +89,4 @@ msgstr "Largura de Banda:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit e43769c383ac36597b457d8324b3019f94d70758 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:47:37 2016 +0000 Update translations for tails-onioncircuits_completed --- tr/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/onioncircuits.pot b/tr/onioncircuits.pot index 37479fd..50eccbf 100644 --- a/tr/onioncircuits.pot +++ b/tr/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Kaya Zeren <kayazeren(a)gmail.com>, 2016 +# Volkan Gezer <volkangezer(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 07:56+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" +"PO-Revision-Date: 2016-03-30 17:26+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +72,7 @@ msgstr "Parmak İzi:" #: ../onioncircuits:565 msgid "Published:" -msgstr "Yayınlanmış:" +msgstr "Yayınlanma:" #: ../onioncircuits:566 msgid "IP:"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit 5d21d8dec3ee5c274d13f3b57c6ba0ef2c0321f3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:47:33 2016 +0000 Update translations for tails-onioncircuits --- tr/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/onioncircuits.pot b/tr/onioncircuits.pot index 37479fd..50eccbf 100644 --- a/tr/onioncircuits.pot +++ b/tr/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Kaya Zeren <kayazeren(a)gmail.com>, 2016 +# Volkan Gezer <volkangezer(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 07:56+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" +"PO-Revision-Date: 2016-03-30 17:26+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +72,7 @@ msgstr "Parmak İzi:" #: ../onioncircuits:565 msgid "Published:" -msgstr "Yayınlanmış:" +msgstr "Yayınlanma:" #: ../onioncircuits:566 msgid "IP:"

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit 7fa48aee9b8dca70bac6bd27db758aa3058daa31 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:47:13 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- tr/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/irc.properties b/tr/irc.properties index e286d0f..987bf08 100644 --- a/tr/irc.properties +++ b/tr/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Son iletiniz gönderilirken bir hata oluştu. Lütfen ba error.channelForward=%1$S kanalına giremezsiniz. Otomatik olarak %2$S kanalına yönlendirildiniz. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode= '%S' bu sunucuda geçerli bir kullanıcı modu değil. +error.unknownMode= '%S' bu sunucuda geçerli bir kullanıcı kipi değil. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit 68aa3f385f9e62d885f2e07cab4ad9403afbf5f2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:47:09 2016 +0000 Update translations for tor-messenger-ircproperties --- tr/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/irc.properties b/tr/irc.properties index e286d0f..987bf08 100644 --- a/tr/irc.properties +++ b/tr/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Son iletiniz gönderilirken bir hata oluştu. Lütfen ba error.channelForward=%1$S kanalına giremezsiniz. Otomatik olarak %2$S kanalına yönlendirildiniz. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode= '%S' bu sunucuda geçerli bir kullanıcı modu değil. +error.unknownMode= '%S' bu sunucuda geçerli bir kullanıcı kipi değil. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit b2ea5c538fdb887d8b1f6d71ec064b52854ae1f2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:46:27 2016 +0000 Update translations for torbutton-torbuttondtd --- tr/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd index 62114b5..3a03b4d 100644 --- a/tr/torbutton.dtd +++ b/tr/torbutton.dtd @@ -170,7 +170,7 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel tipleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel türleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG görselleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanılmayan sitelerde JavaScript varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araç çubuğu düğmesi kullanılarak her site için ayrı ayrı etkinleştirilebilir.">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit a0b6e126bf3ee664f7d3731acfbc61c3df29f886 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:46:23 2016 +0000 Update translations for torbutton-torbuttonproperties --- tr/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/torbutton.properties b/tr/torbutton.properties index 6722796..2e2cdff 100644 --- a/tr/torbutton.properties +++ b/tr/torbutton.properties @@ -29,9 +29,9 @@ torbutton.popup.test.auto_failed = Otomatik Tor vekil sunucu sınamasında Tor k torbutton.prefs.recommended = (önerilir) torbutton.prefs.optional = (isteğe bağlı) torbutton.prefs.crucial = (önemli) -torbutton.popup.external.title = Dış bir dosya tipi indirilsin mi? +torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n -torbutton.popup.external.note = Bazı dosya tipleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n\n +torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = Tor Browser tüm sekme ve pencereleri kapatacak torbutton.slider_notification = Yeşil soğan menüsünde artık güvenlik düzeyini ayarlayabileceğiniz bir güvenlik kaydırıcısı var. Deneyin! torbutton.slider_notification_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzu web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. +torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzun web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel verisini göndersin mi? @@ -76,4 +76,4 @@ profileProblemTitle=%S Profili Sorunu profileReadOnly=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını farklı bir konuma kopyalayın. profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını Masaüstü veya Uygulamalar klasörüne kopyalayın. profileAccessDenied=%S, profilinize erişemiyor. Lütfen dosya sistemi izinlerini ayarlayarak yeniden deneyin. -profileMigrationFailed=Varolan %S profilinizin taşınma işlemi başarısız oldu.\nYeni ayarlar kullanılacak. +profileMigrationFailed=Mevcut %S profilinizin taşınma işlemi başarısız oldu.\nYeni ayarlar kullanılacak.

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit e2b070b221b22d0f388fdeaf8db701a179252850 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:46:13 2016 +0000 Update translations for abouttor-homepage_completed --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 3e3db58..d68d838 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Şimdi ne olacak?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> -<!ENTITY aboutTor.whatnext.label "Anonim Kalma İp Uçları »"> +<!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 30 Mar '16

30 Mar '16

commit c5df587f8a9278a98a922e226012f8cdbe702917 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 30 17:46:09 2016 +0000 Update translations for abouttor-homepage --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 3e3db58..d68d838 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Şimdi ne olacak?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> -<!ENTITY aboutTor.whatnext.label "Anonim Kalma İp Uçları »"> +<!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:">

1 0