November 2014 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-31.2.0esr-4.5-1] Bug 13742: Isolate cache to URL bar domain.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 8425b9a358211777543303d2194b378b2765f144 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 16:16:40 2014 -0800 Bug 13742: Isolate cache to URL bar domain. --- netwerk/protocol/http/nsHttpChannel.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 41ef8bb..6e8fa0b 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -66,6 +66,7 @@ #include "nsPerformance.h" #include "CacheObserver.h" #include "mozilla/Telemetry.h" +#include "mozIThirdPartyUtil.h" namespace mozilla { namespace net { @@ -2558,6 +2559,19 @@ nsHttpChannel::OpenCacheEntry(bool usingSSL) nsRefPtr<LoadContextInfo> info = GetLoadContextInfo(this); nsCOMPtr<nsICacheStorage> cacheStorage; nsCOMPtr<nsIURI> openURI; + + /* Obtain optional third party isolation domain */ + nsAutoCString cacheDomain; + nsCOMPtr<nsIURI> firstPartyIsolationURI; + nsCOMPtr<mozIThirdPartyUtil> thirdPartySvc + = do_GetService(THIRDPARTYUTIL_CONTRACTID); + rv = thirdPartySvc->GetFirstPartyIsolationURI(this, nullptr, + getter_AddRefs(firstPartyIsolationURI)); + if (NS_SUCCEEDED(rv) && firstPartyIsolationURI) { + thirdPartySvc->GetFirstPartyHostForIsolation(firstPartyIsolationURI, + cacheDomain); + } + if (!mFallbackKey.IsEmpty() && mFallbackChannel) { // This is a fallback channel, open fallback URI instead rv = NS_NewURI(getter_AddRefs(openURI), mFallbackKey); @@ -2612,7 +2626,7 @@ nsHttpChannel::OpenCacheEntry(bool usingSSL) cacheEntryOpenFlags |= nsICacheStorage::OPEN_BYPASS_IF_BUSY; rv = cacheStorage->AsyncOpenURI( - openURI, mPostID ? nsPrintfCString("%d", mPostID) : EmptyCString(), + openURI, nsPrintfCString("%s@%d", cacheDomain.get(), mPostID), cacheEntryOpenFlags, this); NS_ENSURE_SUCCESS(rv, rv); @@ -2647,7 +2661,7 @@ bypassCacheEntryOpen: NS_ENSURE_SUCCESS(rv, rv); rv = cacheStorage->AsyncOpenURI( - mURI, EmptyCString(), nsICacheStorage::OPEN_TRUNCATE, this); + mURI, cacheDomain, nsICacheStorage::OPEN_TRUNCATE, this); NS_ENSURE_SUCCESS(rv, rv); waitFlags.Keep(WAIT_FOR_OFFLINE_CACHE_ENTRY);

1 0

[globe/master] Change README links to point to Tor Project's gitweb.
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit cceed8c04eaa469d0806f4307de5433e53d781ec Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:41:52 2014 +0000 Change README links to point to Tor Project's gitweb. --- src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 9306db8..5ae6e1e 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -42,7 +42,7 @@ <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. - More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://github.com/makepanic/globe/blob/master/README.md">README</a>. + More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/blob/HEAD:/README.md">README</a>. </p> <h3>Why JavaScript</h3> diff --git a/src/js/templates/index.hbs b/src/js/templates/index.hbs index e4b5912..8738a85 100644 --- a/src/js/templates/index.hbs +++ b/src/js/templates/index.hbs @@ -9,7 +9,7 @@ <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. - More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://github.com/makepanic/globe/blob/master/README.md">README</a>. + More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/blob/HEAD:/README.md">README</a>. </p> </div> </div>

1 0

