- tor-commits - lists.torproject.org

[flashproxy/master] Handle old-style socket.error in EPIPE handler.
by dcf＠torproject.org 21 Aug '11

21 Aug '11

commit 8d677ae0584524bbaa9a54cf953afd9291e72203 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Aug 21 05:33:38 2011 -0400 Handle old-style socket.error in EPIPE handler. --- facilitator.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/facilitator.py b/facilitator.py index f7a4ba9..bea3957 100755 --- a/facilitator.py +++ b/facilitator.py @@ -319,7 +319,14 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): try: fn(self, *args) except socket.error, e: - if e.errno != errno.EPIPE: + try: + err_num = e.errno + except AttributeError: + # Before Python 2.6, exception can be a pair. + err_num, errstr = e + except: + raise + if err_num != errno.EPIPE: raise log(u"%s broken pipe" % format_addr(self.client_address)) return ret

1 0

[flashproxy/master] Lowercase "flash" when we're not specifically talking about Adobe Flash.
by dcf＠torproject.org 21 Aug '11

21 Aug '11

commit b4d17e5b2a2054c888ad26cc2aeb603bde2acb30 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Aug 21 02:06:22 2011 -0700 Lowercase "flash" when we're not specifically talking about Adobe Flash. --- README | 8 ++++---- design.txt | 46 +++++++++++++++++++++++----------------------- facilitator.py | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README b/README index cd6b7dd..c0c8f6f 100644 --- a/README +++ b/README @@ -1,15 +1,15 @@ == Introduction This is a set of tools that make it possible to connect Tor through an -Adobe Flash proxy running on another computer. The Flash proxy can be +browser-based proxy running on another computer. The flash proxy can be run just by opening a web page in a computer that has Flash Player installed. There are five main parts. Our terminology for each part is in quotes. 1. The Tor "client," running on someone's localhost. -2. A "connector," which waits for connections from the Flash proxy and +2. A "connector," which waits for connections from the flash proxy and the Tor client, and joins them together. -3. A Flash "proxy," running in someone's web browser. This piece is +3. A "flash proxy," running in someone's web browser. This piece is called swfcat because it is like a netcat implemented in Flash. 4. A "facilitator," a pseudo-HTTP server that keeps a list of clients that want a connection, and hands them out to proxies. @@ -139,7 +139,7 @@ Clients register with the facilitator by sending an HTTP message: POST / HTTP/1.0\r\n \r\n client=<ip-addr/rtmfp-id> -The Flash proxy also gets a client address over HTTP: +The flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n The server sends back address specifications of a client and a relay in diff --git a/design.txt b/design.txt index 9b79724..f33468c 100644 --- a/design.txt +++ b/design.txt @@ -1,4 +1,4 @@ -Design of Flash proxies +Design of flash proxies 0. Problem statement @@ -13,7 +13,7 @@ Design of Flash proxies that themselves can reach the Tor network. We call this subset the unrestricted Internet. - A browser-based proxy (Flash proxy), running in a web page in the + A browser-based proxy (flash proxy), running in a web page in the unrestricted Internet, proxies connections between the restricted Internet and the Tor network. These proxies are expected to be temporary and short-lived, but their number will be great enough that @@ -23,7 +23,7 @@ Design of Flash proxies networking technologies is complicated by restrictions that prevent it being a straightforward proxy. Chief among these is the lack of listening sockets. Flash and, for example, WebSockets, can only - initiate outgoing connections, not receive incoming ones. The Flash + initiate outgoing connections, not receive incoming ones. The flash proxy can only connect to external hosts by connecting directly to them. The other significant restriction is that the proxy cannot connect to just any destination: Adobe Flash player requires the @@ -33,15 +33,15 @@ Design of Flash proxies 2. Components - Conceptually, each Flash proxy is nothing more than a simple proxy, + Conceptually, each flash proxy is nothing more than a simple proxy, which accepts connections from a client and forwards data to a server. But because of the limited networking facilities available to an in-browser application, several other pieces are needed. 1. Tor client: Is just ordinary Tor with a special configuration to - allow it to connect through a Flash proxy. It advertises its need + allow it to connect through a flash proxy. It advertises its need for a connection the the facilitator, and communicates with the - Flash proxy through the connector. + flash proxy through the connector. 2. Connector: Runs on the same computer as the Tor client. It opens one socket to the Internet and another to localhost. It waits for a connection on both sockets, then starts proxying data between them. @@ -50,13 +50,13 @@ Design of Flash proxies startup, the connector informs the facilitator that it is waiting for a connection. 3. Flash proxy: Runs in someone's browser, in an uncensored region of - the Internet. The Flash proxy first connects to the facilitator to + the Internet. The flash proxy first connects to the facilitator to get a client registration. It then makes two outgoing connections, one to a Tor relay and one to a waiting Tor client, and starts proxying data between them. 4. Facilitator: Keeps track of client registrations and hands them out to clients. It is capable of receiving client registrations in a - variety of ways. It sends registrations to Flash proxies over HTTP. + variety of ways. It sends registrations to flash proxies over HTTP. The facilitator is responsible for matching clients to proxies in a reasonable manner. 5. Tor relay: An ordinary Tor relay with no special configuration @@ -68,15 +68,15 @@ Design of Flash proxies 2. The restricted user starts Tor, which makes a SOCKS connection to the connector. 3. The connector notifies the facilitator that it needs a connection. - 4. An unrestricted user opens the web page containing the Flash proxy. - 5. The Flash proxy connects to the facilitator and asks for a client. + 4. An unrestricted user opens the web page containing the flash proxy. + 5. The flash proxy connects to the facilitator and asks for a client. 6. The facilitator sends one of its client registrations to the proxy. - 7. The Flash proxy connects to a Tor relay and to the waiting client + 7. The flash proxy connects to a Tor relay and to the waiting client connector. - 8. The connector receives the Flash proxy's connection and begins + 8. The connector receives the flash proxy's connection and begins relaying data between it and the Tor relay. - Later, the Flash proxy may go offline. Assuming that another Flash + Later, the flash proxy may go offline. Assuming that another flash proxy is available, it will receive the same client's address from the facilitator, and the local Tor client will reconnect to the client through it. @@ -89,19 +89,19 @@ Design of Flash proxies Bridge 127.0.0.1:9001 Socks4Proxy 127.0.0.1:9001 The address given for the "Bridge" option is actually irrelevant. The - connector will ignore it and connect (through the Flash proxy) to a + connector will ignore it and connect (through the flash proxy) to a Tor relay. The Tor client does not have control of its first hop. 6. Behavior of the connector The connector serves two purposes: It sends a registration message to - the facilitator and it carries data between a Flash proxy and the + the facilitator and it carries data between a flash proxy and the local Tor client. On startup, the connector sends a registration message to the facilitator, informing the facilitator that it is waiting for a connection. The facilitator will later hand this registration to a - Flash proxy. The registration message is an HTTP POST request of the + flash proxy. The registration message is an HTTP POST request of the form: POST / HTTP/1.0 @@ -121,19 +121,19 @@ Design of Flash proxies external address. The connector solves the impedance mismatch between the Tor client and - the Flash proxy, both of which want to make outgoing connections to + the flash proxy, both of which want to make outgoing connections to the other. The connector sits in between, listens for connections from both ends, and matches them together. The remote socket listens on port 9000 and the local on port 9001. The connector can serve a crossdomain policy in response to a - crossdomain request, allowing the Flash proxy to connect. On the local + crossdomain request, allowing the flash proxy to connect. On the local side, it acts as a SOCKS proxy (albeit one that always goes to the same destination). -7. Behavior of the Flash proxy +7. Behavior of the flash proxy - The Flash proxy polls the facilitator for client registrations. When + The flash proxy polls the facilitator for client registrations. When it receives a registration, it opens one connection to the given Tor relay, one to the given client, and begin proxying data between them. @@ -154,7 +154,7 @@ Design of Flash proxies The facilitator keeps the HTTP session alive and does not send a registration until one is available. - The Flash proxy may serve more than one relay–client pair at once. + The flash proxy may serve more than one relay–client pair at once. 8. Behavior of the facilitator @@ -163,11 +163,11 @@ Design of Flash proxies facilitator listens on port 9002. In the current implementation, the facilitator forgets a client - registration after giving it to a Flash proxy. The client must + registration after giving it to a flash proxy. The client must re-register if it wants another connection later. 9. Behavior of the Tor relay. The Tor relay requires no special configuration. It must also be - running a program that serves a crossdomain policy to allow a Flash + running a program that serves a crossdomain policy to allow a flash proxy to connect to it. diff --git a/facilitator.py b/facilitator.py index 86b924c..f7a4ba9 100755 --- a/facilitator.py +++ b/facilitator.py @@ -37,7 +37,7 @@ class options(object): def usage(f = sys.stdout): print >> f, """\ Usage: %(progname)s -r RELAY <OPTIONS> [HOST] [PORT] -Flash bridge facilitator: Register client addresses with HTTP POST requests +Flash proxy facilitator: Register client addresses with HTTP POST requests and serve them out again with HTTP GET. Listen on HOST and PORT, by default %(addr)s %(port)d. -d, --debug don't daemonize, log to stdout.

1 0

[vidalia/master] Make AutoControl default to false
by chiiph＠torproject.org 21 Aug '11

21 Aug '11

commit 609d8ebe98dad73723da6d1031121eb1b35979a3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Aug 20 23:59:45 2011 -0300 Make AutoControl default to false It's a bad idea to default to true. To enable set AutoControl=true under [Tor] in vidalia.conf or do it through the Advance Page in the Config. --- src/vidalia/config/TorSettings.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index 42e036f..d45d88e 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -93,7 +93,7 @@ TorSettings::TorSettings(TorControl *torControl) setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>()); setDefault(SETTING_BOOTSTRAP, false); setDefault(SETTING_BOOTSTRAP_FROM, ""); - setDefault(SETTING_AUTOCONTROL, true); + setDefault(SETTING_AUTOCONTROL, false); } /** Applies any changes to Tor's control port or authentication settings. */

1 0

[torbutton/master] Bug #3414: Apply referer policy to window.name.
by mikeperry＠torproject.org 21 Aug '11

21 Aug '11

commit 6de48e4c8c24ebccc5764930d285b904d84ef189 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 20 18:48:30 2011 -0700 Bug #3414: Apply referer policy to window.name. This keeps window.name reset when the user enters a new url by hand. It also blocks window.name entirely if you have disabled referers (which I think is what someone who disables referers probably wants). --- src/chrome/content/torbutton.js | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 80c8fa6..36d881e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -4177,7 +4177,7 @@ function torbutton_update_tags(win, new_loc) { // - http://swik.net/User:Staple/JavaScript+Popup+Windows+Generation+and+Testing… // - pure javascript pages/non-text/html pages // - Messing with variables/existing hooks -function torbutton_hookdoc(win, doc, state_change) { +function torbutton_hookdoc(win, doc, state_change, referrer) { if(typeof(win.wrappedJSObject) == 'undefined') { torbutton_eclog(3, "No JSObject: "+win.location); return; @@ -4187,6 +4187,21 @@ function torbutton_hookdoc(win, doc, state_change) { if(doc && doc.doctype) { torbutton_log(2, "Type: "+doc.doctype.name); } + + try { + // Ticket #3414: Apply referer policy to window.name. + // + // This keeps window.name clean between fresh urls. + // It should also apply to iframes because hookdoc gets called for all + // frames and subdocuments. + if (!referrer || referrer.spec == "") { + win.name = null; + win.window.name = null; + } + } catch(e) { + torbutton_log(4, "Failed to reset window.name: "+e) + } + var js_enabled = m_tb_prefs.getBoolPref("javascript.enabled"); @@ -4435,7 +4450,12 @@ function torbutton_check_progress(aProgress, aRequest, aFlags, new_loc) { if(doc) { var tag_change = torbutton_update_tags(DOMWindow.window, new_loc); if(doc.domain) { - torbutton_hookdoc(DOMWindow.window, doc, tag_change); + var referrer = null; + try { + var hreq = aRequest.QueryInterface(Ci.nsIHttpChannel); + referrer = hreq.referrer; + } catch(e) {} + torbutton_hookdoc(DOMWindow.window, doc, tag_change, referrer); } } } catch(e) {

1 0

[torbrowser/maint-2.2] put the right OS in the changelogs...
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit b4e560edf5af143643e525b3ffbe659b4ac2d6b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:31:47 2011 +0200 put the right OS in the changelogs... --- changelog.linux-2.2 | 2 +- changelog.win-2.2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 20d8bc5..dfd7fb8 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0 diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bde8ad4..bc070ec 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,4 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=osx +Tor Browser Bundle (2.2.30-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/maint-2.2] add missing commit for removal of betterprivacy from linux bundles
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit eb7dec6deef77535bcd8c12fffe509c3101b972b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:34:21 2011 +0200 add missing commit for removal of betterprivacy from linux bundles --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 0bcefb3..14c691b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torbrowser/maint-2.2] update build targets for better automatic building
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 6b2c454261728e45a8787e7062b7ad19f2338d48 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 03:10:20 2011 +0200 update build targets for better automatic building --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8859cd0..0bcefb3 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -124,7 +124,7 @@ copy-firefox: cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source -build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo +build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index ebd265d..0b07e67 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -113,7 +113,7 @@ copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app -build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor +build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." ## Location of compiled libraries diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e8991a2..28b7d82 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,9 @@ fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fe fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-qt: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) + fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)

1 0

[torbrowser/maint-2.2] add some missing makefile bits for linux
by erinn＠torproject.org 21 Aug '11

21 Aug '11

commit 3df7a8edcb81b222f3fff6303a10865f3d46fd97 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 21 02:57:16 2011 +0200 add some missing makefile bits for linux --- build-scripts/linux.mk | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7d3bab0..8859cd0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -119,9 +119,9 @@ build-firefox: copy-firefox: -rm -rf $(FETCH_DIR)/Firefox ## This is so ugly. Update it to use cool tar --transform soon. - cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package - cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) - cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-*/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-*/dist/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.linux-$(ARCH_TYPE).tar.bz2 && mv firefox Firefox # source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -233,7 +233,6 @@ all-compressed-bundles: compressed-bundle_ar \ ## clean: - rm -fr $(DISTDIR) rm -fr *.tar.gz rm -fr $(DEST) *.stamp rm -f *~ @@ -280,9 +279,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) @@ -360,8 +359,8 @@ strip-it-stripper: ## ## Torbutton development version -#torbutton.xpi: -# $(WGET) -O $@ $(TORBUTTON) +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) ## NoScript development version noscript.xpi: @@ -403,7 +402,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -mkdir $(DISTDIR) tar -cvzf $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz $(NAME)_$(LANGCODE); rm *.zip *.xpi - cp torbutton/torbutton.xpi . copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbutton/master] Bug 3580: Fix part of the hotmail breakage.
by mikeperry＠torproject.org 21 Aug '11

21 Aug '11

commit 4a2b483e59424ba8697d39738c014ce27b80e16f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Aug 19 21:50:16 2011 -0700 Bug 3580: Fix part of the hotmail breakage. We were blocking some of their javascript, which they apparently load in object tags? --- src/components/cssblocker.js | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/components/cssblocker.js b/src/components/cssblocker.js index ad2b1ac..bf9ccde 100644 --- a/src/components/cssblocker.js +++ b/src/components/cssblocker.js @@ -312,6 +312,11 @@ ContentPolicy.prototype = { wind = node; } + /* + * This clause does in fact occurr. It causes us to break hotmail + * by blocking some of their javascript.. + * + * https://trac.torproject.org/projects/tor/ticket/3580 if (contentType == 5) { // Object // Never seems to happen.. But it would be nice if we // could handle it either here or shouldProcess, instead of in @@ -322,6 +327,7 @@ ContentPolicy.prototype = { return block; } } + */ if (!wind || !wind.top.location || !wind.top.location.href) { this.logger.safe_log(4, "Skipping no location: ",

1 0

[torbutton/master] Bug 3739: SafeCache policy fails for https->http CORS
by mikeperry＠torproject.org 21 Aug '11

21 Aug '11

commit 349dcb1c5776936a37d21dfd70f9d0d2f1227513 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Aug 20 17:42:20 2011 -0700 Bug 3739: SafeCache policy fails for https->http CORS We use the cookie permissions api to get the origin URI. It can do some magic we can't do from XPCOM. Thanks to Georg Koppen for the tip! --- src/chrome/content/stanford-safecache.js | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index bf2fb16..0b08bda 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -55,6 +55,7 @@ function SSC_dump(msg) { function SSC_RequestListener(controller) { this.controller = controller; + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"].getService(Ci.nsICookiePermission); } SSC_RequestListener.prototype = @@ -119,10 +120,16 @@ SSC_RequestListener.prototype = parent_host = null; // first party interaction } else if(!parent_host) { // Questionable first party interaction.. - if (!channel.referrer) { - torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); - } else { - parent_host = channel.referrer.host; + try { + var anuri = this.cookie_permissions.getOriginatingURI(channel); + parent_host = anuri.host; + } catch(e) { + torbutton_safelog(2, "Cookie API failed to get parent: "+e,channel.URI.spec); + if (!channel.referrer) { + torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); + } else { + parent_host = channel.referrer.host; + } } }

1 0