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

[tor/maint-0.2.4] 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/maint-0.2.4] 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

[check/master] Dry out querystring parsing.
by arlo＠torproject.org 03 Oct '13

03 Oct '13

commit c656794133794c1acc9a0e7a74f0cd380c42a110 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 2 19:18:47 2013 -0700 Dry out querystring parsing. --- handlers.go | 20 ++------------------ utils.go | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/handlers.go b/handlers.go index 574f28f..39bb584 100644 --- a/handlers.go +++ b/handlers.go @@ -5,7 +5,6 @@ import ( "html/template" "net" "net/http" - "strconv" "time" ) @@ -116,23 +115,8 @@ func BulkHandler(Layout *template.Template, Exits *Exits) func(http.ResponseWrit return } - port_str := q.Get("port") - port, err := strconv.Atoi(port_str) - if err != nil { - port = 80 - port_str = "" - } else { - port_str = "&port=" + port_str - } - - n_str := q.Get("n") - n, err := strconv.Atoi(n_str) - if err != nil { - n = 16 - n_str = "" - } else { - n_str = "&n=" + n_str - } + port, port_str := GetQS(q, "port", 80) + n, n_str := GetQS(q, "n", 16) str := fmt.Sprintf("# This is a list of all Tor exit nodes from the past %d hours that can contact %s on port %d #\n", n, ip, port) str += fmt.Sprintf("# You can update this list by visiting https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=%s%s%s #\n", ip, port_str, n_str) diff --git a/utils.go b/utils.go index 46e00b2..eb8a66d 100644 --- a/utils.go +++ b/utils.go @@ -2,6 +2,7 @@ package main import ( "encoding/json" + "fmt" "github.com/samuel/go-gettext/gettext" "html/template" "io" @@ -9,6 +10,8 @@ import ( "log" "net/http" "os" + "strconv" + "net/url" ) func UpToDate(r *http.Request) bool { @@ -33,6 +36,18 @@ func Lang(r *http.Request) string { return lang } +func GetQS(q url.Values, param string, deflt int) (num int, str string) { + str = q.Get(param) + num, err := strconv.Atoi(str) + if err != nil { + num = deflt + str = "" + } else { + str = fmt.Sprintf("&%s=%s", param, str) + } + return +} + func FuncMap(domain *gettext.Domain) template.FuncMap { return template.FuncMap{ "UnEscaped": func(x string) interface{} {

1 0

r26378: {website} update announcements. (website/trunk/en)
by Andrew Lewman 03 Oct '13

03 Oct '13

Author: phobos Date: 2013-10-03 02:07:05 +0000 (Thu, 03 Oct 2013) New Revision: 26378 Modified: website/trunk/en/index.wml Log: update announcements. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2013-10-02 22:18:42 UTC (rev 26377) +++ website/trunk/en/index.wml 2013-10-03 02:07:05 UTC (rev 26378) @@ -158,22 +158,28 @@ <table> <tr> <td> - <div class="calendar"><span class="month">Sep</span><br><span class="day">21</span></div> - <p>For most uses, Tor provides the best available protection against a well-resourced observer. It's an open question how much protection Tor (or any other existing anonymous communications tool) provides against the NSA's large-scale Internet surveillance. On its own, Tor can't protect against attacks against vulnerabilities on your computer or its software; Tor is not the only tool you need to be secure on the internet. We're working on writing clear explanations for the issues, and the state of the research field as it stands. In the meantime, <a href="https://www.schneier.com/blog/archives/2013/09/how_to_remain_s.html">Bruce Schneier's advice</a> may be useful.</p> + <div class="calendar"><span class="month">Oct</span><br><span class="day">02</span></div> + <p>Read our post about <a href="https://blog.torproject.org/blog/tor-and-silk-road-takedown">Tor and the Silk Road Takedown</a>.</p> </td> </tr> <tr> <td> - <div class="calendar"><span class="month">Sep</span><br><span class="day">20</span></div> - <p>New Tor Browser Bundle packages with Firefox fixes. Learn <a href="https://blog.torproject.org/blog/new-tor-browser-bundles-firefox-1709esr">what's new</a>.</p> + <div class="calendar"><span class="month">Oct</span><br><span class="day">02</span></div> + <p>Tor Weekly News: <a href="https://blog.torproject.org/blog/tor-weekly-news-%E2%80%94-october-2nd-2013">October 2nd Edition</a> available.</p> </td> </tr> <tr> <td> - <div class="calendar"><span class="month">Sep</span><br><span class="day">11</span></div> - <p>Tor, NSA, GCHQ, and QUICK ANT Speculation. Read <a href="https://blog.torproject.org/blog/tor-nsa-gchq-and-quick-ant-speculation">our thoughts</a>.</p> + <div class="calendar"><span class="month">Sep</span><br><span class="day">28</span></div> + <p>Tor Browser <a href="https://blog.torproject.org/blog/tor-browser-bundle-30alpha4-released">3.0 alpha 4 released</a>.</p> </td> </tr> + <tr> + <td> + <div class="calendar"><span class="month">Sep</span><br><span class="day">21</span></div> + <p>For most uses, Tor provides the best available protection against a well-resourced observer. It's an open question how much protection Tor (or any other existing anonymous communications tool) provides against the NSA's large-scale Internet surveillance. On its own, Tor can't protect against attacks against vulnerabilities on your computer or its software; Tor is not the only tool you need to be secure on the internet. We're working on writing clear explanations for the issues, and the state of the research field as it stands. In the meantime, <a href="https://www.schneier.com/blog/archives/2013/09/how_to_remain_s.html">Bruce Schneier's advice</a> may be useful.</p> + </td> + </tr> </table> </div> <div id="home-users">

1 0

[check/master] Parse TorButton template.
by arlo＠torproject.org 03 Oct '13

03 Oct '13

commit d2705017343513afcc68ab5ab857a06d1ac95c24 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Oct 2 19:03:46 2013 -0700 Parse TorButton template. --- utils.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils.go b/utils.go index edeed20..46e00b2 100644 --- a/utils.go +++ b/utils.go @@ -54,7 +54,10 @@ func CompileTemplate(domain *gettext.Domain, templateName string) *template.Temp if Layout == nil { Layout = template.New("") Layout = Layout.Funcs(FuncMap(domain)) - Layout, err = Layout.ParseFiles("public/base.html") + Layout, err = Layout.ParseFiles( + "public/base.html", + "public/torbutton.html", + ) if err != nil { log.Fatal(err) }

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Change the default Firefox profile directory to be TBB-relative.
by mikeperry＠torproject.org 03 Oct '13

03 Oct '13

commit f0519e332aa292b6b481dec6f9e6a22640157131 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 2 18:31:31 2013 -0700 fixup! Change the default Firefox profile directory to be TBB-relative. For safety and future-proofing, remove the codepaths that touch empty strings. --- toolkit/xre/nsXREDirProvider.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 8432cca..aae1e2f 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -1284,39 +1284,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, } nsCAutoString profile; - nsCAutoString appName; - nsCAutoString vendor; if (aProfileName && !aProfileName->IsEmpty()) { profile = *aProfileName; } else if (gAppData->profile) { profile = gAppData->profile; } - nsresult rv; + nsresult rv = NS_ERROR_FAILURE; #if defined (XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); } - else { - // Note that MacOS ignores the vendor when creating the profile hierarchy - - // all application preferences directories live alongside one another in - // ~/Library/Application Support/ - rv = aFile->AppendNative(appName); - } NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) || defined(XP_OS2) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); } - else { - if (!vendor.IsEmpty()) { - rv = aFile->AppendNative(vendor); - NS_ENSURE_SUCCESS(rv, rv); - } - rv = aFile->AppendNative(appName); - } + NS_ENSURE_SUCCESS(rv, rv); #elif defined(ANDROID) @@ -1349,17 +1335,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = AppendProfileString(aFile, folder.BeginReading()); } else { - if (!vendor.IsEmpty()) { - folder.Append(vendor); - ToLowerCase(folder); - - rv = aFile->AppendNative(folder); - NS_ENSURE_SUCCESS(rv, rv); - - folder.Truncate(); - } - - folder.Append(appName); ToLowerCase(folder); rv = aFile->AppendNative(folder);

1 0

r26377: {website} point to https://www.eff.org/pages/tor-and-https from our wa (website/trunk/download/en)
by Roger Dingledine 02 Oct '13

02 Oct '13

Author: arma Date: 2013-10-02 22:18:42 +0000 (Wed, 02 Oct 2013) New Revision: 26377 Modified: website/trunk/download/en/download.wml Log: point to https://www.eff.org/pages/tor-and-https from our warnings Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2013-10-02 17:33:50 UTC (rev 26376) +++ website/trunk/download/en/download.wml 2013-10-02 22:18:42 UTC (rev 26377) @@ -309,7 +309,9 @@ sensitive information to display a <a href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue or green URL bar button</a>, include <b>https://</b> in the URL, and display the -proper expected name for the website. +proper expected name for the website. Also see EFF's interactive page +explaining <a href="https://www.eff.org/pages/tor-and-https">how Tor +and HTTPS relate</a>. </p>

1 0

r26376: {website} actually make it a link too (website/trunk/about/en)
by Roger Dingledine 02 Oct '13

02 Oct '13

Author: arma Date: 2013-10-02 17:33:50 +0000 (Wed, 02 Oct 2013) New Revision: 26376 Modified: website/trunk/about/en/overview.wml Log: actually make it a link too Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2013-10-02 17:27:28 UTC (rev 26375) +++ website/trunk/about/en/overview.wml 2013-10-02 17:33:50 UTC (rev 26376) @@ -221,7 +221,8 @@ Tor can't solve all anonymity problems. It focuses only on protecting the transport of data. You need to use protocol-specific support software if you don't want the sites you visit to see your - identifying information. For example, you can use Tor Browser Bundle + identifying information. For example, you can use the <a href="<page + projects/torbrowser>">Tor Browser Bundle</a> while browsing the web to withhold some information about your computer's configuration. </p>

1 0

r26375: {website} it's not called torbutton anymore (website/trunk/about/en)
by Roger Dingledine 02 Oct '13

02 Oct '13

Author: arma Date: 2013-10-02 17:27:28 +0000 (Wed, 02 Oct 2013) New Revision: 26375 Modified: website/trunk/about/en/overview.wml Log: it's not called torbutton anymore Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2013-10-02 17:26:38 UTC (rev 26374) +++ website/trunk/about/en/overview.wml 2013-10-02 17:27:28 UTC (rev 26375) @@ -221,7 +221,7 @@ Tor can't solve all anonymity problems. It focuses only on protecting the transport of data. You need to use protocol-specific support software if you don't want the sites you visit to see your - identifying information. For example, you can use Torbutton + identifying information. For example, you can use Tor Browser Bundle while browsing the web to withhold some information about your computer's configuration. </p>

1 0

r26374: {website} strip trailing whitespace (no changes) (website/trunk/about/en)
by Roger Dingledine 02 Oct '13

02 Oct '13

Author: arma Date: 2013-10-02 17:26:38 +0000 (Wed, 02 Oct 2013) New Revision: 26374 Modified: website/trunk/about/en/overview.wml Log: strip trailing whitespace (no changes) Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2013-10-02 01:24:56 UTC (rev 26373) +++ website/trunk/about/en/overview.wml 2013-10-02 17:26:38 UTC (rev 26374) @@ -24,7 +24,7 @@ </ul> </div>  - + <hr> <a name="inception"></a> @@ -39,7 +39,7 @@ for a wide variety of purposes by normal people, the military, journalists, law enforcement officers, activists, and many others. </p> - + <a name="overview"></a> <h3><a class="anchor" href="#overview">Overview</a></h3> @@ -52,7 +52,7 @@ to share information over public networks without compromising their privacy. </p> - + <p> Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, or the @@ -63,7 +63,7 @@ communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses. </p> - + <p> Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their @@ -71,7 +71,7 @@ country, without notifying everybody nearby that they're working with that organization. </p> - + <p> Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the Electronic Frontier @@ -84,7 +84,7 @@ consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers? </p> - + <p> A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle @@ -92,7 +92,7 @@ web sites without leaving government IP addresses in their web logs, and for security during sting operations. </p> - + <p> The variety of people who use Tor is actually <a href="http://freehaven.net/doc/fc03/econymics.pdf">part of what makes @@ -101,10 +101,10 @@ so the more populous and diverse the user base for Tor is, the more your anonymity will be protected. </p> - + <a name="whyweneedtor"></a> <h3><a class="anchor" href="#whyweneedtor">Why we need Tor</a></h3> - + <p> Using Tor protects you against a common form of Internet surveillance known as "traffic analysis." Traffic analysis can be used to infer @@ -119,7 +119,7 @@ affiliation to anyone observing the network, even if the connection is encrypted. </p> - + <p> How does traffic analysis work? Internet data packets have two parts: a data payload and a header used for routing. The data payload is @@ -129,7 +129,7 @@ possibly, what you're saying. That's because it focuses on the header, which discloses source, destination, size, timing, and so on. </p> - + <p> A basic problem for the privacy minded is that the recipient of your communications can see that you sent it by looking at headers. So can @@ -138,7 +138,7 @@ analysis might involve sitting somewhere between sender and recipient on the network, looking at headers. </p> - + <p> But there are also more powerful kinds of traffic analysis. Some attackers spy on multiple parts of the Internet and use sophisticated @@ -147,11 +147,11 @@ these attackers, since it only hides the content of Internet traffic, not the headers. </p> - + <a name="thesolution"></a> <h3><a class="anchor" href="#thesolution">The solution: a distributed, anonymous network</a></h3> <img src="$(IMGROOT)/htw1.png" alt="How Tor works"> - + <p> Tor helps to reduce the risks of both simple and sophisticated traffic analysis by distributing your transactions over several places on the @@ -163,7 +163,7 @@ through several relays that cover your tracks so no observer at any single point can tell where the data came from or where it's going. </p> - + <p> To create a private network pathway with Tor, the user's software or client incrementally builds a circuit of encrypted connections through @@ -174,9 +174,9 @@ separate set of encryption keys for each hop along the circuit to ensure that each hop can't trace these connections as they pass through. </p> - + <p><img alt="Tor circuit step two" src="$(IMGROOT)/htw2.png"></p> - + <p> Once a circuit has been established, many kinds of data can be exchanged and several different sorts of software applications can be deployed @@ -186,20 +186,20 @@ only works for TCP streams and can be used by any application with SOCKS support. </p> - + <p> For efficiency, the Tor software uses the same circuit for connections that happen within the same ten minutes or so. Later requests are given a new circuit, to keep people from linking your earlier actions to the new ones. </p> - + <p><img alt="Tor circuit step three" src="$(IMGROOT)/htw3.png"></p> - - + + <a name="hiddenservices"></a> <h3><a class="anchor" href="#hiddenservices">Hidden services</a></h3> - + <p> Tor also makes it possible for users to hide their locations while offering various kinds of services, such as web publishing or an instant @@ -213,10 +213,10 @@ hidden services</a> and how the <a href="<page docs/hidden-services>">hidden service protocol</a> works. </p> - + <a name="stayinganonymous"></a> <h3><a class="anchor" href="#stayinganonymous">Staying anonymous</a></h3> - + <p> Tor can't solve all anonymity problems. It focuses only on protecting the transport of data. You need to use protocol-specific @@ -225,7 +225,7 @@ while browsing the web to withhold some information about your computer's configuration. </p> - + <p> Also, to protect your anonymity, be smart. Don't provide your name or other revealing information in web forms. Be aware that, like all @@ -235,10 +235,10 @@ arriving at your chosen destination, he can use statistical analysis to discover that they are part of the same circuit. </p> - + <a name="thefutureoftor"></a> <h3><a class="anchor" href="#thefutureoftor">The future of Tor</a></h3> - + <p> Providing a usable anonymizing network on the Internet today is an ongoing challenge. We want software that meets users' needs. We also @@ -252,7 +252,7 @@ or <a href="<page getinvolved/volunteer>">volunteering</a> as a <a href="<page docs/documentation>#Developers">developer</a>. </p> - + <p> Ongoing trends in law, policy, and technology threaten anonymity as never before, undermining our ability to speak and read freely online. These @@ -262,7 +262,7 @@ provides additional diversity, enhancing Tor's ability to put control over your security and privacy back into your hands. </p> - + </div>  <div id = "sidecol"> @@ -272,4 +272,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi>

1 0