- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 14631: Improve profile access error messages.
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit bebc69b8e8e919abec272f9cff6ab13fb9ea51f7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Feb 24 13:50:23 2015 -0500 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". --- .../mozapps/profile/profileSelection.properties | 5 + toolkit/xre/nsAppRunner.cpp | 112 +++++++++++++++++--- 2 files changed, 103 insertions(+), 14 deletions(-) diff --git a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties index adac95a..3cf48ff 100644 --- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties +++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties @@ -12,6 +12,11 @@ restartMessageUnlocker=%S is already running, but is not responding. The old %S restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S can be open at a time. restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S will quit in order to open this one. +# LOCALIZATION NOTE (profileProblemTitle, profileReadOnly, profileReadOnlyMac, profileAccessDenied): Messages displayed when the browser profile cannot be accessed or written to. %S is the application name. +profileProblemTitle=%S Profile Problem +profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. # Profile manager # LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S is the path to the profile folder. profileTooltip=Profile: '%S' - Path: '%S' diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index cadc46d..dbd1376 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1682,12 +1682,20 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, return NS_ERROR_LAUNCHED_CHILD_PROCESS; } +enum ProfileStatus { + PROFILE_STATUS_OK, + PROFILE_STATUS_ACCESS_DENIED, + PROFILE_STATUS_READ_ONLY, + PROFILE_STATUS_IS_LOCKED, + PROFILE_STATUS_OTHER_ERROR +}; + static const char kProfileProperties[] = "chrome://mozapps/locale/profile/profileSelection.properties"; static nsresult -ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, - nsIProfileUnlocker* aUnlocker, +ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, + ProfileStatus aStatus, nsIProfileUnlocker* aUnlocker, nsINativeAppSupport* aNative, nsIProfileLock* *aResult) { nsresult rv; @@ -1717,17 +1725,29 @@ ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, #ifndef XP_MACOSX static const char16_t kRestartNoUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','N','o','U','n','l','o','c','k','e','r','\0'}; // "restartMessageNoUnlocker" static const char16_t kRestartUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','U','n','l','o','c','k','e','r','\0'}; // "restartMessageUnlocker" + static const char16_t kReadOnly[] = {'p','r','o','f','i','l','e','R','e','a','d','O','n','l','y','\0'}; // "profileReadOnly" #else static const char16_t kRestartNoUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','N','o','U','n','l','o','c','k','e','r','M','a','c','\0'}; // "restartMessageNoUnlockerMac" static const char16_t kRestartUnlocker[] = {'r','e','s','t','a','r','t','M','e','s','s','a','g','e','U','n','l','o','c','k','e','r','M','a','c','\0'}; // "restartMessageUnlockerMac" + static const char16_t kReadOnly[] = {'p','r','o','f','i','l','e','R','e','a','d','O','n','l','y','M','a','c','\0'}; // "profileReadOnlyMac" #endif - sb->FormatStringFromName(aUnlocker ? kRestartUnlocker : kRestartNoUnlocker, - params, 2, getter_Copies(killMessage)); + static const char16_t kAccessDenied[] = {'p','r','o','f','i','l','e','A','c','c','e','s','s','D','e','n','i','e','d','\0'}; // "profileAccessDenied" + const char16_t *errorKey = aUnlocker ? kRestartUnlocker + : kRestartNoUnlocker; + if (PROFILE_STATUS_READ_ONLY == aStatus) + errorKey = kReadOnly; + else if (PROFILE_STATUS_ACCESS_DENIED == aStatus) + errorKey = kAccessDenied; + sb->FormatStringFromName(errorKey, params, 2, getter_Copies(killMessage)); + + const char16_t *titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || + (PROFILE_STATUS_ACCESS_DENIED == aStatus)) + ? MOZ_UTF16("profileProblemTitle") + : MOZ_UTF16("restartTitle"); nsXPIDLString killTitle; - sb->FormatStringFromName(MOZ_UTF16("restartTitle"), - params, 1, getter_Copies(killTitle)); + sb->FormatStringFromName(titleKey, params, 1, getter_Copies(killTitle)); if (!killMessage || !killTitle) return NS_ERROR_FAILURE; @@ -1828,8 +1848,9 @@ ProfileMissingDialog(nsINativeAppSupport* aNative) } static nsresult -ProfileLockedDialog(nsIToolkitProfile* aProfile, nsIProfileUnlocker* aUnlocker, - nsINativeAppSupport* aNative, nsIProfileLock* *aResult) +ProfileErrorDialog(nsIToolkitProfile* aProfile, ProfileStatus aStatus, + nsIProfileUnlocker* aUnlocker, nsINativeAppSupport* aNative, + nsIProfileLock* *aResult) { nsCOMPtr<nsIFile> profileDir; nsresult rv = aProfile->GetRootDir(getter_AddRefs(profileDir)); @@ -1845,8 +1866,8 @@ ProfileLockedDialog(nsIToolkitProfile* aProfile, nsIProfileUnlocker* aUnlocker, rv = aProfile->GetLocalDir(getter_AddRefs(profileLocalDir)); if (NS_FAILED(rv)) return rv; - return ProfileLockedDialog(profileDir, profileLocalDir, aUnlocker, aNative, - aResult); + return ProfileErrorDialog(profileDir, profileLocalDir, aStatus, aUnlocker, + aNative, aResult); } static const char kProfileManagerURL[] = @@ -2007,6 +2028,53 @@ SetCurrentProfileAsDefault(nsIToolkitProfileService* aProfileSvc, return rv; } +// Check for write permission to the profile directory by trying to create a +// new file (after ensuring that no file with the same name exists). +static ProfileStatus CheckProfileWriteAccess(nsIFile* aProfileDir) +{ +#if defined(XP_UNIX) + NS_NAMED_LITERAL_STRING(writeTestFileName, ".parentwritetest"); +#else + NS_NAMED_LITERAL_STRING(writeTestFileName, "parent.writetest"); +#endif + + nsCOMPtr<nsIFile> writeTestFile; + nsresult rv = aProfileDir->Clone(getter_AddRefs(writeTestFile)); + if (NS_SUCCEEDED(rv)) + rv = writeTestFile->Append(writeTestFileName); + + if (NS_SUCCEEDED(rv)) { + bool doesExist = false; + rv = writeTestFile->Exists(&doesExist); + if (NS_SUCCEEDED(rv) && doesExist) + rv = writeTestFile->Remove(true); + } + + if (NS_SUCCEEDED(rv)) { + rv = writeTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0666); + (void)writeTestFile->Remove(true); + } + + ProfileStatus status = NS_SUCCEEDED(rv) ? PROFILE_STATUS_OK + : PROFILE_STATUS_OTHER_ERROR; + if (NS_ERROR_FILE_ACCESS_DENIED == rv) + status = PROFILE_STATUS_ACCESS_DENIED; + else if (NS_ERROR_FILE_READ_ONLY == rv) + status = PROFILE_STATUS_READ_ONLY; + + return status; +} + +static ProfileStatus CheckProfileWriteAccess(nsIToolkitProfile* aProfile) +{ + nsCOMPtr<nsIFile> profileDir; + nsresult rv = aProfile->GetRootDir(getter_AddRefs(profileDir)); + if (NS_FAILED(rv)) + return PROFILE_STATUS_OTHER_ERROR; + + return CheckProfileWriteAccess(profileDir); +} + static bool gDoMigration = false; static bool gDoProfileReset = false; @@ -2140,13 +2208,18 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n NS_ENSURE_SUCCESS(rv, rv); } + ProfileStatus status = CheckProfileWriteAccess(lf); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(lf, lf, status, nullptr, aNative, aResult); + // If a profile path is specified directory on the command line, then // assume that the temp directory is the same as the given directory. rv = NS_LockProfilePath(lf, lf, getter_AddRefs(unlocker), aResult); if (NS_SUCCEEDED(rv)) return rv; - return ProfileLockedDialog(lf, lf, unlocker, aNative, aResult); + return ProfileErrorDialog(lf, lf, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } ar = CheckArg("createprofile", true, &arg); @@ -2231,6 +2304,10 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n gDoProfileReset = false; } + ProfileStatus status = CheckProfileWriteAccess(profile); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(profile, status, nullptr, aNative, aResult); + nsCOMPtr<nsIProfileUnlocker> unlocker; rv = profile->Lock(getter_AddRefs(unlocker), aResult); if (NS_SUCCEEDED(rv)) { @@ -2239,7 +2316,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n return NS_OK; } - return ProfileLockedDialog(profile, unlocker, aNative, aResult); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } if (CanShowProfileManager()) { @@ -2293,7 +2371,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n nsCOMPtr<nsIProfileUnlocker> unlocker; rv = profile->Lock(getter_AddRefs(unlocker), &tempProfileLock); if (NS_FAILED(rv)) - return ProfileLockedDialog(profile, unlocker, aNative, &tempProfileLock); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, + unlocker, aNative, &tempProfileLock); } nsCOMPtr<nsIToolkitProfile> newProfile; @@ -2304,6 +2383,10 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n gDoProfileReset = false; } + ProfileStatus status = CheckProfileWriteAccess(profile); + if (PROFILE_STATUS_OK != status) + return ProfileErrorDialog(profile, status, nullptr, aNative, aResult); + // If you close Firefox and very quickly reopen it, the old Firefox may // still be closing down. Rather than immediately showing the // "Firefox is running but is not responding" message, we spend a few @@ -2329,7 +2412,8 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, n PR_Sleep(kLockRetrySleepMS); } while (TimeStamp::Now() - start < TimeDuration::FromSeconds(kLockRetrySeconds)); - return ProfileLockedDialog(profile, unlocker, aNative, aResult); + return ProfileErrorDialog(profile, PROFILE_STATUS_IS_LOCKED, unlocker, + aNative, aResult); } }

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 14631: Improve profile access error msgs (strings).
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit ce2343957e7617ffa47c5b2b8b2a3128916ac92e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 27 10:38:40 2015 -0500 Bug 14631: Improve profile access error msgs (strings). To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. --- toolkit/xre/moz.build | 4 +- toolkit/xre/nsAppRunner.cpp | 116 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index a13a9ef..a1a875b 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -109,8 +109,8 @@ FINAL_LIBRARY = 'xul' if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX': DEFINES['USE_GLX_TEST'] = True -for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_VERSION', 'OS_TARGET', - 'MOZ_WIDGET_TOOLKIT'): +for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME', + 'MOZ_APP_VERSION', 'OS_TARGET', 'MOZ_WIDGET_TOOLKIT'): DEFINES[var] = '"%s"' % CONFIG[var] if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index dbd1376..dc7d424 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1682,6 +1682,104 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative, return NS_ERROR_LAUNCHED_CHILD_PROCESS; } +static nsresult +GetOverrideStringBundleForLocale(nsIStringBundleService* aSBS, + const char* aTorbuttonURI, const char* aLocale, + nsIStringBundle* *aResult) +{ + NS_ENSURE_ARG(aSBS); + NS_ENSURE_ARG(aTorbuttonURI); + NS_ENSURE_ARG(aLocale); + NS_ENSURE_ARG(aResult); + + const char* kFormatStr = "jar:%s!/chrome/locale/%s/torbutton.properties"; + nsPrintfCString strBundleURL(kFormatStr, aTorbuttonURI, aLocale); + nsresult rv = aSBS->CreateBundle(strBundleURL.get(), aResult); + NS_ENSURE_SUCCESS(rv, rv); + + // To ensure that we have a valid string bundle, try to retrieve a string + // that we know exists. + nsXPIDLString val; + rv = (*aResult)->GetStringFromName(MOZ_UTF16("profileProblemTitle"), + getter_Copies(val)); + if (!NS_SUCCEEDED(rv)) + *aResult = nullptr; // No good. Discard it. + + return rv; +} + +static void +GetOverrideStringBundle(nsIStringBundleService* aSBS, nsIStringBundle* *aResult) +{ + if (!aSBS || !aResult) + return; + + *aResult = nullptr; + + // Build Torbutton file URI string by starting from the profiles directory. + nsXREDirProvider* dirProvider = nsXREDirProvider::GetSingleton(); + if (!dirProvider) + return; + + bool persistent = false; // ignored + nsCOMPtr<nsIFile> profilesDir; + nsresult rv = dirProvider->GetFile(NS_APP_USER_PROFILES_ROOT_DIR, &persistent, + getter_AddRefs(profilesDir)); + if (NS_FAILED(rv)) + return; + + // Create file URI, extract as string, and append Torbutton xpi relative path. + nsCOMPtr<nsIURI> uri; + nsAutoCString uriString; + if (NS_FAILED(NS_NewFileURI(getter_AddRefs(uri), profilesDir)) || + NS_FAILED(uri->GetSpec(uriString))) { + return; + } + + uriString.Append("profile.default/extensions/torbutton(a)torproject.org.xpi"); + + nsCString userAgentLocale; + if (!NS_SUCCEEDED(Preferences::GetCString("general.useragent.locale", + &userAgentLocale))) { + return; + } + + rv = GetOverrideStringBundleForLocale(aSBS, uriString.get(), + userAgentLocale.get(), aResult); + if (NS_FAILED(rv)) { + // Try again using base locale, e.g., "en" vs. "en-US". + int16_t offset = userAgentLocale.FindChar('-', 1); + if (offset > 0) { + nsAutoCString shortLocale(Substring(userAgentLocale, 0, offset)); + rv = GetOverrideStringBundleForLocale(aSBS, uriString.get(), + shortLocale.get(), aResult); + } + } +} + +static nsresult +GetFormattedString(nsIStringBundle* aOverrideBundle, + nsIStringBundle* aMainBundle, + const char16_t* aName, + const char16_t** aParams, uint32_t aLength, + char16_t* *aResult) +{ + NS_ENSURE_ARG(aName); + NS_ENSURE_ARG(aResult); + + nsresult rv = NS_ERROR_FAILURE; + if (aOverrideBundle) { + rv = aOverrideBundle->FormatStringFromName(aName, aParams, aLength, + aResult); + } + + // If string was not found in override bundle, use main (browser) bundle. + if (NS_FAILED(rv) && aMainBundle) + rv = aMainBundle->FormatStringFromName(aName, aParams, aLength, aResult); + + return rv; +} + enum ProfileStatus { PROFILE_STATUS_OK, PROFILE_STATUS_ACCESS_DENIED, @@ -1718,7 +1816,10 @@ ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); - NS_ConvertUTF8toUTF16 appName(gAppData->name); + nsCOMPtr<nsIStringBundle> overrideSB; + GetOverrideStringBundle(sbs, getter_AddRefs(overrideSB)); + + NS_ConvertUTF8toUTF16 appName(MOZ_APP_DISPLAYNAME); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; @@ -1734,21 +1835,22 @@ ProfileErrorDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, static const char16_t kAccessDenied[] = {'p','r','o','f','i','l','e','A','c','c','e','s','s','D','e','n','i','e','d','\0'}; // "profileAccessDenied" - const char16_t *errorKey = aUnlocker ? kRestartUnlocker + const char16_t* errorKey = aUnlocker ? kRestartUnlocker : kRestartNoUnlocker; if (PROFILE_STATUS_READ_ONLY == aStatus) errorKey = kReadOnly; else if (PROFILE_STATUS_ACCESS_DENIED == aStatus) errorKey = kAccessDenied; - sb->FormatStringFromName(errorKey, params, 2, getter_Copies(killMessage)); + GetFormattedString(overrideSB, sb, errorKey, params, 2, + getter_Copies(killMessage)); - const char16_t *titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || + const char16_t* titleKey = ((PROFILE_STATUS_READ_ONLY == aStatus) || (PROFILE_STATUS_ACCESS_DENIED == aStatus)) ? MOZ_UTF16("profileProblemTitle") : MOZ_UTF16("restartTitle"); nsXPIDLString killTitle; - sb->FormatStringFromName(titleKey, params, 1, getter_Copies(killTitle)); - + GetFormattedString(overrideSB, sb, titleKey, params, 1, + getter_Copies(killTitle)); if (!killMessage || !killTitle) return NS_ERROR_FAILURE; @@ -1822,7 +1924,7 @@ ProfileMissingDialog(nsINativeAppSupport* aNative) sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); - NS_ConvertUTF8toUTF16 appName(gAppData->name); + NS_ConvertUTF8toUTF16 appName(MOZ_APP_DISPLAYNAME); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString missingMessage;

