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

[tor-browser/tor-browser-17.0.9esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit 57a16557c8f26a44b2725a3e78cb04669cde96df Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 21:25:09 2013 -0700 fixup! Tor Browser's Firefox preference overrides. Remove polipo and privoxy from the banned ports list (finally). --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c8ff052..4036d2c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -77,7 +77,7 @@ pref("network.proxy.socks", "127.0.0.1"); pref("network.proxy.socks_port", 9150); pref("network.proxy.socks_remote_dns", true); pref("network.proxy.type", 1); -pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); +pref("network.security.ports.banned", "9050,9051,9150,9151"); pref("network.dns.disablePrefetch", true); pref("network.protocol-handler.external-default", false); pref("network.protocol-handler.external.mailto", false);

1 0

[check/master] Prevent multiple response.WriteHeader calls.
by arlo＠torproject.org 03 Oct '13

03 Oct '13

commit 5e5bd0cce147bfe1e077579abb33802978792cc5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 2 21:02:55 2013 -0700 Prevent multiple response.WriteHeader calls. HEAD requests were causing the template executer to warn about ErrBodyNotAllowed. The error handler was then trying to return a 500, but headers had already be written. For now we'll just log errors. A better fix may be to buffer a response, then check for errors before writing it. Closes #18 --- handlers.go | 13 +++++++------ utils.go | 22 ++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/handlers.go b/handlers.go index 39bb584..cef330d 100644 --- a/handlers.go +++ b/handlers.go @@ -3,6 +3,7 @@ package main import ( "fmt" "html/template" + "log" "net" "net/http" "time" @@ -53,8 +54,8 @@ func RootHandler(Layout *template.Template, Exits *Exits, Phttp *http.ServeMux) // short circuit for torbutton if len(r.URL.Query().Get("TorButton")) > 0 { - if err := Layout.ExecuteTemplate(w, "torbutton.html", isTor); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + if err := Layout.ExecuteTemplate(w, "torbutton.html", isTor); err != nil && NotHeadErr(err) { + log.Printf("Layout.ExecuteTemplate: %v", err) } return } @@ -94,8 +95,8 @@ func RootHandler(Layout *template.Template, Exits *Exits, Phttp *http.ServeMux) } // render the template - if err := Layout.ExecuteTemplate(w, "index.html", p); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + if err := Layout.ExecuteTemplate(w, "index.html", p); err != nil && NotHeadErr(err) { + log.Printf("Layout.ExecuteTemplate: %v", err) } } @@ -109,8 +110,8 @@ func BulkHandler(Layout *template.Template, Exits *Exits) func(http.ResponseWrit ip := q.Get("ip") if net.ParseIP(ip) == nil { - if err := Layout.ExecuteTemplate(w, "bulk.html", nil); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + if err := Layout.ExecuteTemplate(w, "bulk.html", nil); err != nil && NotHeadErr(err) { + log.Printf("Layout.ExecuteTemplate: %v", err) } return } diff --git a/utils.go b/utils.go index eb8a66d..d2ab661 100644 --- a/utils.go +++ b/utils.go @@ -9,9 +9,10 @@ import ( "io/ioutil" "log" "net/http" + "net/url" "os" "strconv" - "net/url" + "strings" ) func UpToDate(r *http.Request) bool { @@ -48,6 +49,11 @@ func GetQS(q url.Values, param string, deflt int) (num int, str string) { return } +func NotHeadErr(err error) bool { + // should just be able to compare errors but executetemplate formats it + return !strings.Contains(err.Error(), http.ErrBodyNotAllowed.Error()) +} + func FuncMap(domain *gettext.Domain) template.FuncMap { return template.FuncMap{ "UnEscaped": func(x string) interface{} { @@ -65,27 +71,19 @@ func FuncMap(domain *gettext.Domain) template.FuncMap { var Layout *template.Template func CompileTemplate(domain *gettext.Domain, templateName string) *template.Template { - var err error if Layout == nil { Layout = template.New("") Layout = Layout.Funcs(FuncMap(domain)) - Layout, err = Layout.ParseFiles( + Layout = template.Must(Layout.ParseFiles( "public/base.html", "public/torbutton.html", - ) - if err != nil { - log.Fatal(err) - } + )) } l, err := Layout.Clone() if err != nil { log.Fatal(err) } - l, err = l.ParseFiles("public/" + templateName) - if err != nil { - log.Fatal(err) - } - return l + return template.Must(l.ParseFiles("public/" + templateName)) } type locale struct {

1 0

[torbrowser/maint-2.3] Update startpage to unfiltered URL for TBB 2.3.
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit 26404d1a9571002506aa840b6f27fccaab3c6a1a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 21:00:01 2013 -0700 Update startpage to unfiltered URL for TBB 2.3. The beta and the alphas seem to be fine. --- .../0014-Add-DDG-and-StartPage-to-Omnibox.patch | 43 ++++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch index adbd3d4..e97642e 100644 --- a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,18 +1,40 @@ -From 2a80e84755c97cf4ff3ab63bda1bd5f0936d9594 Mon Sep 17 00:00:00 2001 +From 9e6ade2c9a98d97536cbda15be33432ca8ef8215 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 -Subject: [PATCH 14/24] Add DDG and StartPage to Omnibox. +Subject: [PATCH 11/38] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. --- - browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ - browser/locales/en-US/searchplugins/list.txt | 2 + - browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) + .../en-US/chrome/browser-region/region.properties | 8 +++--- + browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++++ + browser/locales/en-US/searchplugins/list.txt | 2 ++ + browser/locales/en-US/searchplugins/startpage.xml | 11 ++++++++ + 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml create mode 100644 browser/locales/en-US/searchplugins/startpage.xml +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index c3a980c..9c21f04 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Startpage + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing ++browser.search.order.1=Startpage ++browser.search.order.2=DuckDuckGo ++browser.search.order.3=Google + + # This is the default set of web based feed handlers shown in the reader + # selection UI diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml new file mode 100644 index 0000000..4f00b4d @@ -64,7 +86,7 @@ index 2a1141a..0466f4e 100644 yahoo diff --git a/browser/locales/en-US/searchplugins/startpage.xml b/browser/locales/en-US/searchplugins/startpage.xml new file mode 100644 -index 0000000..1a310b1 +index 0000000..a323fdf --- /dev/null +++ b/browser/locales/en-US/searchplugins/startpage.xml @@ -0,0 +1,11 @@ @@ -74,11 +96,8 @@ index 0000000..1a310b1 +<InputEncoding>UTF-8</InputEncoding> +<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++LN1/vmv bf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> + -+<Url type="text/html" method="POST" template="https://startpage.com/do/search"> ++<Url type="text/html" method="POST" template="https://startpage.com/rto/search"> + <Param name="q" value="{searchTerms}"/> +</Url> -+<SearchForm>https://startpage.com/do/search/</SearchForm> ++<SearchForm>https://startpage.com/rto/search/</SearchForm> +</SearchPlugin> --- -1.7.5.4 -

