February 2013 - tor-commits - lists.torproject.org

[torbrowser/maint-2.4] Bug 8234: Fix MacOS crash.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit f3938fb83d5995b14637bcd61a35caccf6d6cc52 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 16 00:40:21 2013 -0800 Bug 8234: Fix MacOS crash. The GetFirstPartyURI had a codepath that was missing an addref. Also, we should ensure the returned URI is mutable. Luckily there is a helper that does both these things. --- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) … [View More]diff --git a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch index 41dfc25..80144f3 100644 --- a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch +++ b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch @@ -1,17 +1,17 @@ -From ba78747eade72d0c4aeac7c6c6d5a93417112948 Mon Sep 17 00:00:00 2001 -From: Kathleen Brade <brade(a)pearlcrescent.com> +From eb5083671adc896d465caa40e188c3e16ddfeb6b Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 28 Nov 2012 17:08:29 -0500 Subject: [PATCH 19/26] Add mozIThirdPartyUtil.getFirstPartyURI API API allows you to get the url bar URI for a channel or nsIDocument. --- - content/base/src/ThirdPartyUtil.cpp | 58 ++++++++++++++++++++++++++++ + content/base/src/ThirdPartyUtil.cpp | 61 ++++++++++++++++++++++++++++ content/base/src/ThirdPartyUtil.h | 2 + netwerk/base/public/mozIThirdPartyUtil.idl | 21 ++++++++++ - 3 files changed, 81 insertions(+), 0 deletions(-) + 3 files changed, 84 insertions(+), 0 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp -index 97a000e..ae4fa70 100644 +index 97a000e..61e9eae 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -7,6 +7,9 @@ @@ -32,7 +32,7 @@ index 97a000e..ae4fa70 100644 return rv; } -@@ -282,3 +286,57 @@ ThirdPartyUtil::GetBaseDomain(nsIURI* aHostURI, +@@ -282,3 +286,60 @@ ThirdPartyUtil::GetBaseDomain(nsIURI* aHostURI, return NS_OK; } @@ -62,13 +62,16 @@ index 97a000e..ae4fa70 100644 + if (NS_FAILED(rv) && aDoc) { + nsCOMPtr<nsIDOMWindow> top; + nsCOMPtr<nsIDOMDocument> topDDoc; ++ nsIURI *docURI = nullptr; + + if (aDoc->GetWindow()) { + aDoc->GetWindow()->GetTop(getter_AddRefs(top)); + top->GetDocument(getter_AddRefs(topDDoc)); + + nsCOMPtr<nsIDocument> topDoc(do_QueryInterface(topDDoc)); -+ *aOutput = topDoc->GetOriginalURI(); ++ docURI = topDoc->GetOriginalURI(); ++ // Give us a mutable URI and also addref ++ rv = NS_EnsureSafeToReturn(docURI, aOutput); + } else { + // XXX: Chrome callers (such as NoScript) can end up here + // through getImageData/canvas usage with no document state [View Less]

1 0

[torbrowser/master] Bug #3944: Move prefs.js into omni.ja and extension-overrides.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 909770530607c35071ed8b65e049ba97caed2e77 Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Fri Feb 8 12:09:48 2013 -0800 Bug #3944: Move prefs.js into omni.ja and extension-overrides. Allows TBB updates without resetting people's prefs. --- build-scripts/config/browserconfig.properties | 1 + build-scripts/config/extension-overrides.js | 52 ++++++ build-scripts/config/pound_tor.js | 126 +++++++++++++ build-scripts/config/… [View More]

1 0

[torbrowser/maint-2.4] Bump Torbutton version to 1.5.0.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 3bf11130c5054c75af29849db81433ca402f0e7c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Feb 19 00:07:14 2013 -0800 Bump Torbutton version to 1.5.0. --- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index a2b58ec..8d0fb62 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-… [View More]

1 0

[torbrowser/maint-2.4] WIN: mkdir the extensions directory before trying to move things into it
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit fea4369ec207959872a0d866ffa6ab79e886bed0 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 12 22:09:20 2013 +0100 WIN: mkdir the extensions directory before trying to move things into it --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 793bf36..3695cd9 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -370,6 +370,7 @@ install-… [View More]

1 0

[torbrowser/maint-2.4] Bump torbutton version for MacOS drag blocking fix.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 7756dbbb8502c2501bcaf891cf70bf446f8af8e7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 13 01:03:40 2013 -0800 Bump torbutton version for MacOS drag blocking fix. --- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 159bb07..a2b58ec 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-… [View More]

1 0

[torbrowser/master] Clear out some stale Torbutton prefs.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 67caedf54ac86c7e1f3f5d7e879f804befaaa367 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Feb 8 12:17:29 2013 -0800 Clear out some stale Torbutton prefs. --- build-scripts/config/extension-overrides.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js index 7729f9b..d498177 100644 --- a/build-scripts/config/extension-overrides.js +++ b/build-scripts/… [View More]

1 0

[torbrowser/maint-2.4] Update font limiting patch to exempt @font-face.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 11c13307994168e97e95ac3a5d92cbd768cd12c6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Feb 12 22:44:08 2013 -0800 Update font limiting patch to exempt @font-face. This provides substantial rendering improvements, and probably will also make non-latin script users much happier. --- ...11-Limit-the-number-of-fonts-per-document.patch | 81 +++++++++++++++++--- 1 files changed, 71 insertions(+), 10 deletions(-) diff --git a/src/current-patches/… [View More]firefox/0011-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch index 80660db..dbf34a9 100644 --- a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch @@ -1,4 +1,4 @@ -From 2786933e3a395e1058da8850a3710f01ca416463 Mon Sep 17 00:00:00 2001 +From 6b7306a50a304bcf12b04784115f21f34b71864a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 5 Dec 2012 12:25:21 -0800 Subject: [PATCH 11/26] Limit the number of fonts per document. @@ -14,6 +14,11 @@ browser.display.use_document_fonts was set to 0 for subsequent font queries. If a pref is not set or is negative, that limit does not apply. +The use of "User Fonts" (aka WebFonts, aka @font-face fonts) are exempt from +both of these limits. The patch also makes such fonts take precedence over +local fonts. This vastly improves typography on many sites that would +otherwise hit these limits. + This is done to address: https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… --- @@ -21,8 +26,8 @@ https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… layout/base/nsPresContext.cpp | 100 +++++++++++++++++++++++++++++++++++++++++ layout/base/nsPresContext.h | 9 ++++ layout/style/nsCSSParser.cpp | 1 + - layout/style/nsRuleNode.cpp | 14 +++++- - 5 files changed, 122 insertions(+), 3 deletions(-) + layout/style/nsRuleNode.cpp | 56 ++++++++++++++++++++++- + 5 files changed, 164 insertions(+), 3 deletions(-) diff --git a/gfx/thebes/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp index c94a299..88c8b8e 100644 @@ -201,10 +206,18 @@ index 37a19c4..30fd021 100644 // because it's only being used to call EnumerateFamilies nsFont font(family, 0, 0, 0, 0, 0, 0); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp -index 64504fb..33ce21e 100644 +index 64504fb..86eff1f 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp -@@ -2954,6 +2954,7 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext, +@@ -42,6 +42,7 @@ + #include "mozilla/dom/Element.h" + #include "mozilla/LookAndFeel.h" + #include "mozilla/Util.h" ++#include "gfxUserFontSet.h" + + #if defined(_MSC_VER) || defined(__MINGW32__) + #include <malloc.h> +@@ -2954,6 +2955,7 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext, aPresContext->GetDefaultFont(kPresContext_DefaultVariableFont_ID, aFont->mLanguage); @@ -212,11 +225,44 @@ index 64504fb..33ce21e 100644 // -moz-system-font: enum (never inherit!) MOZ_STATIC_ASSERT( NS_STYLE_FONT_CAPTION == LookAndFeel::eFont_Caption && -@@ -3439,14 +3440,15 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3416,6 +3418,31 @@ static bool ExtractGeneric(const nsString& aFamily, bool aGeneric, + return true; + } + ++struct smugglerStruct { ++ nsStyleFont *font; ++ gfxUserFontSet *userFonts; ++}; ++ ++/* This function forces the use of the first @font-face font we find */ ++static bool ForceFirstWebFont(const nsString& aFamily, bool aGeneric, ++ void *smuggled) ++{ ++ smugglerStruct *sm = static_cast<smugglerStruct*>(smuggled); ++ ++ if (aGeneric) { ++ return true; ++ } ++ ++ if (sm->userFonts->HasFamily(aFamily)) { ++ // Force use of this exact @font-face font since we have it. ++ sm->font->mFont.name = aFamily; ++ ++ return false; // Stop enumeration. ++ } ++ ++ return true; ++} ++ + const void* + nsRuleNode::ComputeFontData(void* aStartStruct, + const nsRuleData* aRuleData, +@@ -3439,14 +3466,16 @@ nsRuleNode::ComputeFontData(void* aStartStruct, bool useDocumentFonts = mPresContext->GetCachedBoolPref(kPresContext_UseDocumentFonts); + bool isXUL = PR_FALSE; ++ bool forcedWebFont = false; // See if we are in the chrome // We only need to know this to determine if we have to use the @@ -230,11 +276,26 @@ index 64504fb..33ce21e 100644 } // Figure out if we are a generic font -@@ -3460,9 +3462,13 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3460,9 +3489,28 @@ nsRuleNode::ComputeFontData(void* aStartStruct, // generic? nsFont::GetGenericID(font->mFont.name, &generic); -+ mPresContext->AddFontAttempt(font->mFont); ++ if (!isXUL) { ++ gfxUserFontSet *userFonts = mPresContext->GetUserFontSet(); ++ if (userFonts) { ++ smugglerStruct sm; ++ sm.userFonts = userFonts; ++ sm.font = font; ++ ++ if (!sm.font->mFont.EnumerateFamilies(ForceFirstWebFont, &sm)) { ++ isXUL = true; // Always allow WebFont use. ++ forcedWebFont = true; ++ } ++ } ++ } ++ ++ if (!forcedWebFont && generic == kGenericFont_NONE) ++ mPresContext->AddFontAttempt(font->mFont); + // If we aren't allowed to use document fonts, then we are only entitled // to use the user's default variable-width font and fixed-width font @@ -245,11 +306,11 @@ index 64504fb..33ce21e 100644 // Extract the generic from the specified font family... nsAutoString genericName; if (!font->mFont.EnumerateFamilies(ExtractGeneric, &genericName)) { -@@ -3498,6 +3504,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, +@@ -3498,6 +3546,8 @@ nsRuleNode::ComputeFontData(void* aStartStruct, font); } -+ if (font->mGenericID == kGenericFont_NONE) ++ if (!forcedWebFont && font->mGenericID == kGenericFont_NONE) + mPresContext->AddFontUse(font->mFont); COMPUTE_END_INHERITED(Font, font) } [View Less]

1 0

[torbrowser/maint-2.4] Fix Windows properties updates (homepage and omnibox).
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit c35584acd82c0ed59a5f6cc4e8162b5a8fa0b3e7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 13 01:01:40 2013 -0800 Fix Windows properties updates (homepage and omnibox). --- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 659333a..8d68ab0 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-… [View More]

1 0

[torbrowser/master] Reorganize and trim our Firefox preferences.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 89d453737220e0103a07838249495721a296b749 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Feb 8 18:36:42 2013 -0800 Reorganize and trim our Firefox preferences. There was a lot of redundancy and ancient junk in here.. --- build-scripts/config/pound_tor.js | 158 ++++++++++++++++++------------------- 1 files changed, 78 insertions(+), 80 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 78108f8..38eb3f2 … [View More]100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -2,52 +2,47 @@ # Tor Browser Bundle # Do not edit this file. +// Disable browser auto updaters pref("app.update.auto", false); pref("app.update.enabled", false); -pref("browser.bookmarks.livemark_refresh_seconds", 31536000); -pref("browser.cache.disk.capacity", 0); +pref("browser.search.update", false); +pref("browser.rights.3.shown", true); + +// Disk activity: Disable Browsing History Storage +pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); -pref("browser.cache.disk.smart_size.enabled", false); -pref("browser.cache.disk.smart_size.first_run", false); pref("browser.cache.offline.enable", false); -pref("browser.chrome.favicons", false); -pref("browser.chrome.image_icons.max_size", 0); -pref("browser.chrome.site_icons", false); +pref("dom.indexedDB.enabled", false); +pref("permissions.memory_only", true); +pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); + +// Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.download.manager.addToRecentDocs", false); + +// Misc privacy: Disk +pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); -pref("browser.history_expire_days.mirror", 0); -pref("browser.microsummary.updateGenerators", false); -pref("browser.migration.version", 5); -pref("browser.places.importBookmarksHTML", false); -pref("browser.places.importDefaults", false); -pref("browser.places.leftPaneFolderId", -1); -pref("browser.places.migratePostDataAnnotations", false); -pref("browser.places.smartBookmarksVersion", 2); -pref("browser.places.updateRecentTagsUri", false); -pref("browser.preferences.advanced.selectedTabIndex", 0); -pref("browser.privatebrowsing.autostart", false); -pref("browser.rights.3.shown", true); +pref("signon.autofillForms", false); +pref("browser.sessionstore.privacy_level", 2); + +// Misc privacy: Remote +pref("browser.send_pings", false); +pref("geo.enabled", false); +pref("geo.wifi.uri", ""); +pref("browser.search.suggest.enabled", false); pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); -pref("browser.search.suggest.enabled", false); -pref("browser.search.update", false); -pref("browser.sessionstore.privacy_level", 2); -pref("browser.shell.checkDefaultBrowser", false); -pref("browser.startup.homepage_override.buildID", "20110325121920"); -pref("browser.startup.homepage_override.mstone", "rv:2.0"); -pref("browser.urlbar.autocomplete.enabled", true); -pref("dom.event.contextmenu.enabled", false); -pref("extensions.autoDisableScopes", 0); -pref("extensions.bootstrappedAddons", "{}"); -pref("extensions.checkCompatibility.4.*", false); -pref("extensions.checkUpdateSecurity", true); -pref("extensions.databaseSchema", 3); -pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); -pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); -pref("extensions.enabledScopes", 1); -pref("extensions.pendingOperations", false); -pref("extensions.update.enabled", true); + +// Fingerprinting +pref("webgl.min_capability_mode", true); +pref("webgl.disable-extensions", true); +pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations +pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations +pref("browser.display.max_font_attempts",10); +pref("browser.display.max_font_count",5); pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.buildID.override", "0"); @@ -58,19 +53,27 @@ pref("general.productSub.override", "20100101"); pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); pref("general.useragent.vendor", ""); pref("general.useragent.vendorSub", ""); -pref("geo.enabled", false); -pref("geo.wifi.uri", ""); -pref("intl.accept_languages", "en-us, en"); -pref("intl.charsetmenu.browser.cache", "UTF-8"); +pref("dom.enable_performance", false); +pref("plugin.expose_full_path", false); +pref("browser.startup.homepage_override.buildID", "20110325121920"); +pref("browser.startup.homepage_override.mstone", "rv:2.0"); +pref("browser.zoom.siteSpecific", false); +// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton +// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton +// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton + +// Third party stuff pref("network.cookie.cookieBehavior", 1); -pref("network.cookie.lifetimePolicy", 2); -pref("network.cookie.prefsMigrated", true); -pref("network.http.pipelining", true); -pref("network.http.pipelining.aggressive", true); -pref("network.http.pipelining.maxrequests", 12); -pref("network.http.pipelining.ssl", true); -pref("network.http.proxy.pipelining", true); -pref("network.hosts.pop_server", ""); +pref("security.enable_tls_session_tickets", false); +pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) + +// Proxy and proxy security +pref("network.proxy.socks", "127.0.0.1"); +pref("network.proxy.socks_port", 9050); +pref("network.proxy.socks_remote_dns", true); +pref("network.proxy.type", 1); +pref("network.security.ports.banned", "8118,8123,9050,9051"); +pref("network.dns.disablePrefetch", true); pref("network.protocol-handler.external-default", false); pref("network.protocol-handler.external.mailto", false); pref("network.protocol-handler.external.news", false); @@ -80,47 +83,42 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); -pref("network.proxy.socks", "127.0.0.1"); -pref("network.proxy.socks_port", 9050); -pref("network.proxy.socks_remote_dns", true); -pref("network.proxy.type", 1); -pref("network.security.ports.banned", "8118,8123,9050,9051"); -pref("webgl.min_capability_mode", true); -pref("webgl.disable-extensions", true); -pref("places.history.enabled", false); -pref("places.history.expiration.transient_current_max_pages", 120795); + +// Network and performance +pref("network.http.pipelining", true); +pref("network.http.pipelining.aggressive", true); +pref("network.http.pipelining.maxrequests", 12); +pref("network.http.pipelining.ssl", true); +pref("network.http.proxy.pipelining", true); +pref("security.ssl.enable_false_start", true); +pref("network.http.keep-alive.timeout", 20); +pref("network.http.connection-retry-timeout", 0); + +// Plugin blocking (overkill?) pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); -pref("plugin.expose_full_path", true); pref("plugin.scan.4xPluginFolder", false); pref("plugin.scan.Acrobat", "99.0"); pref("plugin.scan.Quicktime", "99.0"); pref("plugin.scan.SunJRE", "99.0"); pref("plugin.scan.WindowsMediaPlayer", "99.0"); pref("plugin.scan.plid.all", false); -pref("privacy.sanitize.migrateFx3Prefs", true); -pref("security.enable_java", false); -pref("signon.rememberSignons", false); -pref("signon.autofillForms", false); + +// Extension support +pref("extensions.autoDisableScopes", 0); +pref("extensions.bootstrappedAddons", "{}"); +pref("extensions.checkCompatibility.4.*", false); +pref("extensions.databaseSchema", 3); +// XXX: Enable new Torbutton/disable old?? +pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); +pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); +pref("extensions.enabledScopes", 1); +pref("extensions.pendingOperations", false); pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); -pref("security.ssl.enable_false_start", true); -pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations -pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations -pref("browser.display.max_font_attempts",10); -pref("browser.display.max_font_count",5); -pref("browser.sessionstore.resume_from_crash",false); + +// Omnibox settings pref("browser.search.order.1", "Startpage"); pref("browser.search.order.2", "DuckDuckGo"); pref("browser.search.order.3", "Google"); -pref("browser.search.selectedEngine", "Startpage"); // bam +pref("browser.search.selectedEngine", "Startpage"); pref("keyword.URL", "https://startpage.com/do/search?q="); -pref("dom.indexedDB.enabled", false); -pref("security.enable_tls_session_tickets", false); -pref("network.http.keep-alive.timeout", 20); -pref("permissions.memory_only", true); -pref("browser.zoom.siteSpecific", false); -pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) -pref("network.dns.disablePrefetch", true); -pref("dom.enable_performance", false); -pref("plugin.expose_full_path", false); -pref("network.http.connection-retry-timeout", 0); [View Less]

1 0

[torbrowser/master] Fix an exception on New Identity w/ NULL image firstPartyURI.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit bd9d79e513c3cbfc7915442599c2224dff147371 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 16:01:57 2013 -0800 Fix an exception on New Identity w/ NULL image firstPartyURI. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 59 +++++++++++-------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-… [View More]per-url-bar-domain.patch index 862673b..3fb55cf 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From e2d2cca918467240f4265799ead98defb1139db0 Mon Sep 17 00:00:00 2001 +From 3454d300fca2eea0e652f8982ec996575886dd1a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/26] Isolate the Image Cache per url bar domain. @@ -10,7 +10,7 @@ not obey cacheKeys by default. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 27 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 257 +++++++++++++------- + image/src/imgLoader.cpp | 262 +++++++++++++------- image/src/imgLoader.h | 20 +- image/src/imgRequest.cpp | 11 +- image/src/imgRequest.h | 3 + @@ -18,7 +18,7 @@ not obey cacheKeys by default. netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- widget/cocoa/nsMenuItemIconX.mm | 9 +- - 12 files changed, 247 insertions(+), 118 deletions(-) + 12 files changed, 250 insertions(+), 120 deletions(-) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 8d58d8b..6a9c87c 100644 @@ -149,7 +149,7 @@ index da26463..ecff309 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index ea51e8d..4d5cfd2 100644 +index ea51e8d..8f2e0c1 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -39,6 +39,7 @@ @@ -232,11 +232,11 @@ index ea51e8d..4d5cfd2 100644 + // content. + nsTArray<nsRefPtr<imgCacheEntry> > entries; + cache.Enumerate(EnumAllEntries, &entries); - -- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); ++ + for (uint32_t i = 0; i < entries.Length(); ++i) { + bool isEqual = false; -+ + +- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); + nsRefPtr<imgRequest> request = getter_AddRefs(entries[i]->GetRequest()); if (request) { - *_retval = request->Properties(); @@ -437,14 +437,14 @@ index ea51e8d..4d5cfd2 100644 + + return rv; +} - -- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); ++ +bool imgLoader::RemoveKeyFromCache(imgCacheTable &cache, + imgCacheQueue &queue, + nsCAutoString key) +{ + if (key.IsEmpty()) return false; -+ + +- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); + LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveKeyFromCache", "uri", key.get()); nsRefPtr<imgCacheEntry> entry; @@ -468,14 +468,14 @@ index ea51e8d..4d5cfd2 100644 + nsCOMPtr<nsIURI> imgURI = request->mURI; + nsCOMPtr<nsIURI> firstPartyURI = request->mFirstPartyURI; + -+ if (imgURI && firstPartyURI) { ++ if (imgURI) { + imgCacheTable &cache = GetCache(imgURI); + imgCacheQueue &queue = GetCacheQueue(imgURI); + nsCAutoString spec = GetCacheKey(firstPartyURI, imgURI); LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "entry's uri", spec.get()); -@@ -1438,18 +1485,6 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) +@@ -1438,32 +1485,21 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) return false; } @@ -493,8 +493,9 @@ index ea51e8d..4d5cfd2 100644 - nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) { ++ nsresult rv = NS_OK; LOG_STATIC_FUNC(gImgLog, "imgLoader::EvictEntries table"); -@@ -1457,7 +1492,7 @@ nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) + // We have to make a temporary, since RemoveFromCache removes the element // from the queue, invalidating iterators. nsTArray<nsRefPtr<imgCacheEntry> > entries; @@ -503,7 +504,15 @@ index ea51e8d..4d5cfd2 100644 for (uint32_t i = 0; i < entries.Length(); ++i) if (!RemoveFromCache(entries[i])) -@@ -1490,11 +1525,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +- return NS_ERROR_FAILURE; ++ rv = NS_ERROR_FAILURE; + +- return NS_OK; ++ return rv; + } + + nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +@@ -1490,11 +1526,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) nsIRequest::VALIDATE_NEVER | \ nsIRequest::VALIDATE_ONCE_PER_SESSION) @@ -517,7 +526,7 @@ index ea51e8d..4d5cfd2 100644 nsIURI *aReferrerURI, nsIPrincipal* aLoadingPrincipal, nsILoadGroup *aLoadGroup, -@@ -1513,8 +1547,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1513,8 +1548,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, if (!aURI) return NS_ERROR_NULL_POINTER; @@ -528,7 +537,7 @@ index ea51e8d..4d5cfd2 100644 LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get()); *_retval = nullptr; -@@ -1566,7 +1600,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1566,7 +1601,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgCacheTable &cache = GetCache(aURI); if (cache.Get(spec, getter_AddRefs(entry)) && entry) { @@ -537,7 +546,7 @@ index ea51e8d..4d5cfd2 100644 aLoadGroup, aObserver, aCX, requestFlags, true, aRequest, _retval, aPolicy, aLoadingPrincipal, corsmode)) { request = getter_AddRefs(entry->GetRequest()); -@@ -1605,7 +1639,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1605,7 +1640,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, rv = NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI, @@ -546,7 +555,7 @@ index ea51e8d..4d5cfd2 100644 aReferrerURI, aLoadGroup, mAcceptHeader, -@@ -1627,8 +1661,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1627,8 +1662,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, do_CreateInstance(NS_LOADGROUP_CONTRACTID); newChannel->SetLoadGroup(loadGroup); @@ -557,7 +566,7 @@ index ea51e8d..4d5cfd2 100644 // Pass the inner window ID of the loading document, if possible. nsCOMPtr<nsIDocument> doc = do_QueryInterface(aCX); -@@ -1676,7 +1710,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1676,7 +1711,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, } // Try to add the new request into the cache. @@ -566,7 +575,7 @@ index ea51e8d..4d5cfd2 100644 } else { LOG_MSG_WITH_PARAM(gImgLog, "imgLoader::LoadImage |cache hit|", "request", request); -@@ -1736,6 +1770,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1736,6 +1771,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, return NS_OK; } @@ -616,7 +625,7 @@ index ea51e8d..4d5cfd2 100644 /* imgIRequest loadImageWithChannel(in nsIChannel channel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *aCX, nsIStreamListener **listener, imgIRequest **_retval) { -@@ -1746,22 +1823,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1746,22 +1824,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb nsCOMPtr<nsIURI> uri; channel->GetURI(getter_AddRefs(uri)); @@ -649,7 +658,7 @@ index ea51e8d..4d5cfd2 100644 if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask -@@ -1833,7 +1915,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1833,7 +1916,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb channel->GetOriginalURI(getter_AddRefs(originalURI)); // No principal specified here, because we're not passed one. @@ -658,7 +667,7 @@ index ea51e8d..4d5cfd2 100644 aCX, nullptr, imgIRequest::CORS_NONE); ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request.get())); -@@ -1845,7 +1927,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1845,7 +1928,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb NS_RELEASE(pl); // Try to add the new request into the cache. @@ -667,7 +676,7 @@ index ea51e8d..4d5cfd2 100644 rv = CreateNewProxyForRequest(request, loadGroup, aObserver, requestFlags, nullptr, _retval); -@@ -2132,6 +2214,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2132,6 +2215,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport int32_t corsmode = mRequest->GetCORSMode(); nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal(); @@ -675,7 +684,7 @@ index ea51e8d..4d5cfd2 100644 // Doom the old request's cache entry mRequest->RemoveFromCache(); -@@ -2142,16 +2225,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2142,16 +2226,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport // We use originalURI here to fulfil the imgIRequest contract on GetURI. nsCOMPtr<nsIURI> originalURI; channel->GetOriginalURI(getter_AddRefs(originalURI)); [View Less]

1 0