- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Set security.tls.version.max=1 in meek-http-helper.
by gk＠torproject.org 21 Aug '14

21 Aug '14

commit 3c581f8426f4fd477eb26d2893dbdec42d76e23d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Aug 15 18:02:53 2014 -0700 Set security.tls.version.max=1 in meek-http-helper. #11253 set security.tls.version.max=3 (i.e., TLSv1.2). We need to set it back to 1 (TLSv1.0) in the helper, or else we look unlike an ordinary installation of Firefox 24. https://trac.torproject.org/projects/tor/ticket/12766 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..26fd819 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,6 +4,14 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); +// Make TLSv1.0 the maximum TLS version, as in stock Firefox 24. Since #11253, +// Tor Browser overrides the maximum to TLSv1.2, which would cause us to look +// unlike ordinary Firefox 24. +// https://trac.torproject.org/projects/tor/ticket/11253 +// https://trac.torproject.org/projects/tor/ticket/12766 +// http://kb.mozillazine.org/Security.tls.version.* +user_pref("security.tls.version.max", 1); + // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9

1 0

[tor-launcher/master] Bug 12444: Feedback when “Copy Tor Log” is clicked.
by brade＠torproject.org 20 Aug '14

20 Aug '14

commit 561440e8d64ca9b60f09d2b6869c4d07c5d06834 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 20 08:21:45 2014 -0400 Bug 12444: Feedback when “Copy Tor Log” is clicked. Show a transient popup near the "Copy Tor Log To Clipboard" button after is is clicked. The popup panel fades away after 4 seconds and can also be dismissed by clicking anywhere. --- src/chrome/content/network-settings-overlay.xul | 4 ++++ src/chrome/content/network-settings-wizard.xul | 1 + src/chrome/content/network-settings.js | 23 ++++++++++++++++++++++- src/chrome/content/network-settings.xul | 1 + src/chrome/locale/en/torlauncher.properties | 2 ++ src/chrome/skin/network-settings.css | 5 +++++ src/components/tl-protocol.js | 8 ++++++-- 7 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 6422802..c9a6a82 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -124,5 +124,9 @@ </html:li> </html:ol> </vbox> + <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" + onclick="closeCopyLogFeedbackPanel()"> + <description flex="1" /> + </panel> </overlay> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 70d1bcf..6682fdd 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -189,4 +189,5 @@ <hbox pack="start"> <label id="forAssistance" /> </hbox> + <panel id="copyLogFeedbackPanel" /> </wizard> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 5f3f698..518d16d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -713,9 +713,30 @@ function onCancel() function onCopyLog() { + // Copy tor log messages to the system clipboard. var chSvc = Cc["@mozilla.org/widget/clipboardhelper;1"] .getService(Ci.nsIClipboardHelper); - chSvc.copyString(gProtocolSvc.TorGetLog()); + let countObj = { value: 0 }; + chSvc.copyString(gProtocolSvc.TorGetLog(countObj)); + + // Display a feedback popup that fades away after a few seconds. + let forAssistance = document.getElementById("forAssistance"); + let panel = document.getElementById("copyLogFeedbackPanel"); + if (forAssistance && panel) + { + panel.firstChild.textContent = TorLauncherUtil.getFormattedLocalizedString( + "copiedNLogMessages", [countObj.value], 1); + let rectObj = forAssistance.getBoundingClientRect(); + panel.openPopup(null, null, rectObj.left, rectObj.top, false, false); + } +} + + +function closeCopyLogFeedbackPanel() +{ + let panel = document.getElementById("copyLogFeedbackPanel"); + if (panel && (panel.state =="open")) + panel.hidePopup(); } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index a81a5f0..4f98559 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -85,4 +85,5 @@ </deck> <spring flex="1" /> <label id="forAssistance" /> + <panel id="copyLogFeedbackPanel" /> </dialog> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 816d831..20f6db2 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -37,6 +37,8 @@ torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message. + torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Retrieving network status diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 03f84d7..60f1ef2 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -148,6 +148,11 @@ dialog .help { margin-bottom: 8px; } +#copyLogFeedbackPanel { + margin: -15px 0px 0px 0px; + max-width: 34em; +} + /* Increase font size on Windows for readability */ .os-windows div, .os-windows label, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 9c4d957..09ec468 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -458,7 +458,8 @@ TorProtocolService.prototype = }, // Returns captured log message as a text string (one message per line). - TorGetLog: function() + // If aCountObj is passed, aCountObj.value is set to the message count. + TorGetLog: function(aCountObj) { let s = ""; if (this.mTorLog) @@ -468,7 +469,10 @@ TorProtocolService.prototype = let dateFormat = dateFmtSvc.dateFormatShort; let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; - for (let i = 0; i < this.mTorLog.length; ++i) + let count = this.mTorLog.length; + if (aCountObj) + aCountObj.value = count; + for (let i = 0; i < count; ++i) { let logObj = this.mTorLog[i]; let secs = logObj.date.getSeconds();

1 0

[tor-browser-bundle/master] We want to have nightlies with the new OpenSSL.
by gk＠torproject.org 20 Aug '14

20 Aug '14