[globe/master] Change Vagrantfile links to point to Tor Project gitweb.
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit 6bee6e91eb4b8e9592d77f0c7b62041e3b600353 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:40:43 2014 +0000 Change Vagrantfile links to point to Tor Project gitweb. --- README.md | 2 +- src/js/templates/code.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d70217..3bee78d 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Globe is tested and build with nodejs (0.10.x). For an easy overview on how to i [Installing Node.js via package manager](https://github.com/joyent/node/wiki/Installing-Node.js-via-package…. In addition to that, globe can be built in a virtual machine that is managed using [Vagrant](http://www.vagrantup.com/). -To make it easier for you, we provide a [Vagrantfile](https://github.com/makepanic/globe/blob/master/Vagrantfile) that builds an ubuntu (12.04) virtual machine +To make it easier for you, we provide a [Vagrantfile](https://gitweb.torproject.org/globe.git/blob/HEAD:/Vagrantfile) that builds an ubuntu (12.04) virtual machine with everything necessary for developing and building globe. If you have vagrant installed run `vagrant up` and wait until everything is ready. Connect to your running virtual machine via `vagrant ssh`. diff --git a/src/js/templates/code.hbs b/src/js/templates/code.hbs index 730b803..246edfc 100644 --- a/src/js/templates/code.hbs +++ b/src/js/templates/code.hbs @@ -79,7 +79,7 @@ <div class="text-content"> <h3>Building globe</h3> - <p>To provide a reproducible development environment we created a <a href="https://github.com/makepanic/globe/blob/master/Vagrantfile">Vagrantfile</a>, which uses + <p>To provide a reproducible development environment we created a <a href="https://gitweb.torproject.org/globe.git/blob/HEAD:/Vagrantfile">Vagrantfile</a>, which uses <a href="http://www.vagrantup.com/">Vagrant</a> to bootstrap an ubuntu 12.04 virtual machine with everything necessary for developing and building globe.</p> <p>To start the virtual machine run <i>vagrant up</i> and wait for it to finish. Once it is ready access the virtual machine via <i>vagrant ssh</i>.

1 0

[globe/master] Why tell users to upgrade their browser to anything but Tor Browser?
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit 61c8cced3cfc9ca2dc10fd30104316422add113d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:44:32 2014 +0000 Why tell users to upgrade their browser to anything but Tor Browser? --- src/html/index.raw.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 5fcaa55..16fe348 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -27,7 +27,7 @@ </head> <body>

1 0

[globe/master] Remove links to deprecated/non-existent Google Chromeframe project.
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit 6624ad225817843ff45c6745e0434b2255aa8a4f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:46:29 2014 +0000 Remove links to deprecated/non-existent Google Chromeframe project. --- src/html/index.raw.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 16fe348..893fbb1 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -28,8 +28,7 @@ <body>  <noscript>

1 0

[globe/master] Add TPI copyright to LICENSE.txt.
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit 2d06bc821d155df9420d0f5fb35a3d53d9a2af4a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:39:18 2014 +0000 Add TPI copyright to LICENSE.txt. --- LICENSE.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 7586371..51f4d6b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,5 @@ Copyright (c) 2013 Christian Schulz, https://github.com/makepanic/globe +Copyright (c) 2014 The Tor Project, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -17,4 +18,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

1 0

[globe/master] Change links to source code to point to Tor Project's gitweb.
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit 0acefb33d2cb744dbc7c13a3af22f859ede3b414 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:42:40 2014 +0000 Change links to source code to point to Tor Project's gitweb. --- src/html/index.raw.html | 2 +- src/js/templates/application.hbs | 2 +- src/js/templates/code.hbs | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 5ae6e1e..5fcaa55 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -49,7 +49,7 @@ <p>Globe doesn't store any information about relays or bridges on its server. After loading the JavaScript code once, Globe only requests additional data from the Onionoo-API. Processing the resulting data in your browser without JavaScript is impossible.</p> - <p>If you don't trust the minified code or have more questions, you are welcome to inspect the code at <a href="https://github.com/makepanic/globe">github</a> or drop me an email <i>me (AT) rndm (DOT) de</i></p> + <p>If you don't trust the minified code or have more questions, you are welcome to inspect the code at <a href="https://gitweb.torproject.org/globe.git">the Tor Project's gitweb</a> or <a href="mailto:tor-assistants@lists.torproject.org">drop an email</a>.</p> </div> </div> </noscript> diff --git a/src/js/templates/application.hbs b/src/js/templates/application.hbs index 2fb85f3..18ebd02 100644 --- a/src/js/templates/application.hbs +++ b/src/js/templates/application.hbs @@ -34,7 +34,7 @@ <div class="pure-u-1"> <div class="text-content"> <p class="no-width-limit"> - Want to <a href="https://trac.torproject.org/projects/tor/newticket?component=Globe">report a bug</a>, contribute or view the source? Check out the repository <a href="https://github.com/makepanic/globe">on <i class="fa fa-github-alt"></i> github</a>. + Want to <a href="https://trac.torproject.org/projects/tor/newticket?component=Globe">report a bug</a>, contribute or view the source? Check out the repository <a href="https://gitweb.torproject.org/globe.git">on the Tor Project's gitweb</a>. "Tor" and the "Onion Logo" are registered trademarks of The Tor Project, Inc. </p> </div> diff --git a/src/js/templates/code.hbs b/src/js/templates/code.hbs index 246edfc..0209b52 100644 --- a/src/js/templates/code.hbs +++ b/src/js/templates/code.hbs @@ -6,12 +6,10 @@ <div class="pure-u-1-2"> <div class="text-content"> <h3>Getting the code</h3> - <p>Globe is an open source application licensed under <a href="http://opensource.org/licenses/MIT">MIT License</a>. All of its code is available on <a href="https://github.com/makepanic/globe"><i class="fa fa-github-alt"></i> github</a>.</p> + <p>Globe is an open source application licensed under <a href="http://opensource.org/licenses/MIT">MIT License</a>. All of its code is available on <a href="https://gitweb.torproject.org/globe.git">the Tor Project's gitweb</a>.</p> <p>You can clone the project via:</p> <ul> - <li><strong>git</strong> <code>https://github.com/makepanic/globe.git</code></li> - <li><strong>git</strong> <code>git@github.com:makepanic/globe.git</code></li> - <li><strong>svn</strong> <code>https://github.com/makepanic/globe</code></li> + <li><strong>git</strong> <code>https://git.torproject.org/globe.git</code></li> </ul> <h3>Used Libraries</h3>

1 0

[globe/master] Merge pull request #1 from Syrup-tan/trac-12933
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit c502fdf5ebb9a50e722b88416125b2820d1b30ac Merge: 8411f2a b7ad9c0 Author: Syrup-tan <syrup+git(a)denpa.moe> Date: Tue Nov 11 14:50:04 2014 -0800 Merge pull request #1 from Syrup-tan/trac-12933 Fixing Onionoo-API link src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[globe/master] Merge pull request #2 from Syrup-tan/trac-13355
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit eb6eb580daa23fd5afd8b8de1cea27414e8da7b1 Merge: c502fdf 1aec5a2 Author: Syrup-tan <syrup+git(a)denpa.moe> Date: Tue Nov 11 15:01:05 2014 -0800 Merge pull request #2 from Syrup-tan/trac-13355 Fixing french flag res/assets/img/country-flag-atlas.png | Bin 101396 -> 80634 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[globe/master] Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master
by isis＠torproject.org 12 Nov '14

12 Nov '14

commit b6133fa5389e985bf41a44bbabaae0366968a946 Merge: 77cb5a5 5472eba Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:05:53 2014 +0000 Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0