1 0

[torbutton/master] Bug 15334: Display Cookie Protections menu choice if disk records enabled.
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit 4394ffb289e78fbec0c772481570b55776e0d0dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 17 19:36:40 2015 -0700 Bug 15334: Display Cookie Protections menu choice if disk records enabled. Regression caused during #14632. --- src/chrome/content/torbutton.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a14a097..09d6080 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2107,10 +2107,6 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } - // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR - // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. - document.getElementById("torbutton-cookie-protector").hidden = mode; - // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); @@ -2606,6 +2602,10 @@ function torbutton_check_protections() var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref; + // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR + // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. + document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); + if (!m_tb_control_pass || !m_tb_control_port) document.getElementById("torbutton-new-identity").disabled = true;

1 0

[torbutton/master] Add a extensions.torbutton.test_enabled boolean pref.
by mikeperry＠torproject.org 17 Mar '15

17 Mar '15

commit bc8f182fa3a5b13dbccc08ee1a21a3f8398d7851 Author: intrigeri <intrigeri(a)boum.org> Date: Fri Nov 22 14:01:08 2013 +0000 Add a extensions.torbutton.test_enabled boolean pref. Defaults to true. When disabled, no attempt is made to test if Tor is enabled. --- src/chrome/content/torbutton.js | 3 ++- src/defaults/preferences/preferences.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 69891c8..a14a097 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1912,7 +1912,8 @@ function torbutton_do_tor_check() { let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; - if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck) + if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck || + !m.tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) return; // Only do the check once. // If we have a tor control port and transparent torification is off, diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3584581..fb1a702 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -25,6 +25,7 @@ pref("extensions.torbutton.socks_host",""); pref("extensions.torbutton.socks_port",0); pref("extensions.torbutton.socks_version",5); pref("extensions.torbutton.locked_mode",true); +pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); pref("extensions.torbutton.local_tor_check",true);