commit 81d698cab574c6fa2788362222b695b79752bf94 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 20 11:27:35 2014 +0000 We want to have nightlies with the new OpenSSL. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0462eae..c65cf22 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -27,7 +27,7 @@ MEEK_TAG=master GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.24

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 6048d4da85bd89f810f102517102ca27821bab21 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:34:23 2014 -0700 fixup! Add canvas image extraction prompt. Use JSContext to get URL information for HTML5 canvas access. --- content/canvas/src/CanvasRenderingContext2D.cpp | 2 +- content/canvas/src/CanvasUtils.cpp | 18 +++++++++++++----- content/canvas/src/CanvasUtils.h | 2 +- content/html/content/src/HTMLCanvasElement.cpp | 9 +++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 9be4ced..c53ac07 100644 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3506,7 +3506,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx, if (mCanvasElement) { nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); usePlaceholder = !ownerDoc || - !CanvasUtils::IsImageExtractionAllowed(ownerDoc); + !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx); } if (usePlaceholder) { diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index f2f4536..591650a 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -35,6 +35,7 @@ using namespace mozilla::gfx; #include "nsUnicharUtils.h" #include "nsPrintfCString.h" #include "nsIConsoleService.h" +#include "jsdbgapi.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -43,10 +44,9 @@ namespace mozilla { namespace CanvasUtils { // Check site-specific permission and display prompt if appropriate. -bool -IsImageExtractionAllowed(nsIDocument *aDocument) +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) { - if (!aDocument) + if (!aDocument || !aCx) return false; nsPIDOMWindow *win = aDocument->GetWindow(); @@ -87,13 +87,21 @@ IsImageExtractionAllowed(nsIDocument *aDocument) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); + nsCString scriptFile("unknown"); + unsigned scriptLine = 0; + JSScript *script; + if (JS_DescribeScriptedCaller(aCx, &script, &scriptLine)) { + scriptFile = JS_GetScriptFilename(aCx, script); + } + nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from %s ", // L10n - firstPartySpec.get(), docSpec.get()); + " from document %s, script from %s:%u ", // L10n + firstPartySpec.get(), docSpec.get(), + scriptFile.get(), scriptLine); nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h index d7aae4d..1e7f726 100644 --- a/content/canvas/src/CanvasUtils.h +++ b/content/canvas/src/CanvasUtils.h @@ -45,7 +45,7 @@ void DoDrawImageSecurityCheck(dom::HTMLCanvasElement *aCanvasElement, bool forceWriteOnly, bool CORSUsed); -bool IsImageExtractionAllowed(nsIDocument *aDocument); +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx); // Make a double out of |v|, treating undefined values as 0.0 (for // the sake of sparse arrays). Return true iff coercion diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index e229e1c..d6cb88a 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -355,7 +355,7 @@ HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams, // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ToDataURLImpl(aCx, aType, aParams, usePlaceholder, aDataURL); } @@ -590,10 +590,11 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, } bool fallbackToPNG = false; + JSContext* cx = nsContentUtils::GetCurrentJSContext(); // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), cx); nsCOMPtr<nsIInputStream> stream; rv = ExtractData(type, EmptyString(), usePlaceholder, getter_AddRefs(stream), fallbackToPNG); @@ -616,7 +617,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, nsRefPtr<nsDOMMemoryFile> blob = new nsDOMMemoryFile(imgData, imgSize, type); - JSContext* cx = nsContentUtils::GetCurrentJSContext(); if (cx) { JS_updateMallocCounter(cx, imgSize); } @@ -648,7 +648,8 @@ HTMLCanvasElement::MozGetAsFile(const nsAString& aName, // Check site-speciifc permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); return MozGetAsFileImpl(aName, aType, usePlaceholder, aResult); }

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 5c54c75b5ea3ab1373a530d05f8fc40211d9065e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:04:57 2014 +0000 fixup! Add canvas image extraction prompt. Bug #12684: Make "Not now" default for HTML5 canvas permission dialogue. This alters the `PopupNotification`s [0] which notify users that a website has attempted to access an HTML5 canvas. The new default ordering for buttons is: Not Now Never for this site (recommended) Allow in the future * FIXES #12684 [1] by making "Not Now" the default in the HTML5 canvas fingerprinting permissions dialogue. * ADDS palette icons for HTML5 canvas permissions PopupNotification UI. The image is freely licensed and obtainable from: https://openclipart.org/image/300px/svg_to_png/21620/ben_palette.png * ADDS a CSS whitespace hack from Pearl Crescent to the `CanvasPermissionPromptHelper_init()` function in `browser/base/content/browser.js` for causing the newlines in the `canvas.siteprompt` string (in torbutton.git, in `chrome/locale/en/torbutton.properties`) to render correctly in PopupNotification XUL <description> elements. [2] NOTE: Applying this patch requires an additional patch to TorButton, to store the additional UI strings before localisation. [3] [0]: https://mxr.mozilla.org/mozilla-esr24/source/toolkit/modules/PopupNotificat… [1]: https://bugs.torproject.org/12684 [2]: https://trac.torproject.org/projects/tor/ticket/12684#comment:21 [3]: https://github.com/isislovecruft/torbutton/commit/368e74d62df349b27cf578525… --- browser/base/content/browser.js | 19 ++++++++++++++++--- browser/themes/linux/browser.css | 10 ++++++++-- browser/themes/linux/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/linux/jar.mn | 1 + browser/themes/osx/browser.css | 10 ++++++++-- browser/themes/osx/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/osx/jar.mn | 1 + browser/themes/windows/browser.css | 10 ++++++++-- browser/themes/windows/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/windows/jar.mn | 1 + 10 files changed, 100 insertions(+), 9 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 1df295a..b4da3f6 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6034,6 +6034,12 @@ var CanvasPermissionPromptHelper = { init: function CanvasPermissionPromptHelper_init() { + if (document.styleSheets && (document.styleSheets.length > 0)) try { + let ruleText = "panel[popupid=canvas-permissions-prompt] description { white-space: pre-wrap; }"; + let sheet = document.styleSheets[0]; + sheet.insertRule(ruleText, sheet.cssRules.length); + } catch (e) {}; + Services.obs.addObserver(this, this._permissionsPrompt, false); }, @@ -6077,10 +6083,10 @@ var CanvasPermissionPromptHelper = { var message = getLocalizedString("canvas.siteprompt", [ uri.asciiHost ]); var mainAction = { - label: getLocalizedString("canvas.allow"), - accessKey: getLocalizedString("canvas.allowAccessKey"), + label: getLocalizedString("canvas.notNow"), + accessKey: getLocalizedString("canvas.notNowAccessKey"), callback: function() { - setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + return null; } }; @@ -6091,6 +6097,13 @@ var CanvasPermissionPromptHelper = { callback: function() { setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION); } + }, + { + label: getLocalizedString("canvas.allow"), + accessKey: getLocalizedString("canvas.allowAccessKey"), + callback: function() { + setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + } } ]; diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 9395669..a47ea4e 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1207,7 +1207,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url("moz-icon://stock/gtk-cancel?size=menu"); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -1291,7 +1294,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/linux/canvas-popup.svg b/browser/themes/linux/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/linux/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index b4eaf14..4d1892d 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -231,6 +231,7 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress.css #endif + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 4166ed0..085a1da 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3103,7 +3103,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-margin-start: 0; /* override default label margin to match description margin */ } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); @@ -3375,7 +3378,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-image-region: rect(0px, 48px, 16px, 32px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], diff --git a/browser/themes/osx/canvas-popup.svg b/browser/themes/osx/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/osx/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 8295008..de119b1 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -329,6 +329,7 @@ browser.jar: skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon(a)2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion(a)2x.png) skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png) skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png) + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-16(a)2x.png skin/classic/browser/webapps-64.png diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index edb064c..7012c41 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2449,7 +2449,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { -moz-image-region: rect(32px, 32px, 48px, 16px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -2531,7 +2534,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/windows/canvas-popup.svg b/browser/themes/windows/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/windows/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index eff2220..b9cf33a 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -69,6 +69,7 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit e3d04fb74ac49a2e3f4d074d0e3ea6edec77b8c3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Aug 17 01:31:03 2014 +0000 fixup! Add canvas image extraction prompt. Modify Pearl Crescent's #7265 patch to log all HTML5 canvas access attempts. --- content/canvas/src/CanvasUtils.cpp | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index 203dd92..f2f4536 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -33,6 +33,8 @@ using namespace mozilla::gfx; #include "mozIThirdPartyUtil.h" #include "nsContentUtils.h" #include "nsUnicharUtils.h" +#include "nsPrintfCString.h" +#include "nsIConsoleService.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -79,14 +81,40 @@ IsImageExtractionAllowed(nsIDocument *aDocument) isAllowed = (permission == nsIPermissionManager::ALLOW_ACTION); if (!isAllowed && (permission != nsIPermissionManager::DENY_ACTION)) { - // Send notification so that a prompt is displayed. - nsCString spec; - rv = uri->GetSpec(spec); + // Log all attempted canvas access and block access by third parties. + bool isThirdParty = true; + nsIURI *docURI = aDocument->GetDocumentURI(); + rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); + NS_ENSURE_SUCCESS(rv, false); + + nsCString firstPartySpec; + rv = uri->GetSpec(firstPartySpec); + nsCString docSpec; + docURI->GetSpec(docSpec); + nsPrintfCString msg("On %s: blocked access to canvas image data" + " from %s ", // L10n + firstPartySpec.get(), docSpec.get()); + + nsCOMPtr<nsIConsoleService> console + (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); + if (console) + console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); + + // Log every canvas access attempt to stdout if debugging: +#ifdef DEBUG + printf("%s\n", msg.get()); +#endif + // Ensure URI is valid after logging, but before trying to notify the + // user: NS_ENSURE_SUCCESS(rv, false); - nsCOMPtr<nsIObserverService> obs = - mozilla::services::GetObserverService(); - obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, - NS_ConvertUTF8toUTF16(spec).get()); + + if (!isThirdParty) { + // Send notification so that a prompt is displayed. + nsCOMPtr<nsIObserverService> obs = + mozilla::services::GetObserverService(); + obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, + NS_ConvertUTF8toUTF16(firstPartySpec).get()); + } } } }

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 8751adf3f98016212a3aac2d5a12e59b2e425d5a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 16 19:25:57 2014 -0700 fixup! API allows you to get the url bar URI for a channel or nsIDocument. Log the URI of the source doc/channel that failed. --- content/base/src/ThirdPartyUtil.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 55eb316..569201e 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -427,6 +427,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsIURI **aOutput) { nsresult rv = NS_ERROR_NULL_POINTER; + nsCOMPtr<nsIURI> srcURI; if (!aOutput) return rv; @@ -441,6 +442,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // for sure if (aChannel) { rv = GetOriginatingURI(aChannel, aOutput); + aChannel->GetURI(getter_AddRefs(srcURI)); if (NS_SUCCEEDED(rv) && *aOutput) { // At this point, about: and chrome: URLs have been mapped to file: or // jar: URLs. Try to recover the original URL. @@ -467,6 +469,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsCOMPtr<nsIDOMWindow> top; nsCOMPtr<nsIDOMDocument> topDDoc; nsIURI *docURI = nullptr; + srcURI = aDoc->GetDocumentURI(); if (aDoc->GetWindow()) { aDoc->GetWindow()->GetTop(getter_AddRefs(top)); @@ -505,14 +508,19 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console) { nsCString spec; + nsCString srcSpec("unknown"); + + if (srcURI) + srcURI->GetSpec(srcSpec); + if (*aOutput) (*aOutput)->GetSpec(spec); if (spec.Length() > 0) { - nsPrintfCString msg("getFirstPartyURI: no host in first party URI %s", - spec.get()); // TODO: L10N + nsPrintfCString msg("getFirstPartyURI failed for %s: no host in first party URI %s", + srcSpec.get(), spec.get()); // TODO: L10N console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } else { - nsPrintfCString msg("getFirstPartyURI failed: 0x%x", rv); + nsPrintfCString msg("getFirstPartyURI failed for %s: 0x%x", srcSpec.get(), rv); console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } }

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Remove the Components shim introduced by Mozilla Bug #790732.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 1cd9a584a5a77089b3d03324e87451e28c09a58e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 12 15:14:39 2014 -0700 fixup! Remove the Components shim introduced by Mozilla Bug #790732. Includes a regression test to ensure the window.Components object is not exposed to untrusted content. --- dom/base/nsDOMClassInfo.cpp | 98 -------------------- js/xpconnect/tests/mochitest/Makefile.in | 3 +- js/xpconnect/tests/mochitest/file_bug790732.html | 56 ----------- js/xpconnect/tests/mochitest/test_bug790732.html | 46 --------- js/xpconnect/tests/mochitest/test_tor_bug2874.html | 25 +++++ toolkit/components/telemetry/Histograms.json | 4 - 6 files changed, 26 insertions(+), 206 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e5fcebf..2a9d5a8 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -4282,98 +4282,6 @@ LocationSetterUnwrapper(JSContext *cx, JS::Handle<JSObject*> obj_, JS::Handle<js return LocationSetter<nsIDOMWindow>(cx, obj, id, strict, vp); } -struct InterfaceShimEntry { - const char *geckoName; - const char *domName; -}; - -// We add shims from Components.interfaces.nsIDOMFoo to window.Foo for each -// interface that has interface constants that sites might be getting off -// of Ci. -const InterfaceShimEntry kInterfaceShimMap[] = -{ { "nsIDOMFileReader", "FileReader" }, - { "nsIXMLHttpRequest", "XMLHttpRequest" }, - { "nsIDOMDOMException", "DOMException" }, - { "nsIDOMNode", "Node" }, - { "nsIDOMUserDataHandler", "UserDataHandler" }, - { "nsIDOMCSSPrimitiveValue", "CSSPrimitiveValue" }, - { "nsIDOMCSSRule", "CSSRule" }, - { "nsIDOMCSSValue", "CSSValue" }, - { "nsIDOMEvent", "Event" }, - { "nsIDOMNSEvent", "Event" }, - { "nsIDOMKeyEvent", "KeyEvent" }, - { "nsIDOMMouseEvent", "MouseEvent" }, - { "nsIDOMMouseScrollEvent", "MouseScrollEvent" }, - { "nsIDOMMutationEvent", "MutationEvent" }, - { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" }, - { "nsIDOMUIEvent", "UIEvent" }, - { "nsIDOMGeoPositionError", "GeoPositionError" }, - { "nsIDOMHTMLMediaElement", "HTMLMediaElement" }, - { "nsIDOMMediaError", "MediaError" }, - { "nsIDOMLoadStatus", "LoadStatus" }, - { "nsIDOMOfflineResourceList", "OfflineResourceList" }, - { "nsIDOMRange", "Range" }, - { "nsIDOMSVGFETurbulenceElement", "SVGFETurbulenceElement" }, - { "nsIDOMSVGFEMorphologyElement", "SVGFEMorphologyElement" }, - { "nsIDOMSVGFEConvolveMatrixElement", "SVGFEConvolveMatrixElement" }, - { "nsIDOMSVGFEDisplacementMapElement", "SVGFEDisplacementMapElement" }, - { "nsIDOMSVGLength", "SVGLength" }, - { "nsIDOMSVGUnitTypes", "SVGUnitTypes" }, - { "nsIDOMNodeFilter", "NodeFilter" }, - { "nsIDOMXPathNamespace", "XPathNamespace" }, - { "nsIDOMXPathResult", "XPathResult" }, - { "nsIDOMXULButtonElement", "XULButtonElement" }, - { "nsIDOMXULCheckboxElement", "XULCheckboxElement" }, - { "nsIDOMXULPopupElement", "XULPopupElement" } }; - -static nsresult -DefineComponentsShim(JSContext *cx, JS::HandleObject global) -{ - // Keep track of how often this happens. - Telemetry::Accumulate(Telemetry::COMPONENTS_SHIM_ACCESSED_BY_CONTENT, true); - - // Create a fake Components object. - JS::Rooted<JSObject*> components(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(components, NS_ERROR_OUT_OF_MEMORY); - bool ok = JS_DefineProperty(cx, global, "Components", JS::ObjectValue(*components), - JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Create a fake interfaces object. - JS::Rooted<JSObject*> interfaces(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(interfaces, NS_ERROR_OUT_OF_MEMORY); - ok = JS_DefineProperty(cx, components, "interfaces", JS::ObjectValue(*interfaces), - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Define a bunch of shims from the Ci.nsIDOMFoo to window.Foo for DOM - // interfaces with constants. - for (uint32_t i = 0; i < ArrayLength(kInterfaceShimMap); ++i) { - - // Grab the names from the table. - const char *geckoName = kInterfaceShimMap[i].geckoName; - const char *domName = kInterfaceShimMap[i].domName; - - // Look up the appopriate interface object on the global. - JS::Rooted<JS::Value> v(cx, JS::UndefinedValue()); - ok = JS_GetProperty(cx, global, domName, v.address()); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - if (!v.isObject()) { - NS_WARNING("Unable to find interface object on global"); - continue; - } - - // Define the shim on the interfaces object. - ok = JS_DefineProperty(cx, interfaces, geckoName, v, - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - } - - return NS_OK; -} - NS_IMETHODIMP nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *obj_, jsid id_, uint32_t flags, @@ -4386,12 +4294,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, return NS_OK; } - MOZ_ASSERT(*_retval == true); // guaranteed by XPC_WN_Helper_NewResolve - if (id == XPCJSRuntime::Get()->GetStringID(XPCJSRuntime::IDX_COMPONENTS)) { - *objp = obj; - return DefineComponentsShim(cx, obj); - } - nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); MOZ_ASSERT(win->IsInnerWindow()); diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index e3e1b63..666d1e2 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -80,8 +80,6 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ file_bug781476.html \ test_bug785096.html \ test_bug789713.html \ - test_bug790732.html \ - file_bug790732.html \ test_bug793969.html \ file_bug795275.html \ file_bug795275.xml \ @@ -101,6 +99,7 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ test_crosscompartment_weakmap.html \ test_asmjs.html \ file_asmjs.js \ + test_tor_bug2874.html \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/mochitest/file_bug790732.html b/js/xpconnect/tests/mochitest/file_bug790732.html deleted file mode 100644 index 5515dfc..0000000 --- a/js/xpconnect/tests/mochitest/file_bug790732.html +++ /dev/null @@ -1,56 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script> -function testShim() { - - // Basic stuff - ok(Components, "Components shim exists!"); - var Ci = Components.interfaces; - ok(Ci, "interfaces shim exists!"); - is(typeof Components.classes, 'undefined', "Shouldn't have a Cc"); - - // Check each interface that we shim. We start by checking specific - // constants for a couple of interfaces, and then once it's pretty clear that - // it's working as intended we just check that the objects themselves are the - // same. - is(Ci.nsIDOMFileReader.DONE, FileReader.DONE); - is(Ci.nsIXMLHttpRequest.HEADERS_RECEIVED, XMLHttpRequest.HEADERS_RECEIVED); - is(Ci.nsIDOMDOMException.DATA_CLONE_ERR, DOMException.DATA_CLONE_ERR); - is(Ci.nsIDOMNode.DOCUMENT_NODE, Node.DOCUMENT_NODE); - is(Ci.nsIDOMUserDataHandler.NODE_CLONED, UserDataHandler.NODE_CLONED); - is(Ci.nsIDOMCSSPrimitiveValue.CSS_PX, CSSPrimitiveValue.CSS_PX); - is(Ci.nsIDOMCSSRule.NAMESPACE_RULE, CSSRule.NAMESPACE_RULE); - is(Ci.nsIDOMCSSValue.CSS_PRIMITIVE_VALUE, CSSValue.CSS_PRIMITIVE_VALUE); - is(Ci.nsIDOMEvent.FOCUS, Event.FOCUS); - is(Ci.nsIDOMNSEvent.CLICK, Event.CLICK); - is(Ci.nsIDOMKeyEvent, KeyEvent); - is(Ci.nsIDOMMouseEvent, MouseEvent); - is(Ci.nsIDOMMouseScrollEvent, MouseScrollEvent); - is(Ci.nsIDOMMutationEvent, MutationEvent); - is(Ci.nsIDOMSimpleGestureEvent, SimpleGestureEvent); - is(Ci.nsIDOMUIEvent, UIEvent); - is(Ci.nsIDOMGeoPositionError, GeoPositionError); - is(Ci.nsIDOMHTMLMediaElement, HTMLMediaElement); - is(Ci.nsIDOMMediaError, MediaError); - is(Ci.nsIDOMLoadStatus, LoadStatus); - is(Ci.nsIDOMOfflineResourceList, OfflineResourceList); - is(Ci.nsIDOMRange, Range); - is(Ci.nsIDOMSVGFETurbulenceElement, SVGFETurbulenceElement); - is(Ci.nsIDOMSVGFEMorphologyElement, SVGFEMorphologyElement); - is(Ci.nsIDOMSVGFEConvolveMatrixElement, SVGFEConvolveMatrixElement); - is(Ci.nsIDOMSVGFEDisplacementMapElement, SVGFEDisplacementMapElement); - is(Ci.nsIDOMSVGLength, SVGLength); - is(Ci.nsIDOMSVGUnitTypes, SVGUnitTypes); - is(Ci.nsIDOMNodeFilter, NodeFilter); - is(Ci.nsIDOMXPathNamespace, XPathNamespace); - is(Ci.nsIDOMXPathResult, XPathResult); - is(Ci.nsIDOMXULButtonElement, XULButtonElement); - is(Ci.nsIDOMXULCheckboxElement, XULCheckboxElement); - is(Ci.nsIDOMXULPopupElement, XULPopupElement); -} -</script> -</head> -<body> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_bug790732.html b/js/xpconnect/tests/mochitest/test_bug790732.html deleted file mode 100644 index 771950e..0000000 --- a/js/xpconnect/tests/mochitest/test_bug790732.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE HTML> -<html> - -<head> - <meta charset="utf-8"> - <title>Test for Bug 790732</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> - - /** Test for the Components shim. We split into two files because this stuff - is currently pref-controlled. **/ - SimpleTest.waitForExplicitFinish(); - - function prepare() { - SpecialPowers.pushPrefEnv({set: [['dom.omit_components_in_content', true]]}, - function () { $('ifr').onload = go; - $('ifr').contentWindow.location = - '/tests/js/xpconnect/tests/mochitest/file_bug790732.html'; } - ); - } - - function go() { - ok(true, "Started test"); - var iwin = $('ifr').contentWindow; - iwin.ok = ok; - iwin.is = is; - iwin.testShim(); - SimpleTest.finish(); - } - - </script> -</head> -<body onload="prepare()"> -<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=790732">Mozilla Bug 790732</a> -<p id="display"></p> -<div id="content" style="display: none"> - -</div> -<pre id="test"> -</pre> -<iframe id="ifr"></iframe> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_tor_bug2874.html b/js/xpconnect/tests/mochitest/test_tor_bug2874.html new file mode 100644 index 0000000..c0a956e --- /dev/null +++ b/js/xpconnect/tests/mochitest/test_tor_bug2874.html @@ -0,0 +1,25 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Tor Bug 2874</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + is(typeof Components, 'undefined', "The global window object should not expose a Components property to untrusted content."); + </script> +</head> +<body> +<a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2874">Tor Bug 2874</a> +<p id="display"></p> +<div id="content" style="display: none"> + +</div> +<pre id="test"> +</pre> +</body> +</html> diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 9698fac..5594e01 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -2955,10 +2955,6 @@ "kind": "flag", "description": "Whether content ever accesed Components.interfaces in this session" }, - "COMPONENTS_SHIM_ACCESSED_BY_CONTENT": { - "kind": "flag", - "description": "Whether content ever accesed the Components shim in this session" - }, "CHECK_ADDONS_MODIFIED_MS": { "kind": "exponential", "high": "5000",

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 00ad0bffa709d34e393a3b271d768d4e8a466864 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:04:57 2014 +0000 fixup! Bug #6253: Add canvas image extraction prompt. Bug #12684: Make "Not now" default for HTML5 canvas permission dialogue. This alters the `PopupNotification`s [0] which notify users that a website has attempted to access an HTML5 canvas. The new default ordering for buttons is: Not Now Never for this site (recommended) Allow in the future * FIXES #12684 [1] by making "Not Now" the default in the HTML5 canvas fingerprinting permissions dialogue. * ADDS palette icons for HTML5 canvas permissions PopupNotification UI. The image is freely licensed and obtainable from: https://openclipart.org/image/300px/svg_to_png/21620/ben_palette.png * ADDS a CSS whitespace hack from Pearl Crescent to the `CanvasPermissionPromptHelper_init()` function in `browser/base/content/browser.js` for causing the newlines in the `canvas.siteprompt` string (in torbutton.git, in `chrome/locale/en/torbutton.properties`) to render correctly in PopupNotification XUL <description> elements. [2] NOTE: Applying this patch requires an additional patch to TorButton, to store the additional UI strings before localisation. [3] [0]: https://mxr.mozilla.org/mozilla-esr24/source/toolkit/modules/PopupNotificat… [1]: https://bugs.torproject.org/12684 [2]: https://trac.torproject.org/projects/tor/ticket/12684#comment:21 [3]: https://github.com/isislovecruft/torbutton/commit/368e74d62df349b27cf578525… --- browser/base/content/browser.js | 19 ++++++++++++++++--- browser/themes/linux/browser.css | 10 ++++++++-- browser/themes/linux/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/linux/jar.mn | 1 + browser/themes/osx/browser.css | 10 ++++++++-- browser/themes/osx/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/osx/jar.mn | 1 + browser/themes/windows/browser.css | 10 ++++++++-- browser/themes/windows/canvas-popup.svg | 19 +++++++++++++++++++ browser/themes/windows/jar.mn | 1 + 10 files changed, 100 insertions(+), 9 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 1df295a..b4da3f6 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6034,6 +6034,12 @@ var CanvasPermissionPromptHelper = { init: function CanvasPermissionPromptHelper_init() { + if (document.styleSheets && (document.styleSheets.length > 0)) try { + let ruleText = "panel[popupid=canvas-permissions-prompt] description { white-space: pre-wrap; }"; + let sheet = document.styleSheets[0]; + sheet.insertRule(ruleText, sheet.cssRules.length); + } catch (e) {}; + Services.obs.addObserver(this, this._permissionsPrompt, false); }, @@ -6077,10 +6083,10 @@ var CanvasPermissionPromptHelper = { var message = getLocalizedString("canvas.siteprompt", [ uri.asciiHost ]); var mainAction = { - label: getLocalizedString("canvas.allow"), - accessKey: getLocalizedString("canvas.allowAccessKey"), + label: getLocalizedString("canvas.notNow"), + accessKey: getLocalizedString("canvas.notNowAccessKey"), callback: function() { - setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + return null; } }; @@ -6091,6 +6097,13 @@ var CanvasPermissionPromptHelper = { callback: function() { setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION); } + }, + { + label: getLocalizedString("canvas.allow"), + accessKey: getLocalizedString("canvas.allowAccessKey"), + callback: function() { + setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION); + } } ]; diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 9395669..a47ea4e 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -1207,7 +1207,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url("moz-icon://stock/gtk-cancel?size=menu"); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -1291,7 +1294,10 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/linux/canvas-popup.svg b/browser/themes/linux/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/linux/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index b4eaf14..4d1892d 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -231,6 +231,7 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress.css #endif + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 4166ed0..085a1da 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -3103,7 +3103,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-margin-start: 0; /* override default label margin to match description margin */ } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); @@ -3375,7 +3378,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { -moz-image-region: rect(0px, 48px, 16px, 32px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], diff --git a/browser/themes/osx/canvas-popup.svg b/browser/themes/osx/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/osx/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 8295008..de119b1 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -329,6 +329,7 @@ browser.jar: skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon(a)2x.png (tabbrowser/alltabs-box-bkgnd-icon-lion(a)2x.png) skin/classic/browser/lion/tabview/tabview.png (tabview/tabview-lion.png) skin/classic/browser/lion/places/toolbar.png (places/toolbar-lion.png) + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-16(a)2x.png skin/classic/browser/webapps-64.png diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index edb064c..7012c41 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -2449,7 +2449,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { -moz-image-region: rect(32px, 32px, 48px, 16px); } -.popup-notification-icon[popupid="canvas-permissions-prompt"], +.popup-notification-icon[popupid="canvas-permissions-prompt"] { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], @@ -2531,7 +2534,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } -#canvas-notification-icon, +#canvas-notification-icon { + list-style-image: url(chrome://browser/skin/canvas-popup.svg); +} + .indexedDB-notification-icon, #indexedDB-notification-icon { list-style-image: url(chrome://global/skin/icons/question-16.png); diff --git a/browser/themes/windows/canvas-popup.svg b/browser/themes/windows/canvas-popup.svg new file mode 100644 index 0000000..f99eac3 --- /dev/null +++ b/browser/themes/windows/canvas-popup.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg"> + + <metadata>image/svg+xmlOpen Clip Art Librarypalette2009-02-17T21:15:25http://openclipart.org/detail/21620/palett… artclipartcolorcoloriconiconimagemediapaintpaintpalettepalettepngpublic domainsvg</metadata> + <g> + <title>Layer 1</title> + <g id="layer1"> + <rect fill="#000000" stroke-width="2" stroke-miterlimit="4" stroke-dashoffset="0" ry="23.587006" rx="26.785715" y="0" x="0" height="200" width="200" id="rect6786"/> + <g transform="matrix(4.65116, 0, 0, 4.65116, -1717.85, -314.201)" id="g6820"> + <path fill="#ffffff" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" d="m388.618042,70.128563c-4.746887,0 -18.367279,0.849472 -18.34375,12.3125c0.001312,0.644249 1.226776,2.886879 2.25,3.125c7.5755,1.762962 7.986664,7.834511 7.53125,12.625c-0.03479,0.362747 0.589233,2.891006 1.125,3.53125c4.344635,5.191872 5.822723,7.468742 11.6875,7.46875c11.729614,0 18.3125,-5.93206 18.3125,-17.8125c0,-11.880463 -10.832916,-21.25 -22.5625,-21.25zm-11.875,8.1875c0.986481,0.058029 2.139893,0.464394 3.21875,1.1875c2.157715,1.44622 3.225708,3.668251 2.375,4.9375c-0.850739,1.269257 -3.311005,1.10247 -5.46875,-0.34375c-2.157745,-1.446228 -3.194458,-3.637001 -2.34375,-4.90625c0.425354,-0.634628 1.232269,-0.933029 2.21875,-0.875z" id="path6822"/> + <path fill="#ff7a00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6824" d="m392.586761,76.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#95d300" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6826" d="m402.524292,81.553246a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#00a6e4" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6828" d="m408.461792,90.615746a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#f9de00" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6830" d="m403.643463,99.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + <path fill="#e600ad" stroke-width="1.924773" stroke-miterlimit="4" stroke-dasharray="3.84954572, 3.84954572" stroke-dashoffset="3.657068" id="path6832" d="m393.518463,100.60791a3.5,3.5 0 1 1 -7,0a3.5,3.5 0 1 1 7,0z"/> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index eff2220..b9cf33a 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -69,6 +69,7 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png + skin/classic/browser/canvas-popup.svg skin/classic/browser/webapps-16.png skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png)

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 1229eaa018c10b6503a2f47c986236eee21b6b98 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 16 19:25:57 2014 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. Log the URI of the source doc/channel that failed. --- content/base/src/ThirdPartyUtil.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 06b2a14..7d70b20 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -461,6 +461,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsIURI **aOutput) { nsresult rv = NS_ERROR_NULL_POINTER; + nsCOMPtr<nsIURI> srcURI; if (!aOutput) return rv; @@ -475,6 +476,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // for sure if (aChannel) { rv = GetOriginatingURI(aChannel, aOutput); + aChannel->GetURI(getter_AddRefs(srcURI)); if (NS_SUCCEEDED(rv) && *aOutput) { // At this point, about: and chrome: URLs have been mapped to file: or // jar: URLs. Try to recover the original URL. @@ -501,6 +503,7 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, nsCOMPtr<nsIDOMWindow> top; nsCOMPtr<nsIDOMDocument> topDDoc; nsIURI *docURI = nullptr; + srcURI = aDoc->GetDocumentURI(); if (aDoc->GetWindow()) { aDoc->GetWindow()->GetTop(getter_AddRefs(top)); @@ -539,14 +542,19 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console) { nsCString spec; + nsCString srcSpec("unknown"); + + if (srcURI) + srcURI->GetSpec(srcSpec); + if (*aOutput) (*aOutput)->GetSpec(spec); if (spec.Length() > 0) { - nsPrintfCString msg("getFirstPartyURI: no host in first party URI %s", - spec.get()); // TODO: L10N + nsPrintfCString msg("getFirstPartyURI failed for %s: no host in first party URI %s", + srcSpec.get(), spec.get()); // TODO: L10N console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } else { - nsPrintfCString msg("getFirstPartyURI failed: 0x%x", rv); + nsPrintfCString msg("getFirstPartyURI failed for %s: 0x%x", srcSpec.get(), rv); console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); } }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #2874. Remove the Components shim introduced by Mozilla Bug #790732.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b81169268271e65b897e4df2a1f58dd2718af1c7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 12 15:14:39 2014 -0700 fixup! Bug #2874. Remove the Components shim introduced by Mozilla Bug #790732. Includes a regression test to ensure the window.Components object is not exposed to untrusted content. --- dom/base/nsDOMClassInfo.cpp | 98 -------------------- js/xpconnect/tests/mochitest/Makefile.in | 3 +- js/xpconnect/tests/mochitest/file_bug790732.html | 56 ----------- js/xpconnect/tests/mochitest/test_bug790732.html | 46 --------- js/xpconnect/tests/mochitest/test_tor_bug2874.html | 25 +++++ toolkit/components/telemetry/Histograms.json | 4 - 6 files changed, 26 insertions(+), 206 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index e5fcebf..2a9d5a8 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -4282,98 +4282,6 @@ LocationSetterUnwrapper(JSContext *cx, JS::Handle<JSObject*> obj_, JS::Handle<js return LocationSetter<nsIDOMWindow>(cx, obj, id, strict, vp); } -struct InterfaceShimEntry { - const char *geckoName; - const char *domName; -}; - -// We add shims from Components.interfaces.nsIDOMFoo to window.Foo for each -// interface that has interface constants that sites might be getting off -// of Ci. -const InterfaceShimEntry kInterfaceShimMap[] = -{ { "nsIDOMFileReader", "FileReader" }, - { "nsIXMLHttpRequest", "XMLHttpRequest" }, - { "nsIDOMDOMException", "DOMException" }, - { "nsIDOMNode", "Node" }, - { "nsIDOMUserDataHandler", "UserDataHandler" }, - { "nsIDOMCSSPrimitiveValue", "CSSPrimitiveValue" }, - { "nsIDOMCSSRule", "CSSRule" }, - { "nsIDOMCSSValue", "CSSValue" }, - { "nsIDOMEvent", "Event" }, - { "nsIDOMNSEvent", "Event" }, - { "nsIDOMKeyEvent", "KeyEvent" }, - { "nsIDOMMouseEvent", "MouseEvent" }, - { "nsIDOMMouseScrollEvent", "MouseScrollEvent" }, - { "nsIDOMMutationEvent", "MutationEvent" }, - { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" }, - { "nsIDOMUIEvent", "UIEvent" }, - { "nsIDOMGeoPositionError", "GeoPositionError" }, - { "nsIDOMHTMLMediaElement", "HTMLMediaElement" }, - { "nsIDOMMediaError", "MediaError" }, - { "nsIDOMLoadStatus", "LoadStatus" }, - { "nsIDOMOfflineResourceList", "OfflineResourceList" }, - { "nsIDOMRange", "Range" }, - { "nsIDOMSVGFETurbulenceElement", "SVGFETurbulenceElement" }, - { "nsIDOMSVGFEMorphologyElement", "SVGFEMorphologyElement" }, - { "nsIDOMSVGFEConvolveMatrixElement", "SVGFEConvolveMatrixElement" }, - { "nsIDOMSVGFEDisplacementMapElement", "SVGFEDisplacementMapElement" }, - { "nsIDOMSVGLength", "SVGLength" }, - { "nsIDOMSVGUnitTypes", "SVGUnitTypes" }, - { "nsIDOMNodeFilter", "NodeFilter" }, - { "nsIDOMXPathNamespace", "XPathNamespace" }, - { "nsIDOMXPathResult", "XPathResult" }, - { "nsIDOMXULButtonElement", "XULButtonElement" }, - { "nsIDOMXULCheckboxElement", "XULCheckboxElement" }, - { "nsIDOMXULPopupElement", "XULPopupElement" } }; - -static nsresult -DefineComponentsShim(JSContext *cx, JS::HandleObject global) -{ - // Keep track of how often this happens. - Telemetry::Accumulate(Telemetry::COMPONENTS_SHIM_ACCESSED_BY_CONTENT, true); - - // Create a fake Components object. - JS::Rooted<JSObject*> components(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(components, NS_ERROR_OUT_OF_MEMORY); - bool ok = JS_DefineProperty(cx, global, "Components", JS::ObjectValue(*components), - JS_PropertyStub, JS_StrictPropertyStub, JSPROP_ENUMERATE); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Create a fake interfaces object. - JS::Rooted<JSObject*> interfaces(cx, JS_NewObject(cx, nullptr, nullptr, global)); - NS_ENSURE_TRUE(interfaces, NS_ERROR_OUT_OF_MEMORY); - ok = JS_DefineProperty(cx, components, "interfaces", JS::ObjectValue(*interfaces), - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - - // Define a bunch of shims from the Ci.nsIDOMFoo to window.Foo for DOM - // interfaces with constants. - for (uint32_t i = 0; i < ArrayLength(kInterfaceShimMap); ++i) { - - // Grab the names from the table. - const char *geckoName = kInterfaceShimMap[i].geckoName; - const char *domName = kInterfaceShimMap[i].domName; - - // Look up the appopriate interface object on the global. - JS::Rooted<JS::Value> v(cx, JS::UndefinedValue()); - ok = JS_GetProperty(cx, global, domName, v.address()); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - if (!v.isObject()) { - NS_WARNING("Unable to find interface object on global"); - continue; - } - - // Define the shim on the interfaces object. - ok = JS_DefineProperty(cx, interfaces, geckoName, v, - JS_PropertyStub, JS_StrictPropertyStub, - JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); - NS_ENSURE_TRUE(ok, NS_ERROR_OUT_OF_MEMORY); - } - - return NS_OK; -} - NS_IMETHODIMP nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSObject *obj_, jsid id_, uint32_t flags, @@ -4386,12 +4294,6 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, return NS_OK; } - MOZ_ASSERT(*_retval == true); // guaranteed by XPC_WN_Helper_NewResolve - if (id == XPCJSRuntime::Get()->GetStringID(XPCJSRuntime::IDX_COMPONENTS)) { - *objp = obj; - return DefineComponentsShim(cx, obj); - } - nsGlobalWindow *win = nsGlobalWindow::FromWrapper(wrapper); MOZ_ASSERT(win->IsInnerWindow()); diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index e3e1b63..666d1e2 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -80,8 +80,6 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ file_bug781476.html \ test_bug785096.html \ test_bug789713.html \ - test_bug790732.html \ - file_bug790732.html \ test_bug793969.html \ file_bug795275.html \ file_bug795275.xml \ @@ -101,6 +99,7 @@ MOCHITEST_FILES = chrome_wrappers_helper.html \ test_crosscompartment_weakmap.html \ test_asmjs.html \ file_asmjs.js \ + test_tor_bug2874.html \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/js/xpconnect/tests/mochitest/file_bug790732.html b/js/xpconnect/tests/mochitest/file_bug790732.html deleted file mode 100644 index 5515dfc..0000000 --- a/js/xpconnect/tests/mochitest/file_bug790732.html +++ /dev/null @@ -1,56 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script> -function testShim() { - - // Basic stuff - ok(Components, "Components shim exists!"); - var Ci = Components.interfaces; - ok(Ci, "interfaces shim exists!"); - is(typeof Components.classes, 'undefined', "Shouldn't have a Cc"); - - // Check each interface that we shim. We start by checking specific - // constants for a couple of interfaces, and then once it's pretty clear that - // it's working as intended we just check that the objects themselves are the - // same. - is(Ci.nsIDOMFileReader.DONE, FileReader.DONE); - is(Ci.nsIXMLHttpRequest.HEADERS_RECEIVED, XMLHttpRequest.HEADERS_RECEIVED); - is(Ci.nsIDOMDOMException.DATA_CLONE_ERR, DOMException.DATA_CLONE_ERR); - is(Ci.nsIDOMNode.DOCUMENT_NODE, Node.DOCUMENT_NODE); - is(Ci.nsIDOMUserDataHandler.NODE_CLONED, UserDataHandler.NODE_CLONED); - is(Ci.nsIDOMCSSPrimitiveValue.CSS_PX, CSSPrimitiveValue.CSS_PX); - is(Ci.nsIDOMCSSRule.NAMESPACE_RULE, CSSRule.NAMESPACE_RULE); - is(Ci.nsIDOMCSSValue.CSS_PRIMITIVE_VALUE, CSSValue.CSS_PRIMITIVE_VALUE); - is(Ci.nsIDOMEvent.FOCUS, Event.FOCUS); - is(Ci.nsIDOMNSEvent.CLICK, Event.CLICK); - is(Ci.nsIDOMKeyEvent, KeyEvent); - is(Ci.nsIDOMMouseEvent, MouseEvent); - is(Ci.nsIDOMMouseScrollEvent, MouseScrollEvent); - is(Ci.nsIDOMMutationEvent, MutationEvent); - is(Ci.nsIDOMSimpleGestureEvent, SimpleGestureEvent); - is(Ci.nsIDOMUIEvent, UIEvent); - is(Ci.nsIDOMGeoPositionError, GeoPositionError); - is(Ci.nsIDOMHTMLMediaElement, HTMLMediaElement); - is(Ci.nsIDOMMediaError, MediaError); - is(Ci.nsIDOMLoadStatus, LoadStatus); - is(Ci.nsIDOMOfflineResourceList, OfflineResourceList); - is(Ci.nsIDOMRange, Range); - is(Ci.nsIDOMSVGFETurbulenceElement, SVGFETurbulenceElement); - is(Ci.nsIDOMSVGFEMorphologyElement, SVGFEMorphologyElement); - is(Ci.nsIDOMSVGFEConvolveMatrixElement, SVGFEConvolveMatrixElement); - is(Ci.nsIDOMSVGFEDisplacementMapElement, SVGFEDisplacementMapElement); - is(Ci.nsIDOMSVGLength, SVGLength); - is(Ci.nsIDOMSVGUnitTypes, SVGUnitTypes); - is(Ci.nsIDOMNodeFilter, NodeFilter); - is(Ci.nsIDOMXPathNamespace, XPathNamespace); - is(Ci.nsIDOMXPathResult, XPathResult); - is(Ci.nsIDOMXULButtonElement, XULButtonElement); - is(Ci.nsIDOMXULCheckboxElement, XULCheckboxElement); - is(Ci.nsIDOMXULPopupElement, XULPopupElement); -} -</script> -</head> -<body> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_bug790732.html b/js/xpconnect/tests/mochitest/test_bug790732.html deleted file mode 100644 index 771950e..0000000 --- a/js/xpconnect/tests/mochitest/test_bug790732.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE HTML> -<html> - -<head> - <meta charset="utf-8"> - <title>Test for Bug 790732</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> - - /** Test for the Components shim. We split into two files because this stuff - is currently pref-controlled. **/ - SimpleTest.waitForExplicitFinish(); - - function prepare() { - SpecialPowers.pushPrefEnv({set: [['dom.omit_components_in_content', true]]}, - function () { $('ifr').onload = go; - $('ifr').contentWindow.location = - '/tests/js/xpconnect/tests/mochitest/file_bug790732.html'; } - ); - } - - function go() { - ok(true, "Started test"); - var iwin = $('ifr').contentWindow; - iwin.ok = ok; - iwin.is = is; - iwin.testShim(); - SimpleTest.finish(); - } - - </script> -</head> -<body onload="prepare()"> -<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=790732">Mozilla Bug 790732</a> -<p id="display"></p> -<div id="content" style="display: none"> - -</div> -<pre id="test"> -</pre> -<iframe id="ifr"></iframe> -</body> -</html> diff --git a/js/xpconnect/tests/mochitest/test_tor_bug2874.html b/js/xpconnect/tests/mochitest/test_tor_bug2874.html new file mode 100644 index 0000000..c0a956e --- /dev/null +++ b/js/xpconnect/tests/mochitest/test_tor_bug2874.html @@ -0,0 +1,25 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Tor Bug 2874</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + is(typeof Components, 'undefined', "The global window object should not expose a Components property to untrusted content."); + </script> +</head> +<body> +<a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2874">Tor Bug 2874</a> +<p id="display"></p> +<div id="content" style="display: none"> + +</div> +<pre id="test"> +</pre> +</body> +</html> diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 9698fac..5594e01 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -2955,10 +2955,6 @@ "kind": "flag", "description": "Whether content ever accesed Components.interfaces in this session" }, - "COMPONENTS_SHIM_ACCESSED_BY_CONTENT": { - "kind": "flag", - "description": "Whether content ever accesed the Components shim in this session" - }, "CHECK_ADDONS_MODIFIED_MS": { "kind": "exponential", "high": "5000",

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b899b56326e9f1a48c40a2d233138612a975eeac Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Aug 17 01:31:03 2014 +0000 fixup! Bug #6253: Add canvas image extraction prompt. Modify Pearl Crescent's #7265 patch to log all HTML5 canvas access attempts. --- content/canvas/src/CanvasUtils.cpp | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index 203dd92..f2f4536 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -33,6 +33,8 @@ using namespace mozilla::gfx; #include "mozIThirdPartyUtil.h" #include "nsContentUtils.h" #include "nsUnicharUtils.h" +#include "nsPrintfCString.h" +#include "nsIConsoleService.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -79,14 +81,40 @@ IsImageExtractionAllowed(nsIDocument *aDocument) isAllowed = (permission == nsIPermissionManager::ALLOW_ACTION); if (!isAllowed && (permission != nsIPermissionManager::DENY_ACTION)) { - // Send notification so that a prompt is displayed. - nsCString spec; - rv = uri->GetSpec(spec); + // Log all attempted canvas access and block access by third parties. + bool isThirdParty = true; + nsIURI *docURI = aDocument->GetDocumentURI(); + rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); + NS_ENSURE_SUCCESS(rv, false); + + nsCString firstPartySpec; + rv = uri->GetSpec(firstPartySpec); + nsCString docSpec; + docURI->GetSpec(docSpec); + nsPrintfCString msg("On %s: blocked access to canvas image data" + " from %s ", // L10n + firstPartySpec.get(), docSpec.get()); + + nsCOMPtr<nsIConsoleService> console + (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); + if (console) + console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); + + // Log every canvas access attempt to stdout if debugging: +#ifdef DEBUG + printf("%s\n", msg.get()); +#endif + // Ensure URI is valid after logging, but before trying to notify the + // user: NS_ENSURE_SUCCESS(rv, false); - nsCOMPtr<nsIObserverService> obs = - mozilla::services::GetObserverService(); - obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, - NS_ConvertUTF8toUTF16(spec).get()); + + if (!isThirdParty) { + // Send notification so that a prompt is displayed. + nsCOMPtr<nsIObserverService> obs = + mozilla::services::GetObserverService(); + obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, + NS_ConvertUTF8toUTF16(firstPartySpec).get()); + } } } }

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Bug #6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 3ef809fcfc22b0d46a52a3393cc685f44b66180e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:34:23 2014 -0700 fixup! Bug #6253: Add canvas image extraction prompt. Use JSContext to get URL information for HTML5 canvas access. --- content/canvas/src/CanvasRenderingContext2D.cpp | 2 +- content/canvas/src/CanvasUtils.cpp | 18 +++++++++++++----- content/canvas/src/CanvasUtils.h | 2 +- content/html/content/src/HTMLCanvasElement.cpp | 9 +++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 9be4ced..c53ac07 100644 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3506,7 +3506,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx, if (mCanvasElement) { nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); usePlaceholder = !ownerDoc || - !CanvasUtils::IsImageExtractionAllowed(ownerDoc); + !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx); } if (usePlaceholder) { diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index f2f4536..591650a 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -35,6 +35,7 @@ using namespace mozilla::gfx; #include "nsUnicharUtils.h" #include "nsPrintfCString.h" #include "nsIConsoleService.h" +#include "jsdbgapi.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -43,10 +44,9 @@ namespace mozilla { namespace CanvasUtils { // Check site-specific permission and display prompt if appropriate. -bool -IsImageExtractionAllowed(nsIDocument *aDocument) +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) { - if (!aDocument) + if (!aDocument || !aCx) return false; nsPIDOMWindow *win = aDocument->GetWindow(); @@ -87,13 +87,21 @@ IsImageExtractionAllowed(nsIDocument *aDocument) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); + nsCString scriptFile("unknown"); + unsigned scriptLine = 0; + JSScript *script; + if (JS_DescribeScriptedCaller(aCx, &script, &scriptLine)) { + scriptFile = JS_GetScriptFilename(aCx, script); + } + nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from %s ", // L10n - firstPartySpec.get(), docSpec.get()); + " from document %s, script from %s:%u ", // L10n + firstPartySpec.get(), docSpec.get(), + scriptFile.get(), scriptLine); nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h index d7aae4d..1e7f726 100644 --- a/content/canvas/src/CanvasUtils.h +++ b/content/canvas/src/CanvasUtils.h @@ -45,7 +45,7 @@ void DoDrawImageSecurityCheck(dom::HTMLCanvasElement *aCanvasElement, bool forceWriteOnly, bool CORSUsed); -bool IsImageExtractionAllowed(nsIDocument *aDocument); +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx); // Make a double out of |v|, treating undefined values as 0.0 (for // the sake of sparse arrays). Return true iff coercion diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index e229e1c..d6cb88a 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -355,7 +355,7 @@ HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams, // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ToDataURLImpl(aCx, aType, aParams, usePlaceholder, aDataURL); } @@ -590,10 +590,11 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, } bool fallbackToPNG = false; + JSContext* cx = nsContentUtils::GetCurrentJSContext(); // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), cx); nsCOMPtr<nsIInputStream> stream; rv = ExtractData(type, EmptyString(), usePlaceholder, getter_AddRefs(stream), fallbackToPNG); @@ -616,7 +617,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, nsRefPtr<nsDOMMemoryFile> blob = new nsDOMMemoryFile(imgData, imgSize, type); - JSContext* cx = nsContentUtils::GetCurrentJSContext(); if (cx) { JS_updateMallocCounter(cx, imgSize); } @@ -648,7 +648,8 @@ HTMLCanvasElement::MozGetAsFile(const nsAString& aName, // Check site-speciifc permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); return MozGetAsFileImpl(aName, aType, usePlaceholder, aResult); }

1 0

[torbutton/master] Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed'
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit d09b8425899cf838e0f0b86fffee248cf2be63b5 Merge: b6e98c0 b0d3f18 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:46:15 2014 -0700 Merge remote-tracking branch 'isis/bug12684-additional-canvas-ui-strings_squashed' src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[torbutton/master] Bug 12684: Slightly tweak the canvas message.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 402eb5d24ba35aef68ecbe95d77fa3c5c0768d29 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:52:21 2014 -0700 Bug 12684: Slightly tweak the canvas message. Still not perfect, but repeating "image data" and "extract" twice might help get the point across. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c04b1e8..c76be32 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,7 +48,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now canvas.notNowAccessKey=N canvas.allow=Allow in the future

1 0

[torbutton/master] Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit b0d3f1879bf6b3bb61499c8178155729457856a5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jul 29 06:18:10 2014 +0000 Bug #12684: Add `canvas.notNow` UI strings to torbutton.properties file. Also, clarify UI strings which explain HTML5 canvas fingerprinting and options within the PopupNotification dialogue, and make capitalisation consistent. * FIXES #12684. [0] [0]: https://bugs.torproject.org/12684 --- src/chrome/locale/en/torbutton.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index d34432d..c04b1e8 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -48,8 +48,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future +canvas.siteprompt=This website (%S) attempted to access HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to access HTML5 canvases? +canvas.notNow=Not Now +canvas.notNowAccessKey=N +canvas.allow=Allow in the future canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.never=Never for this site (recommended) canvas.neverAccessKey=e

1 0

[tor-launcher/master] Do not show copy log button when help is open.
by brade＠torproject.org 19 Aug '14

19 Aug '14

commit fb7e0576942310ff262165ecf6cf7c2bf2ed48bd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 19 11:10:07 2014 -0400 Do not show copy log button when help is open. If a Tor error or warning message arrived while the Bridge Help was open, the "Copy Tor Log To Clipboard" button was shown immediately (instead of after the help was closed). --- src/chrome/content/network-settings.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e84f92..5f3f698 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -439,10 +439,7 @@ function showPanel(aPanelID) var deckElem = document.getElementById("deck"); if (deckElem) - { deckElem.selectedPanel = document.getElementById(aPanelID); - showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); - } else if (wizard.currentPage.pageid != aPanelID) wizard.goTo(aPanelID); @@ -527,17 +524,19 @@ function showErrorMessage(aTorExited, aErrorMsg) function showCopyLogButton(aHaveErrorOrWarning) { - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) { - if (getWizard()) + let haveWizard = (getWizard() != null); + if (haveWizard) copyLogBtn.setAttribute("wizardCanCopyLog", true); - copyLogBtn.removeAttribute("hidden"); + if (!gRestoreAfterHelpPanelID) + copyLogBtn.removeAttribute("hidden"); // Show button if help is not open. if (aHaveErrorOrWarning) { - var clz = copyLogBtn.getAttribute("class"); + let clz = copyLogBtn.getAttribute("class"); if (!clz) copyLogBtn.setAttribute("class", "torWarning"); else if (clz.indexOf("torWarning") < 0) @@ -549,14 +548,12 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - if (!getWizard()) - return; - - var copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = document.documentElement.getButton("extra2"); if (!copyLogBtn) return; - if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + // Always show button in non-wizard case; conditionally in wizard. + if (!getWizard() || copyLogBtn.hasAttribute("wizardCanCopyLog")) copyLogBtn.removeAttribute("hidden"); else copyLogBtn.setAttribute("hidden", true); @@ -735,11 +732,12 @@ function onOpenHelp() showPanel("bridgeHelp"); + showOrHideButton("extra2", false, false); // Hide "Copy Tor Log To Clipboard" + if (getWizard()) { showOrHideButton("cancel", false, false); showOrHideButton("back", false, false); - showOrHideButton("extra2", false, false); overrideButtonLabel("next", "done"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -755,11 +753,12 @@ function closeHelp() if (!gRestoreAfterHelpPanelID) // Already closed? return; + restoreCopyLogVisibility(); + if (getWizard()) { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[tor-launcher/master] Bug 11199 fixup: Improve behavior if tor exits.
by brade＠torproject.org 14 Aug '14

14 Aug '14

commit 3aa4860244adf99ba09911708ba8faa05a6cfa14 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 14 16:37:53 2014 -0400 Bug 11199 fixup: Improve behavior if tor exits. Improved alert/error messages and button labels. --- src/chrome/content/network-settings-wizard.xul | 2 +- src/chrome/content/network-settings.js | 7 ++++++- src/chrome/content/network-settings.xul | 2 +- src/chrome/locale/en/torlauncher.properties | 6 +++--- src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 18 ++++++++++++++---- src/modules/tl-util.jsm | 8 +++++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6a3b8fc..70d1bcf 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -168,7 +168,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index fdd565e..0e84f92 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -491,15 +491,20 @@ function showErrorMessage(aTorExited, aErrorMsg) if (aTorExited) { // Show "Tor exited" message and "Restart Tor" button. - aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited"); + aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited") + + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); if (btn) btn.removeAttribute("hidden"); + if (elem) + elem.style.textAlign = "start"; } else { if (btn) btn.setAttribute("hidden", true); + if (elem) + elem.style.textAlign = "center"; } if (elem) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 937db71..a81a5f0 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -67,7 +67,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index bf2426a..816d831 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect -torlauncher.reconnect=Reconnect +torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index a823914..03f84d7 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -105,6 +105,7 @@ wizardpage[pageid="errorPanel"] description, font-size: 120%; font-weight: bold; white-space: pre-wrap; + text-align: center; } #restartButton { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 619a32c..cc5d654 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -148,11 +148,21 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited"); + var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + + TorLauncherUtil.getLocalizedString("tor_exited2"); TorLauncherLogger.log(4, s); - s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost"); - var btnLabel = TorLauncherUtil.getLocalizedString("reconnect"); - if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting) + var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); + var cancelBtnLabel = "OK"; + try + { + const kSysBundleURI = "chrome://global/locale/commonDialogs.properties"; + var sysBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService).createBundle(kSysBundleURI); + cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel); + } catch(e) {} + + if (TorLauncherUtil.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel) + && !this.mIsQuitting) { this._startTor(); this._controlTor(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 1b8c809..834d260 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -64,7 +64,8 @@ let TorLauncherUtil = // Public // Returns true if user confirms; false if not. // Note that no prompt is shown (and false is returned) if the Network Settings // window is open. - showConfirm: function(aParentWindow, aMsg, aOKButtonLabel) + showConfirm: function(aParentWindow, aMsg, aDefaultButtonLabel, + aCancelButtonLabel) { try { @@ -84,11 +85,12 @@ let TorLauncherUtil = // Public var title = this.getLocalizedString("error_title"); var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) + ps.BUTTON_POS_0_DEFAULT - + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL); + + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING); var notUsed = { value: false }; var btnIndex = ps.confirmEx(aParentWindow, title, aMsg, btnFlags, - aOKButtonLabel, null, null, null, notUsed); + aDefaultButtonLabel, aCancelButtonLabel, + null, null, notUsed); return (0 == btnIndex); } catch (e)

1 0

[tor-launcher/master] Remove all observers when dialogs are closed.
by brade＠torproject.org 07 Aug '14

07 Aug '14

commit 9c0ef4f67d5ec18e17e8a3e789a198819c90c7ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 7 14:14:57 2014 -0400 Remove all observers when dialogs are closed. --- src/chrome/content/network-settings-wizard.xul | 3 +- src/chrome/content/network-settings.js | 64 +++++++++++++++++++----- src/chrome/content/network-settings.xul | 3 +- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index da81ced..6a3b8fc 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -21,7 +21,8 @@ buttonlabelextra2="&torsettings.copyLog;" onwizardfinish="return applySettings();" onwizardcancel="return onCancel();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index bdfb5c1..fdd565e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -62,6 +62,7 @@ var gObsService = null; var gIsInitialBootstrap = false; var gIsBootstrapComplete = false; var gRestoreAfterHelpPanelID = null; +var gActiveTopics = []; // Topics for which an observer is currently installed. function initDialog() @@ -156,10 +157,10 @@ function initDialog() initDefaultBridgeTypeMenu(); - gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); - gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); - gObsService.addObserver(gObserver, kTorOpenProgressTopic, false); + addObserver(kTorBootstrapErrorTopic); + addObserver(kTorLogHasWarnOrErrTopic); + addObserver(kTorProcessExitedTopic); + addObserver(kTorOpenProgressTopic); var status = gTorProcessService.TorProcessStatus; if (TorLauncherUtil.shouldStartAndOwnTor && @@ -169,8 +170,8 @@ function initDialog() showErrorMessage(true, null); else showStartingTorPanel(); - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); } else { @@ -199,6 +200,12 @@ function initDialog() } +function deinitDialog() +{ + removeAllObservers(); +} + + // For now, we assume that the wizard buttons are the widest portion. // TODO: return a value for the settings dialog (non-wizard case). function maxWidthOfContent() @@ -329,7 +336,8 @@ var gObserver = { if (kTorProcessReadyTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessReadyTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); var haveWizard = (getWizard() != null); showPanel(); if (haveWizard) @@ -341,12 +349,13 @@ var gObserver = { } else if (kTorProcessDidNotStartTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessDidNotStartTopic); + removeObserver(kTorProcessReadyTopic); + removeObserver(kTorProcessDidNotStartTopic); showErrorMessage(false, aData); } else if (kTorProcessExitedTopic == aTopic) { - gObsService.removeObserver(gObserver, kTorProcessExitedTopic); + removeObserver(kTorProcessExitedTopic); showErrorMessage(true, null); } else if (kTorOpenProgressTopic == aTopic) @@ -357,6 +366,37 @@ var gObserver = { }; +// addObserver() will not add two observers for the same topic. +function addObserver(aTopic) +{ + if (gActiveTopics.indexOf(aTopic) < 0) + { + gObsService.addObserver(gObserver, aTopic, false); + gActiveTopics.push(aTopic); + } +} + + +function removeObserver(aTopic) +{ + let idx = gActiveTopics.indexOf(aTopic); + if (idx >= 0) + { + gObsService.removeObserver(gObserver, aTopic); + gActiveTopics.splice(idx, 1); + } +} + + +function removeAllObservers() +{ + for (let i = gActiveTopics.length - 1; i >= 0; --i) + gObsService.removeObserver(gObserver, gActiveTopics[i]); + + gActiveTopics = []; +} + + function readTorSettings() { TorLauncherLogger.log(2, "readTorSettings " + @@ -641,9 +681,9 @@ function onProxyTypeChange() function onRestartTor() { // Re-add these observers in case they have been removed. - gObsService.addObserver(gObserver, kTorProcessReadyTopic, false); - gObsService.addObserver(gObserver, kTorProcessDidNotStartTopic, false); - gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); + addObserver(kTorProcessReadyTopic); + addObserver(kTorProcessDidNotStartTopic); + addObserver(kTorProcessExitedTopic); gTorProcessService._startTor(); gTorProcessService._controlTor(); diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 1fcd4a7..937db71 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -24,7 +24,8 @@ ondialogcancel="return onCancel();" ondialogextra2="onCopyLog();" ondialoghelp="onOpenHelp();" - onload="initDialog();"> + onload="initDialog();" + onunload="deinitDialog();"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/>

1 0

[tor-browser-bundle/maint-3.6] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit cc6a688a1e8b5c1501ecb5f9838683e833153747 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:34:28 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Frodo Baggins can now sign OpenSSL releases, apparently.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 24bc2eea8666da86c524b321c9889e9b96f6be7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:33:23 2014 -0700 Frodo Baggins can now sign OpenSSL releases, apparently. --- gitian/gpg/OPENSSL.gpg | Bin 6924 -> 8467 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg index d8c115b..da395de 100644 Binary files a/gitian/gpg/OPENSSL.gpg and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update main Changelog with newer 3.6.4 material.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 4426a4daed68c08d4582b8b713b0dd3bdf397b82 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:06:37 2014 -0700 Update main Changelog with newer 3.6.4 material. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9626ceb..8eb4284 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 +Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) * Two modes of Meek are provided: Meek over Google and Meek over Amazon @@ -31,10 +31,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1

1 0

[tor-browser-bundle/maint-3.6] Apply rebased Bug11200-hang fix.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 91751b52e06a3fe5dd94eb4fa045ac75859d5842 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:04:17 2014 -0700 Apply rebased Bug11200-hang fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug11200-hang-0.2.4.patch | 66 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e986467..d0336d7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,8 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 27e242b..fa1badb 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -80,6 +81,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 054e1a8..5e1ea0f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug11200-hang-0.2.4.patch" - "bug8402-master.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -76,6 +77,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aea69b9..7d244ae 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "binutils.tar.bz2" - "dzip.sh" - "binutils-win32-utils.zip" @@ -77,6 +78,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/patches/bug11200-hang-0.2.4.patch b/gitian/patches/bug11200-hang-0.2.4.patch new file mode 100644 index 0000000..6bac5e4 --- /dev/null +++ b/gitian/patches/bug11200-hang-0.2.4.patch @@ -0,0 +1,66 @@ +From 813dc75f717cab1f7896c77e838c496daa3e4deb Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 15:57:24 -0700 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 + +When Tor starts with DisabledNetwork set, it would correctly +conclude that it shouldn't try making circuits, but it would +mistakenly cache this conclusion and continue believing it even +when DisableNetwork is set to 0. Fixes the bug introduced by the +fix for bug 11200; bugfix on 0.2.5.4-alpha. +--- + src/or/nodelist.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index e814e16..18b6677 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1240,10 +1240,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; + } ++ + return have_min_dir_info; + } + +@@ -1439,7 +1450,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; +- const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1452,13 +1462,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- goto done; +- } +- + using_md = consensus->flavor == FLAV_MICRODESC; + + { +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Replace bug11200 patch with squashed version.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit d624e24bd780a11c289168d88f703b885f25ff6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:51:07 2014 -0700 Replace bug11200 patch with squashed version. --- gitian/patches/bug11200-hang-0.2.5.patch | 197 ++++-------------------------- 1 file changed, 21 insertions(+), 176 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index a95afb2..76cd159 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,61 +1,7 @@ -From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 +From fcac4b4467427e8f6ad948e8c8e6f34a0131e716 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/4] move the consensus check below the disablednetwork check - -should have no impact in practice ---- - src/or/nodelist.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 8f87081..a33a8b2 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1495,11 +1495,20 @@ update_router_have_minimum_dir_info(void) - time_t now = time(NULL); - int res; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus = -- networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - -+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -+ res = 0; -+ goto done; -+ } -+ -+ consensus = -+ networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ - if (!consensus) { - if (!networkstatus_get_latest_consensus()) - strlcpy(dir_info_status, "We have no usable consensus.", -@@ -1511,13 +1520,6 @@ update_router_have_minimum_dir_info(void) - goto done; - } - -- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -- res = 0; -- goto done; -- } -- - using_md = consensus->flavor == FLAV_MICRODESC; - - { --- -1.9.1 - -From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -64,8 +10,8 @@ when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. --- changes/bug11200-caching | 7 +++++++ - src/or/nodelist.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) + src/or/nodelist.c | 21 ++++++++++++--------- + 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 changes/bug11200-caching diff --git a/changes/bug11200-caching b/changes/bug11200-caching @@ -82,97 +28,10 @@ index 0000000..e3fbaec + fix for bug 11200; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index a33a8b2..c863663 100644 +index 8f87081..7b1f338 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c -@@ -1494,16 +1494,21 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -+ static int disabled=0; - const or_options_t *options = get_options(); - const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ if (!disabled) -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -+ disabled = 1; - goto done; -+ } else { -+ disabled = 0; - } - - consensus = -@@ -1568,6 +1573,7 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- need_to_update_have_min_dir_info = 0; -+ if (!disabled) -+ need_to_update_have_min_dir_info = 0; - } - --- -1.9.1 - -From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/4] Stop redundant clearing of - need_to_update_have_min_dir_info - -We were clearing it in router_have_minimum_dir_info() as well as in -update_router_have_minimum_dir_info(). ---- - src/or/nodelist.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index c863663..6eb286f 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1277,7 +1277,6 @@ router_have_minimum_dir_info(void) - { - if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { - update_router_have_minimum_dir_info(); -- need_to_update_have_min_dir_info = 0; - } - return have_min_dir_info; - } -@@ -1488,7 +1487,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, - - /** Change the value of have_min_dir_info, setting it true iff we have enough - * network and router information to build circuits. Clear the value of -- * need_to_update_have_min_dir_info. */ -+ * need_to_update_have_min_dir_info if we're confident of our answer. */ - static void - update_router_have_minimum_dir_info(void) - { --- -1.9.1 - -From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Wed, 6 Aug 2014 02:11:52 -0400 -Subject: [PATCH 4/4] refactor DisableNetwork check - -Move the block from update_router_have_minimum_dir_info() to -router_have_minimum_dir_info() so it's clearer that it's not -actually updating the variable. ---- - src/or/nodelist.c | 34 +++++++++++++++------------------- - 1 file changed, 15 insertions(+), 19 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 6eb286f..57b0bce 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; +@@ -1275,10 +1275,21 @@ static char dir_info_status[256] = ""; int router_have_minimum_dir_info(void) { @@ -189,48 +48,34 @@ index 6eb286f..57b0bce 100644 + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; } + return have_min_dir_info; } -@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -- static int disabled=0; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus; -- int using_md; +@@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; - const char *delay_fetches_msg = NULL; -- + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- if (!disabled) -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -- disabled = 1; - goto done; -- } else { -- disabled = 0; - } - -- consensus = -+ const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ int using_md; - - if (!consensus) { - if (!networkstatus_get_latest_consensus()) -@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- if (!disabled) -- need_to_update_have_min_dir_info = 0; -+ need_to_update_have_min_dir_info = 0; - } + using_md = consensus->flavor == FLAV_MICRODESC; + { -- 1.9.1

1 0

[tor-browser-bundle/master] Update 11200 patch to include Roger's refactoring.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 3385f5755dc8e10f1829b35ddfb6619a9b5ced7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:29:13 2014 -0700 Update 11200 patch to include Roger's refactoring. --- gitian/patches/bug11200-hang-0.2.5.patch | 84 ++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index 00664a4..a95afb2 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,7 +1,7 @@ From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/3] move the consensus check below the disablednetwork check +Subject: [PATCH 1/4] move the consensus check below the disablednetwork check should have no impact in practice --- @@ -55,7 +55,7 @@ index 8f87081..a33a8b2 100644 From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/3] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -123,7 +123,7 @@ index a33a8b2..c863663 100644 From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/3] Stop redundant clearing of +Subject: [PATCH 3/4] Stop redundant clearing of need_to_update_have_min_dir_info We were clearing it in router_have_minimum_dir_info() as well as in @@ -156,3 +156,81 @@ index c863663..6eb286f 100644 -- 1.9.1 +From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 02:11:52 -0400 +Subject: [PATCH 4/4] refactor DisableNetwork check + +Move the block from update_router_have_minimum_dir_info() to +router_have_minimum_dir_info() so it's clearer that it's not +actually updating the variable. +--- + src/or/nodelist.c | 34 +++++++++++++++------------------- + 1 file changed, 15 insertions(+), 19 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 6eb286f..57b0bce 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); + } ++ + return have_min_dir_info; + } + +@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) + { + time_t now = time(NULL); + int res; +- static int disabled=0; + const or_options_t *options = get_options(); +- const networkstatus_t *consensus; +- int using_md; +- const char *delay_fetches_msg = NULL; +- +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- if (!disabled) +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- disabled = 1; +- goto done; +- } else { +- disabled = 0; +- } +- +- consensus = ++ const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); ++ int using_md; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) + control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); + } + have_min_dir_info = res; +- if (!disabled) +- need_to_update_have_min_dir_info = 0; ++ need_to_update_have_min_dir_info = 0; + } + +-- +1.9.1 +

1 0