1 0

[tor/master] Bump version to 0.2.5.1-alpha-dev
by nickm＠torproject.org 03 Oct '13

03 Oct '13

commit a6b4934037d1308e91e12378b739a2742591a40d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 2 22:41:41 2013 -0400 Bump version to 0.2.5.1-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 39eaf28..926b53d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.5.1-alpha]) +AC_INIT([tor],[0.2.5.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 9a1ae6d..d6a2f33 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.5.1-alpha" +!define VERSION "0.2.5.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 262ba85..0d6fe69 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.5.1-alpha" +#define VERSION "0.2.5.1-alpha-dev"

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Add mozIThirdPartyUtil.getFirstPartyURI API
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit 6d41ba055896b2fad9132b6d08b29a57bd22afa6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 19:20:03 2013 -0700 fixup! Add mozIThirdPartyUtil.getFirstPartyURI API Make getFirstPartyURI log+handle errors internally to simplify caller usage of the API. --- content/base/src/ThirdPartyUtil.cpp | 110 ++++++++++++++++++++++++++++ content/base/src/ThirdPartyUtil.h | 1 + netwerk/base/public/mozIThirdPartyUtil.idl | 22 ++++++ 3 files changed, 133 insertions(+) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index ad1b0fa..36c2d25 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -14,6 +14,9 @@ #include "nsIPrincipal.h" #include "nsIScriptObjectPrincipal.h" #include "nsThreadUtils.h" +#include "nsPrintfCString.h" +#include "nsIConsoleService.h" +#include "nsContentUtils.h" NS_IMPL_ISUPPORTS1(ThirdPartyUtil, mozIThirdPartyUtil) @@ -49,6 +52,21 @@ ThirdPartyUtil::IsThirdPartyInternal(const nsCString& aFirstDomain, return NS_OK; } +// Return true if aURI's scheme is white listed, in which case +// getFirstPartyURI() will not require that the firstPartyURI contains a host. +bool ThirdPartyUtil::SchemeIsWhiteListed(nsIURI *aURI) +{ + if (!aURI) + return false; + + nsCAutoString scheme; + nsresult rv = aURI->GetScheme(scheme); + NS_ENSURE_SUCCESS(rv, false); + + return (scheme.Equals("about") || scheme.Equals("moz-safe-about") + || scheme.Equals("chrome")); +} + // Get the URI associated with a window. already_AddRefed<nsIURI> ThirdPartyUtil::GetURIFromWindow(nsIDOMWindow* aWin) @@ -307,6 +325,21 @@ ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, // for sure if (aChannel) { rv = mCookiePermissions->GetOriginatingURI(aChannel, aOutput); + 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. + nsCAutoString scheme; + nsresult rv2 = (*aOutput)->GetScheme(scheme); + NS_ENSURE_SUCCESS(rv2, rv2); + if (scheme.Equals("file") || scheme.Equals("jar")) { + nsCOMPtr<nsIURI> originalURI; + rv2 = aChannel->GetOriginalURI(getter_AddRefs(originalURI)); + if (NS_SUCCEEDED(rv2) && originalURI) { + NS_RELEASE(*aOutput); + NS_ADDREF(*aOutput = originalURI); + } + } + } } // If the channel was missing, closed or broken, try the @@ -340,6 +373,41 @@ ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, rv = NS_OK; } + if (*aOutput && !SchemeIsWhiteListed(*aOutput)) { + // If URI scheme is not whitelisted and the URI lacks a hostname, force a + // failure. + nsCAutoString host; + rv = (*aOutput)->GetHost(host); + if (NS_SUCCEEDED(rv) && (host.Length() == 0)) { + rv = NS_ERROR_FAILURE; + } + } + + // Log failure to error console. + if (NS_FAILED(rv)) { + nsCOMPtr<nsIConsoleService> console + (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); + if (console) { + nsCString spec; + if (*aOutput) + (*aOutput)->GetSpec(spec); + if (spec.Length() > 0) { + nsPrintfCString msg("getFirstPartyURI: no host in first party URI %s", + spec.get()); // TODO: L10N + console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); + } else { + nsPrintfCString msg("getFirstPartyURI failed: 0x%x", rv); + console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); + } + } + + if (*aOutput) { + // discard return object. + (*aOutput)->Release(); + *aOutput = nullptr; + } + } + // TODO: We could provide a route through the loadgroup + notification // callbacks too, but either channel or document was always available // in the cases where this function was originally needed (the image cache). @@ -350,3 +418,45 @@ ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, return rv; } +NS_IMETHODIMP +ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, + nsACString& aHost) +{ + if (!aFirstPartyURI) + return NS_ERROR_INVALID_ARG; + + if (!SchemeIsWhiteListed(aFirstPartyURI)) { + nsresult rv = aFirstPartyURI->GetHost(aHost); + return (aHost.Length() > 0) ? NS_OK : rv; + } + + // This URI lacks a host, so construct and return a pseudo-host. + aHost = "--NoFirstPartyHost-"; + + // Append the scheme. To ensure that the pseudo-hosts are consistent + // when the hacky "moz-safe-about" scheme is used, map it back to "about". + nsCAutoString scheme; + nsresult rv = aFirstPartyURI->GetScheme(scheme); + NS_ENSURE_SUCCESS(rv, rv); + if (scheme.Equals("moz-safe-about")) + aHost.Append("about"); + else + aHost.Append(scheme); + + // Append the URL's file name (e.g., -browser.xul) or its path (e.g., + // -home for about:home) + nsCAutoString s; + nsCOMPtr<nsIURL> url = do_QueryInterface(aFirstPartyURI); + if (url) + url->GetFileName(s); + else + aFirstPartyURI->GetPath(s); + + if (s.Length() > 0) { + aHost.Append("-"); + aHost.Append(s); + } + + aHost.Append("--"); + return NS_OK; +} diff --git a/content/base/src/ThirdPartyUtil.h b/content/base/src/ThirdPartyUtil.h index fe7b214..3cf442e 100644 --- a/content/base/src/ThirdPartyUtil.h +++ b/content/base/src/ThirdPartyUtil.h @@ -27,6 +27,7 @@ public: private: nsresult IsThirdPartyInternal(const nsCString& aFirstDomain, nsIURI* aSecondURI, bool* aResult); + bool SchemeIsWhiteListed(nsIURI *aURI); static already_AddRefed<nsIURI> GetURIFromWindow(nsIDOMWindow* aWin); nsCOMPtr<nsIEffectiveTLDService> mTLDService; diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl b/netwerk/base/public/mozIThirdPartyUtil.idl index 963385c..b602ac3 100644 --- a/netwerk/base/public/mozIThirdPartyUtil.idl +++ b/netwerk/base/public/mozIThirdPartyUtil.idl @@ -157,10 +157,32 @@ interface mozIThirdPartyUtil : nsISupports * An arbitrary third party document. Can be null. * * @return the first party url bar URI for the load. + * + * @throws if the URI cannot be obtained or the URI lacks a hostname and the + * URI's scheme is not white listed. */ nsIURI getFirstPartyURI(in nsIChannel aChannel, in nsIDocument aDoc); + /** + * getFirstPartyHostForIsolation + * + * Obtain the host or pseudo-host for aFirstPartyURI. Some examples: + * aFirstPartyURI Return Value + * -------------- ------------ + * https://news.google.com/nwshp?hl=en "news.google.com" + * about:home "--NoFirstPartyHost-about-home--" + * chrome://browser/content/browser.xul "--NoFirstPartyHost-chrome-browser.xul--" + * + * @param aFirstPartyURI + * The first party URI. + * + * @return host or pseudo host. + * + * @throws if the URI lacks a host and the scheme is not a whitelisted one + * for which we generate a pseudo host. + */ + AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI); }; %{ C++

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Isolate DOM storage to first party URI
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit 6627ae06096197c94a5ad1a9d45d17a9ec144828 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 19:29:23 2013 -0700 fixup! Isolate DOM storage to first party URI Make DOM Storage isolation use the simpler GetFirstPartyURI call. --- docshell/base/nsDocShell.cpp | 21 +++++++------- dom/src/storage/nsDOMStorageDBWrapper.cpp | 45 ++++++++++++++++------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 6e9c6aa..1cef3f9 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -12459,15 +12459,15 @@ nsDocShell::GetSessionStorageKey(nsIURI *aFirstPartyURI, if (!aOrigin) return NS_ERROR_FAILURE; + nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = + do_GetService(THIRDPARTYUTIL_CONTRACTID); + if (!thirdPartyUtil) + return NS_ERROR_FAILURE; + aResult.Append(aOrigin); nsCOMPtr<nsIURI> firstPartyURI = aFirstPartyURI; if (!firstPartyURI) { - nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = - do_GetService(THIRDPARTYUTIL_CONTRACTID); - if (!thirdPartyUtil) - return NS_ERROR_FAILURE; - nsCOMPtr<nsIDocument> doc(do_GetInterface(GetAsSupports(this))); nsresult rv = thirdPartyUtil->GetFirstPartyURI(nullptr, doc, getter_AddRefs(firstPartyURI)); @@ -12475,11 +12475,12 @@ nsDocShell::GetSessionStorageKey(nsIURI *aFirstPartyURI, } nsCAutoString host; - nsresult rv = firstPartyURI->GetHost(host); - if (NS_SUCCEEDED(rv) && (host.Length() > 0)) { - aResult.AppendLiteral("&"); - aResult.Append(host); - } + nsresult rv = thirdPartyUtil->GetFirstPartyHostForIsolation(firstPartyURI, + host); + NS_ENSURE_SUCCESS(rv, rv); + + aResult.AppendLiteral("&"); + aResult.Append(host); return NS_OK; } diff --git a/dom/src/storage/nsDOMStorageDBWrapper.cpp b/dom/src/storage/nsDOMStorageDBWrapper.cpp index 048738a..04942fd 100644 --- a/dom/src/storage/nsDOMStorageDBWrapper.cpp +++ b/dom/src/storage/nsDOMStorageDBWrapper.cpp @@ -17,6 +17,7 @@ #include "mozIStorageService.h" #include "mozIStorageValueArray.h" #include "mozIStorageFunction.h" +#include "mozIThirdPartyUtil.h" #include "nsPrintfCString.h" #include "nsNetUtil.h" @@ -243,6 +244,9 @@ nsresult nsDOMStorageDBWrapper::CreateOriginScopeDBKey(nsIURI *aFirstPartyURI, nsIURI* aUri, nsACString& aKey) { + if (!aFirstPartyURI) + return NS_ERROR_FAILURE; + nsresult rv; rv = CreateDomainScopeDBKey(aUri, aKey); @@ -262,16 +266,15 @@ nsDOMStorageDBWrapper::CreateOriginScopeDBKey(nsIURI *aFirstPartyURI, aKey.Append(nsPrintfCString("%d", port)); } - // Isolate scope keys to the URL bar domain by appending &firstPartyHost - // if available. - if (aFirstPartyURI) { - nsCAutoString host; - rv = aFirstPartyURI->GetHost(host); - if (NS_SUCCEEDED(rv) && (host.Length() > 0)) { - aKey.AppendLiteral("&"); - aKey.Append(host); - } - } + // Isolate scope keys to the URL bar domain by appending &firstPartyHost. + nsCAutoString host; + nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = + do_GetService(THIRDPARTYUTIL_CONTRACTID); + rv = thirdPartyUtil->GetFirstPartyHostForIsolation(aFirstPartyURI, host); + NS_ENSURE_SUCCESS(rv, rv); + + aKey.AppendLiteral("&"); + aKey.Append(host); return NS_OK; } @@ -332,6 +335,9 @@ nsDOMStorageDBWrapper::CreateQuotaDomainDBKey(nsIURI *aFirstPartyURI, bool aEffectiveTLDplus1Only, nsACString& aKey) { + if (!aFirstPartyURI) + return NS_ERROR_FAILURE; + nsresult rv; nsCAutoString subdomainsDBKey; @@ -361,16 +367,15 @@ nsDOMStorageDBWrapper::CreateQuotaDomainDBKey(nsIURI *aFirstPartyURI, if (!aIncludeSubDomains) subdomainsDBKey.AppendLiteral(":"); - // Isolate quota keys to the URL bar domain by appending &firstPartyHost - // if available. - if (aFirstPartyURI) { - nsCAutoString host; - rv = aFirstPartyURI->GetHost(host); - if (NS_SUCCEEDED(rv) && (host.Length() > 0)) { - subdomainsDBKey.AppendLiteral("&"); - subdomainsDBKey.Append(host); - } - } + // Isolate scope keys to the URL bar domain by appending &firstPartyHost. + nsCAutoString host; + nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = + do_GetService(THIRDPARTYUTIL_CONTRACTID); + rv = thirdPartyUtil->GetFirstPartyHostForIsolation(aFirstPartyURI, host); + NS_ENSURE_SUCCESS(rv, rv); + + subdomainsDBKey.AppendLiteral("&"); + subdomainsDBKey.Append(host); aKey.Assign(subdomainsDBKey); return NS_OK;

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Isolate the Image Cache per url bar domain.
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit a7d5d182fe32eb7f5ae8d3149e5f0c7f3dbfb11b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 19:30:06 2013 -0700 fixup! Isolate the Image Cache per url bar domain. Make the image cache use the simplified GetFirstPartyURI API. --- image/src/imgLoader.cpp | 80 ++++++++++++++++++++++------------------------ image/src/imgLoader.h | 5 ++- image/src/imgRequest.cpp | 2 +- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp index 8e52af8..3a26cf4 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -59,7 +59,6 @@ #include "nsIHttpChannelInternal.h" #include "nsIContentSecurityPolicy.h" #include "nsIChannelPolicy.h" -#include "mozIThirdPartyUtil.h" #include "nsContentUtils.h" @@ -779,6 +778,8 @@ imgCacheQueue imgLoader::sChromeCacheQueue; double imgLoader::sCacheTimeWeight; uint32_t imgLoader::sCacheMaxSize; +nsCOMPtr<mozIThirdPartyUtil> imgLoader::sThirdPartyUtilSvc; + NS_IMPL_ISUPPORTS5(imgLoader, imgILoader, nsIContentSniffer, imgICache, nsISupportsWeakReference, nsIObserver) imgLoader::imgLoader() @@ -879,6 +880,8 @@ nsresult imgLoader::Init() if (obService) obService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); + sThirdPartyUtilSvc = do_GetService(THIRDPARTYUTIL_CONTRACTID); + return NS_OK; } @@ -992,6 +995,7 @@ void imgLoader::Shutdown() NS_IF_RELEASE(gCacheObserver); delete gCacheTracker; gCacheTracker = nullptr; + sThirdPartyUtilSvc = nullptr; } nsresult imgLoader::ClearChromeImageCache() @@ -1103,7 +1107,7 @@ bool imgLoader::SetHasProxies(nsIURI *firstPartyURI, nsIURI *imgURI) LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::SetHasProxies", "uri", spec.get()); - nsCAutoString key = GetCacheKey(firstPartyURI, imgURI); + nsCAutoString key = GetCacheKey(firstPartyURI, imgURI, nullptr); nsRefPtr<imgCacheEntry> entry; if (cache.Get(key, getter_AddRefs(entry)) && entry && entry->HasNoProxies()) { imgCacheQueue &queue = GetCacheQueue(imgURI); @@ -1462,7 +1466,7 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) if (imgURI) { imgCacheTable &cache = GetCache(imgURI); imgCacheQueue &queue = GetCacheQueue(imgURI); - nsCAutoString spec = GetCacheKey(firstPartyURI, imgURI); + nsCAutoString spec = GetCacheKey(firstPartyURI, imgURI, nullptr); LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "entry's uri", spec.get()); @@ -1548,7 +1552,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, if (!aURI) return NS_ERROR_NULL_POINTER; - nsCAutoString spec = GetCacheKey(aFirstPartyURI, aURI); + bool isIsolated = false; + nsCAutoString spec = GetCacheKey(aFirstPartyURI, aURI, &isIsolated); LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get()); @@ -1710,8 +1715,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, return openRes; } - // Try to add the new request into the cache. - PutIntoCache(spec, entry); + if (isIsolated) // Try to add the new request into the cache. + PutIntoCache(spec, entry); } else { LOG_MSG_WITH_PARAM(gImgLog, "imgLoader::LoadImage |cache hit|", "request", request); @@ -1771,41 +1776,26 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, return NS_OK; } -nsCAutoString imgLoader::GetCacheKey(nsIURI *firstPartyURI, nsIURI *imgURI) +nsCAutoString imgLoader::GetCacheKey(nsIURI *firstPartyURI, nsIURI *imgURI, + bool *isIsolated) { NS_ASSERTION(imgURI, "imgLoader::GetCacheKey -- NULL imgURI"); + if (isIsolated) + *isIsolated = false; - nsCAutoString spec, hostKey; + nsCAutoString spec; if (imgURI) imgURI->GetSpec(spec); -#if 0 - bool isChrome = false; - if (imgURI) - imgURI->SchemeIs("chrome", &isChrome); - if (isChrome) - return spec; // No partitioning needed for chrome; just use a simple key. -#endif + nsCAutoString hostKey; + if (firstPartyURI && sThirdPartyUtilSvc) + sThirdPartyUtilSvc->GetFirstPartyHostForIsolation(firstPartyURI, hostKey); - // FIXME: Should we use mozIThirdPartyUtil to get a domain from this? - if (firstPartyURI) - firstPartyURI->GetHost(hostKey); - else { + if (hostKey.Length() > 0) { + if (isIsolated) + *isIsolated = true; + } else hostKey = "--NoFirstParty--"; - nsCOMPtr<nsIConsoleService> consoleSvc = - do_GetService(NS_CONSOLESERVICE_CONTRACTID); - if (consoleSvc) { - nsAutoString msg(NS_LITERAL_STRING( - "imgLoader::GetCacheKey: NULL firstPartyURI for ") - .get()); - msg.AppendASCII(spec.get()); - consoleSvc->LogStringMessage(msg.get()); - } - -#ifdef DEBUG - printf("imgLoader::GetCacheKey: NULL firstPartyURI for %s\n", spec.get()); -#endif - } // Make a new key using host // FIXME: This might involve a couple more copies than necessary.. @@ -1819,23 +1809,24 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb { NS_ASSERTION(channel, "imgLoader::LoadImageWithChannel -- NULL channel pointer"); + if (!sThirdPartyUtilSvc) + return NS_ERROR_FAILURE; + nsRefPtr<imgRequest> request; nsCOMPtr<nsIURI> uri; channel->GetURI(getter_AddRefs(uri)); nsCOMPtr<nsIURI> firstPartyURI; - nsCOMPtr<mozIThirdPartyUtil> thirdPartySvc - = do_GetService(THIRDPARTYUTIL_CONTRACTID); - thirdPartySvc->GetFirstPartyURI(channel, nullptr, - getter_AddRefs(firstPartyURI)); + sThirdPartyUtilSvc->GetFirstPartyURI(channel, nullptr, + getter_AddRefs(firstPartyURI)); nsLoadFlags requestFlags = nsIRequest::LOAD_NORMAL; channel->GetLoadFlags(&requestFlags); nsRefPtr<imgCacheEntry> entry; imgCacheTable &cache = GetCache(uri); - nsCAutoString spec = GetCacheKey(firstPartyURI, uri); + nsCAutoString spec = GetCacheKey(firstPartyURI, uri, nullptr); if (requestFlags & nsIRequest::LOAD_BYPASS_CACHE) { imgCacheQueue &queue = GetCacheQueue(uri); @@ -1927,8 +1918,10 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb NS_RELEASE(pl); - // Try to add the new request into the cache. - PutIntoCache(GetCacheKey(firstPartyURI, originalURI), entry); + bool isIsolated = false; + nsCAutoString key = GetCacheKey(firstPartyURI, originalURI, &isIsolated); + if (isIsolated) // Try to add the new request into the cache. + PutIntoCache(key, entry); rv = CreateNewProxyForRequest(request, loadGroup, aObserver, requestFlags, nullptr, _retval); @@ -2234,8 +2227,11 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport // Try to add the new request into the cache. Note that the entry must be in // the cache before the proxies' ownership changes, because adding a proxy // changes the caching behaviour for imgRequests. - sImgLoader.PutIntoCache(imgLoader::GetCacheKey(firstPartyURI, originalURI), - mNewEntry); + bool isIsolated = false; + nsCAutoString key = imgLoader::GetCacheKey(firstPartyURI, originalURI, + &isIsolated); + if (isIsolated) + sImgLoader.PutIntoCache(key, mNewEntry); uint32_t count = mProxies.Count(); for (int32_t i = count-1; i>=0; i--) { diff --git a/image/src/imgLoader.h b/image/src/imgLoader.h index c275d83..3e91edb 100644 --- a/image/src/imgLoader.h +++ b/image/src/imgLoader.h @@ -22,6 +22,7 @@ #include "nsIChannelPolicy.h" #include "nsIProgressEventSink.h" #include "nsIChannel.h" +#include "mozIThirdPartyUtil.h" #ifdef LOADER_THREADSAFE #include "prlock.h" @@ -228,7 +229,8 @@ public: static nsresult InitCache(); static nsCAutoString GetCacheKey(nsIURI *firstPartyURI, - nsIURI *imgURI); + nsIURI *imgURI, + bool *isIsolated); static bool RemoveFromCache(imgCacheEntry *entry); static bool PutIntoCache(nsCAutoString key, imgCacheEntry *entry); static bool RemoveMatchingUrlsFromCache(nsIURI *aKey); @@ -333,6 +335,7 @@ private: // data static double sCacheTimeWeight; static uint32_t sCacheMaxSize; + static nsCOMPtr<mozIThirdPartyUtil> sThirdPartyUtilSvc; nsCString mAcceptHeader; }; diff --git a/image/src/imgRequest.cpp b/image/src/imgRequest.cpp index 71afe2c..5b5232a 100644 --- a/image/src/imgRequest.cpp +++ b/image/src/imgRequest.cpp @@ -334,7 +334,7 @@ void imgRequest::RemoveFromCache() else { imgLoader::RemoveKeyFromCache(imgLoader::GetCache(mURI), imgLoader::GetCacheQueue(mURI), - imgLoader::GetCacheKey(mFirstPartyURI, mURI)); + imgLoader::GetCacheKey(mFirstPartyURI, mURI, nullptr)); } }

1 0

[tor/master] Fix a bug in our bug 9776 fix.
by nickm＠torproject.org 03 Oct '13

03 Oct '13

commit 557f3329575cd6d1a2dd36fa8fb9cf0ac0b3f721 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 2 21:42:24 2013 -0400 Fix a bug in our bug 9776 fix. By calling circuit_n_chan_done() unconditionally on close, we were closing pending connections that might not have been pending quite for the connection we were closing. Fix for bug 9880. Thanks to skruffy for finding this and explaining it patiently until we understood. --- changes/bug9880 | 8 ++++++++ src/or/channel.c | 7 ++++++- src/or/channel.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/bug9880 b/changes/bug9880 new file mode 100644 index 0000000..a7dda8f --- /dev/null +++ b/changes/bug9880 @@ -0,0 +1,8 @@ + o Minor bugfixes: + + - When closing a channel that has already been open, do not close + pending circuits that were waiting to connect to the same relay. + Fixes bug 9880; bugfix on 0.2.5.1-alpha. Thanks to skruffy for + finding this bug. (Bug was merged to 0.2.4 branch but not released + in any 0.2.4 version) + diff --git a/src/or/channel.c b/src/or/channel.c index 1fb39b8..1270eac 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -743,6 +743,9 @@ channel_init(channel_t *chan) /* Timestamp it */ channel_timestamp_created(chan); + + /* It hasn't been open yet. */ + chan->has_been_open = 0; } /** @@ -1294,7 +1297,8 @@ channel_closed(channel_t *chan) /* Inform any pending (not attached) circs that they should * give up. */ - circuit_n_chan_done(chan, 0); + if (! chan->has_been_open) + circuit_n_chan_done(chan, 0); /* Now close all the attached circuits on it. */ circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED); @@ -1935,6 +1939,7 @@ channel_change_state(channel_t *chan, channel_state_t to_state) /* Tell circuits if we opened and stuff */ if (to_state == CHANNEL_STATE_OPEN) { channel_do_open_actions(chan); + chan->has_been_open = 1; /* Check for queued cells to process */ if (! TOR_SIMPLEQ_EMPTY(&chan->incoming_queue)) diff --git a/src/or/channel.h b/src/or/channel.h index 0933ec8..2dca817 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -46,6 +46,9 @@ struct channel_s { /* Should we expect to see this channel in the channel lists? */ unsigned char registered:1; + /** has this channel ever been open? */ + unsigned int has_been_open:1; + /** Why did we close? */ enum {

1 0

[tor/master] Merge branch 'bug9880_fix' into maint-0.2.4
by nickm＠torproject.org 03 Oct '13

03 Oct '13

commit 0bec65277abed5567458e94c05c2b94f1b84e460 Merge: 938ee9b 557f332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 2 22:39:27 2013 -0400 Merge branch 'bug9880_fix' into maint-0.2.4 changes/bug9880 | 8 ++++++++ src/or/channel.c | 7 ++++++- src/or/channel.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 03 Oct '13

03 Oct '13

commit 566645b5edb25aec55e6dffaf6f522456f661a9e Merge: e65b54e 0bec652 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 2 22:40:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9880 | 8 ++++++++ src/or/channel.c | 7 ++++++- src/or/channel.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-)

1 0