1 0

[torbutton/master] Bug 13891: Avoid undefined circuitStatuses/bridges
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit bf2ee7eddab0eaed16ea6825ab084a6a183054f6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 10 16:08:55 2015 -0700 Bug 13891: Avoid undefined circuitStatuses/bridges --- src/chrome/content/tor-circuit-display.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b31953d..a4ba919 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -54,9 +54,11 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; // is not currently used as a bridge, returns null. let getBridge = function* (controller, id) { let bridges = yield controller.getConf("bridge"); - for (let bridge of bridges) { - if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { - return bridge; + if (bridges) { + for (let bridge of bridges) { + if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { + return bridge; + } } } return null; @@ -107,11 +109,14 @@ let nodeDataForCircuit = function* (controller, circuitEvent) { // Returns the circuit status for the circuit with the given ID. let getCircuitStatusByID = function* (aController, circuitID) { let circuitStatuses = yield aController.getInfo("circuit-status"); - for (let circuitStatus of circuitStatuses) { - if (circuitStatus.id === circuitID) { - return circuitStatus; + if (circuitStatuses) { + for (let circuitStatus of circuitStatuses) { + if (circuitStatus.id === circuitID) { + return circuitStatus; + } } } + return null; }; // __collectIsolationData(aController)__.

1 0

[torbutton/master] Bug 14324: Show HS circuit in Tor circuit display
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit c61487302e5056c561c7d50887807a320b354575 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Mar 10 21:44:41 2015 -0700 Bug 14324: Show HS circuit in Tor circuit display --- src/chrome/content/tor-circuit-display.js | 18 +++++++++++++----- src/chrome/locale/en/torbutton.properties | 2 ++ src/chrome/skin/tor-circuit-display.css | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index fc4da14..b31953d 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -181,10 +181,9 @@ let showCircuitDisplay = function (show) { // Takes a nodeData array of node items, each like // `{ ip : "12.34.56.78", country : "fr" }` // and converts each node data to text, as -// `"France (12.34.56.78)"`, prepended by "This browser" -// and appended by "Internet". +// `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { - let result = [uiString("this_browser")]; + let result = []; for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; result.push( @@ -203,7 +202,6 @@ let nodeLines = function (nodeData) { // and right-to-left languages. " ‭ (" + (ip || uiString("ip_unknown")) + ")‬")); } - result.push(uiString("internet")); return result; }; @@ -225,6 +223,10 @@ let getSOCKSCredentialsForBrowser = function (browser) { return proxyInfo.username + ":" + proxyInfo.password; }; +// __onionSiteRelayLine__. +// When we have an onion site, we simply show the word '(relay)'. +let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; + // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. @@ -242,10 +244,16 @@ let updateCircuitDisplay = function () { document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. let lines = nodeLines(nodeData), - nodeInnerHTML = ""; + nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; for (let line of lines) { nodeInnerHTML += "<li>" + line + "</li>"; } + nodeInnerHTML += domain.endsWith(".onion") ? + (onionSiteRelayLine + + onionSiteRelayLine + + onionSiteRelayLine + + "<li>" + uiString("onion_site") + "</li>") : + "<li>" + uiString("internet") + "</li>"; document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; } } diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 505f31b..3ee41f6 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,7 +2,9 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country torbutton.panel.tooltip.disabled = Click to enable Tor diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index b9d0638..004a68f 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -104,3 +104,8 @@ ul#circuit-nodes li:first-child:before { ul#circuit-nodes li:last-child:before { height: 50%; } + +/* Onion site relay node text should be gray. */ +ul#circuit-nodes li.relay { + color: gray; +} \ No newline at end of file

1 0

[torbutton/master] Bug 15086: Handle RTL text in Tor circuit display
by gk＠torproject.org 12 Mar '15

12 Mar '15

commit 6d0c5e64ce8e104e3f9bfe648356a4f40fdde404 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 1 17:04:48 2015 -0800 Bug 15086: Handle RTL text in Tor circuit display Also fixes #13704 (circuit display now accomodates more than 3 relays). --- src/chrome/content/popup.xul | 56 +++++++-------- src/chrome/content/tor-circuit-display.js | 41 +++++++---- src/chrome/skin/tor-circuit-display.css | 106 +++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 47 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index e0c1f74..6511b6c 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,18 +1,21 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> <overlay id="torbutton-popup-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <stringbundleset id="torbutton-stringbundleset"> - <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> - </stringbundleset> - <panel id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();" titlebar="normal" noautohide="true" - anchor="torbutton-button" position="after_start" > - <hbox align="start"> - <vbox> + <stringbundleset id="torbutton-stringbundleset"> + <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> + </stringbundleset> + <panel id="torbutton-context-menu" + onpopupshowing="torbutton_check_protections();" + titlebar="normal" noautohide="true" + anchor="torbutton-button" position="after_start" > + <hbox align="start"> + <vbox> <menuitem id="torbutton-new-identity" label="&torbutton.context_menu.new_identity;" accesskey="&torbutton.context_menu.new_identity_key;" @@ -45,29 +48,18 @@ accesskey="&torbutton.context_menu.downloadUpdate.key;" insertafter="context-stop" oncommand="torbutton_check_for_update()"/> - </vbox> - <vbox> -  - <svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" - width="290" height="140" id="tor-circuit" style="display:none;"> - <rect x="0" y="0" width="100%" height="100%" fill="#e8f4f4" /> - <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">&torbutton.circuit_display.title;</text> - <text id="domain" style="font-size:13px;" x="10" y="38" fill="black">(trac.torproject.org)</text> - <rect x="18.5" width="3" y="56" height="64" fill="#4d363a" stroke-width="0"/> - <circle class="node-circle" cx="20" cy="56" r="4" /> - <text class="node-text" x="32" y="56">This Browser</text> - <circle class="node-circle" cx="20" cy="72" r="4" /> - <text class="node-text" x="32" y="72">Test123 (54.67.87.34)</text> - <circle class="node-circle" cx="20" cy="88" r="4" /> - <text class="node-text" x="32" y="88">TestABC (121.4.56.67)</text> - <circle class="node-circle" cx="20" cy="104" r="4" /> - <text class="node-text" x="32" y="104">TestXYZ (74.3.30.9)</text> - <circle class="node-circle" cx="20" cy="120" r="4" /> - <text class="node-text" x="32" y="120">Internet</text> - </svg> - </vbox> - </hbox> - </panel> - + </vbox> + <vbox id="circuit-display-container"> + <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> + <p id="title">&torbutton.circuit_display.title;</p> + <p id="domain">(example.com)</p> + <ul id="circuit-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </ul> + </div> + </vbox> + </hbox> + </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index bcda03a..fc4da14 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -173,26 +173,37 @@ let localizedCountryNameFromCode = function (countryCode) { // __showCircuitDisplay(show)__. // If show === true, makes the circuit display visible. let showCircuitDisplay = function (show) { - document.querySelector("svg#tor-circuit").style.display = show ? + document.getElementById("circuit-display-container").style.display = show ? 'block' : 'none'; }; // __nodeLines(nodeData)__. -// Takes a nodeData array of three items each like +// Takes a nodeData array of node items, each like // `{ ip : "12.34.56.78", country : "fr" }` // and converts each node data to text, as -// `"France (12.34.56.78)"`. +// `"France (12.34.56.78)"`, prepended by "This browser" +// and appended by "Internet". let nodeLines = function (nodeData) { let result = [uiString("this_browser")]; for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; - result.push((countryCode ? localizedCountryNameFromCode(countryCode) + result.push( + // For each relay, show its apparent host country. + (countryCode ? localizedCountryNameFromCode(countryCode) : uiString("unknown_country")) + - " (" + (bridge ? (uiString("tor_bridge") + - ((bridgeType !== "vanilla") ? (": " + bridgeType) : "")) - : (ip || uiString("ip_unknown"))) + ")"); + (bridge ? + // As we have a bridge, don't show the IP address + // but show the bridge type. + " (" + uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + ")" + : + // As we don't have a bridge, show the IP address + // of the node. Use unicode escapes to ensure that + // parentheses behave properly in both left-to-right + // and right-to-left languages. + " ‭ (" + (ip || uiString("ip_unknown")) + ")‬")); } - result[4] = uiString("internet"); + result.push(uiString("internet")); return result; }; @@ -215,7 +226,7 @@ let getSOCKSCredentialsForBrowser = function (browser) { }; // __updateCircuitDisplay()__. -// Updates the Tor circuit display SVG, showing the current domain +// Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; @@ -228,14 +239,14 @@ let updateCircuitDisplay = function () { if (nodeData) { // Update the displayed domain. let domain = credentials.split(":")[0]; - document.querySelector("svg#tor-circuit text#domain").innerHTML = "(" + domain + "):"; + document.getElementById("domain").innerHTML = "(" + domain + "):"; // Update the displayed information for the relay nodes. - let diagramNodes = document.querySelectorAll("svg#tor-circuit text.node-text"), - lines = nodeLines(nodeData); - for (let i = 0; i < diagramNodes.length; ++i) { - let line = lines[i]; - diagramNodes[i].innerHTML = line ? line : ""; + let lines = nodeLines(nodeData), + nodeInnerHTML = ""; + for (let line of lines) { + nodeInnerHTML += "<li>" + line + "</li>"; } + document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; } } // Only show the Tor circuit if we have credentials and node data. diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css new file mode 100644 index 0000000..b9d0638 --- /dev/null +++ b/src/chrome/skin/tor-circuit-display.css @@ -0,0 +1,106 @@ +/* +This CSS file is for styling the tor circuit display. It consists of a title, +a domain, and a bulleted list. + +Each bullet in the circuit node list is supposed to represent a Tor circuit node, +and lines drawn between them to represent Tor network inter-relay connections. + +CSS for line between bullets is Derived in part from https://jsfiddle.net/5JP8Q/ + +Color the background to make circuit display distinct from the rest of popup. +*/ + +/* The circuit-display div encloses all other HTML elements. */ +div#circuit-display { + background-color: #e8f4f4; + font-family: Arial; + width: 100%; + height: 100%; + padding: 8px; + /* Magically keep popup menu from clipping div: */ + display: table-cell; +} + +/* Format the title text. */ +div#circuit-display p#title { + font-size: 15px; + font-weight: bold; + color: #2c26a7; + margin: 0; +} + +/* Format the domain text. */ +div#circuit-display p#domain { + font-size: 13px; + color: black; + margin: 4px; +} + +/* Format the circuit node list. */ +ul#circuit-nodes { + font-family: Arial; + font-size: 14px; + margin-top: 8px; + padding-left: 8px; + padding-right: 8px; +} + +/* Hide default bullets, and position pseudoelements (our new bullets) relative + to the list items. */ +ul#circuit-nodes li { + list-style: none; + position:relative; +} + +/* Pad the list item text at left or right to be tastefully + separated from bullets. */ +ul#circuit-nodes li:-moz-dir(ltr) { + padding-left: 18px; +} +ul#circuit-nodes li:-moz-dir(rtl) { + padding-right: 18px; +} + +/* Drawn bullets, centered vertically for each list item. */ +ul#circuit-nodes li:after { + /* bullets */ + content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); + position: absolute; + top: 1px; +} + +/* Move the bullets to the far left or right, + depending on text directionality. */ +ul#circuit-nodes li:-moz-dir(ltr):after { + left: 0px; +} +ul#circuit-nodes li:-moz-dir(rtl):after { + right: 0px; +} + +/* Draw a connecting vertical line through the bullets. */ +ul#circuit-nodes li:before { + content: ""; + position: absolute; + border-left: 3px solid #4d363a; + height: 100%; + width: 0px; +} + +/* Position lines through the middle of the bullet. */ +ul#circuit-nodes li:-moz-dir(ltr):before { + left: 4px; +} +ul#circuit-nodes li:-moz-dir(rtl):before { + right: 4px; +} + +/* Shorten the first list item's line so that it starts under the bullet. */ +ul#circuit-nodes li:first-child:before { + top: 50%; +} + +/* Shorten the last list item's line so that it ends under the bullet. */ +ul#circuit-nodes li:last-child:before { + height: 50%; +}

1 0

[tor-browser-bundle/master] Bug 15023: Adding Linux MAR tools to SHA256 sums
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 8fc54b8ab6e96ff8fc722066bc7756b25d23619f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 10 11:34:07 2015 +0000 Bug 15023: Adding Linux MAR tools to SHA256 sums --- gitian/mkbundle-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index c71981f..f1ef984 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -257,7 +257,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else

1 0

[torbutton/master] Bug #15207: Check first if bridge.ID exists before using it
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 9714d5a8abfcc19c6c5667a8c4e3b7d064401df0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 9 17:24:05 2015 -0700 Bug #15207: Check first if bridge.ID exists before using it --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index e2628b4..bcda03a 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -55,7 +55,7 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; let getBridge = function* (controller, id) { let bridges = yield controller.getConf("bridge"); for (let bridge of bridges) { - if (bridge.ID.toUpperCase() === id.toUpperCase()) { + if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { return bridge; } }

1 0

[tor-browser-bundle/maint-4.0] Bug 14992: regenerate existing incremental MAR files
by boklm＠torproject.org 09 Mar '15

09 Mar '15

commit 9415032ccc373f96d3b7be4cf98ebe4d7bdf20e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 9 19:50:27 2015 +0100 Bug 14992: regenerate existing incremental MAR files --- tools/update-responses/update_responses | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index f982637..8b8c217 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -168,7 +168,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars_for_version { +sub create_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -179,7 +179,6 @@ sub create_missing_incremental_mars_for_version { my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { foreach my $lang (keys %{$v->{files}{$os}}) { - next if defined $v->{files}{$os}{$lang}{partial}{$from_version}; next unless defined $from_v->{files}{$os}{$lang}{complete}; create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); } @@ -451,7 +450,7 @@ my %actions = ( check_deps; foreach my $version (channel_to_version($config, @ARGV)) { get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); + create_incremental_mars_for_version($config, $version); } }, check_update_responses_deployement => \&check_update_responses,

1 0