June 2011 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Update patch file names, improve description of 0002.
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 47d8a4e7125e1a4c88ade4f02e79dcb52033a7f0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jun 21 12:53:04 2011 -0700 Update patch file names, improve description of 0002. --- ...ck-Components.-interfaces-lookupMethod-fr.patch | 47 ------------------ ...ck-Components.interfaces-lookupMethod-fro.patch | 50 ++++++++++++++++++++ ...-Make-Intermediate-Cert-Store-memory-only.patch | 2 +- ...efox-Make-Permissions-Manager-memory-only.patch | 2 +- 4 files … [View More]changed, 52 insertions(+), 49 deletions(-) diff --git a/src/current-patches/0002-Firefox-Block-Components.-interfaces-lookupMethod-fr.patch b/src/current-patches/0002-Firefox-Block-Components.-interfaces-lookupMethod-fr.patch deleted file mode 100644 index 875d224..0000000 --- a/src/current-patches/0002-Firefox-Block-Components.-interfaces-lookupMethod-fr.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a7c0d63de921990b78c81482b01da86b6bc70190 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Mon, 20 Jun 2011 17:07:41 -0700 -Subject: [PATCH 2/4] Firefox: Block Components.{interfaces,lookupMethod} from content - -These two seem to be exposed to content script only to make our lives -difficult. Components.lookupMethod can undo our JS hooks, and -Components.interfaces is useful for fingerprinting the platform, OS, and -Firebox version. - -They appear to have no other legitimate use. See also: -https://bugzilla.mozilla.org/show_bug.cgi?id=429070 -https://trac.torproject.org/projects/tor/ticket/2873 -https://trac.torproject.org/projects/tor/ticket/2874 ---- - js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp -index 1c141f9..85a2b4e 100644 ---- a/js/src/xpconnect/src/xpccomponents.cpp -+++ b/js/src/xpconnect/src/xpccomponents.cpp -@@ -4294,7 +4294,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) - NS_IMETHODIMP - nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) - { -- static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; -+ // XXX: Pref observer? Also, is this what we want? Seems like a plan -+ //static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; -+ static const char* allowed[] = { "isSuccessCode", nsnull }; - *_retval = xpc_CheckAccessList(methodName, allowed); - return NS_OK; - } -@@ -4303,7 +4305,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c - NS_IMETHODIMP - nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) - { -- static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; -+ // XXX: Pref observer? Also, is this what we want? Seems like a plan -+ // static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; -+ static const char* allowed[] = { "results", nsnull}; - *_retval = xpc_CheckAccessList(propertyName, allowed); - return NS_OK; - } --- -1.7.3.4 - diff --git a/src/current-patches/0002-Firefox-Block-Components.interfaces-lookupMethod-fro.patch b/src/current-patches/0002-Firefox-Block-Components.interfaces-lookupMethod-fro.patch new file mode 100644 index 0000000..21049fa --- /dev/null +++ b/src/current-patches/0002-Firefox-Block-Components.interfaces-lookupMethod-fro.patch @@ -0,0 +1,50 @@ +From 8a056d35c126c6915c6e16997fd5db0865079e7d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Mon, 20 Jun 2011 17:07:41 -0700 +Subject: [PATCH 2/4] Firefox: Block Components.interfaces,lookupMethod from content + +This patch removes the ability of content script to access +Components.interfaces.* as well as call or access Components.lookupMethod. + +These two interfaces seem to be exposed to content script only to make our +lives difficult. Components.lookupMethod can undo our JS hooks, and +Components.interfaces is useful for fingerprinting the platform, OS, and +Firebox version. + +They appear to have no other legitimate use. See also: +https://bugzilla.mozilla.org/show_bug.cgi?id=429070 +https://trac.torproject.org/projects/tor/ticket/2873 +https://trac.torproject.org/projects/tor/ticket/2874 +--- + js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp +index 1c141f9..85a2b4e 100644 +--- a/js/src/xpconnect/src/xpccomponents.cpp ++++ b/js/src/xpconnect/src/xpccomponents.cpp +@@ -4294,7 +4294,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) + NS_IMETHODIMP + nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) + { +- static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; ++ // XXX: Pref observer? Also, is this what we want? Seems like a plan ++ //static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; ++ static const char* allowed[] = { "isSuccessCode", nsnull }; + *_retval = xpc_CheckAccessList(methodName, allowed); + return NS_OK; + } +@@ -4303,7 +4305,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c + NS_IMETHODIMP + nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) + { +- static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; ++ // XXX: Pref observer? Also, is this what we want? Seems like a plan ++ // static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; ++ static const char* allowed[] = { "results", nsnull}; + *_retval = xpc_CheckAccessList(propertyName, allowed); + return NS_OK; + } +-- +1.7.3.4 + diff --git a/src/current-patches/0003-Firefox-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Firefox-Make-Intermediate-Cert-Store-memory-only.patch index 7475492..7e5fc88 100644 --- a/src/current-patches/0003-Firefox-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/0003-Firefox-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,4 +1,4 @@ -From eb23d73f7ce0503d62485b81ace4fdbba091588a Mon Sep 17 00:00:00 2001 +From a401deb3598db247113a998fb287f663b6acfac0 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon, 20 Jun 2011 17:07:49 -0700 Subject: [PATCH 3/4] Firefox: Make Intermediate Cert Store memory-only. diff --git a/src/current-patches/0004-Firefox-Make-Permissions-Manager-memory-only.patch b/src/current-patches/0004-Firefox-Make-Permissions-Manager-memory-only.patch index 16bd25d..241e4eb 100644 --- a/src/current-patches/0004-Firefox-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/0004-Firefox-Make-Permissions-Manager-memory-only.patch @@ -1,4 +1,4 @@ -From 880d0b8c0b0c30316585ad3745dd3ee824d326b8 Mon Sep 17 00:00:00 2001 +From acf065599f1ab270eed4846fbc916f245002da0d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon, 20 Jun 2011 17:07:56 -0700 Subject: [PATCH 4/4] Firefox: Make Permissions Manager memory-only [View Less]

1 0

[torbrowser/maint-2.2] bump release version to 2.2.29 and Tor version to 0.2.2.29-beta
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit d9fb18cb70cb4aa914b8439b62b3e56ababd6aa9 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 16:57:04 2011 -0300 bump release version to 2.2.29 and Tor version to 0.2.2.29-beta --- build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1534a4c..a1274af 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -… [View More]

1 0

[torbrowser/maint-2.2] bump other new versions, update changelog for tbb osx 2.2.29-1 release
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 26ae5c807aeb9d1455225bdf0472544f0fb00eea Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 16:58:16 2011 -0300 bump other new versions, update changelog for tbb osx 2.2.29-1 release --- README.OSX-2.2 | 6 +++--- build-scripts/versions.mk | 4 ++-- changelog.osx-2.2 | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index b8d2fc5..949dd7e 100644 --- a/README.OSX-2.2 +++ b/… [View More]

1 0

[tor/master] Add, use a bufferevent-safe connection_flush()
by nickm＠torproject.org 21 Jun '11

21 Jun '11

commit e617a34d589ac8ef26203ae90443a0e98f7032b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 21 10:22:54 2011 -0400 Add, use a bufferevent-safe connection_flush() A couple of places in control.c were using connection_handle_write() to flush important stuff (the response to a SIGNAL command, an ERR-level status event) before Tor went down. But connection_handle_write() isn't meaningful for bufferevents, so we'd crash. This patch … [View More]adds a new connection_flush() that works for all connection backends, and makes control.c use that instead. Fix for bug 3367; bugfix on 0.2.3.1-alpha. --- changes/bug3367 | 4 ++++ src/or/connection.c | 19 +++++++++++++++++++ src/or/connection.h | 2 ++ src/or/control.c | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/changes/bug3367 b/changes/bug3367 new file mode 100644 index 0000000..8a69778 --- /dev/null +++ b/changes/bug3367 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Fix a crash when handling the SIGNAL controller command or + reporting ERR-level status events with bufferevents enabled. Found + by Robert Ransom. Fixes bug 3367; bugfix on 0.2.3.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 317bfb1..12d93ce 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3314,6 +3314,25 @@ connection_handle_write(connection_t *conn, int force) return res; } +/** + * Try to flush data that's waiting for a write on <b>conn</b>. Return + * -1 on failure, 0 on success. + * + * Don't use this function for regular writing; the buffers/bufferevents + * system should be good enough at scheduling writes there. Instead, this + * function is for cases when we're about to exit or something and we want + * to report it right away. + */ +int +connection_flush(connection_t *conn) +{ + IF_HAS_BUFFEREVENT(conn, { + int r = bufferevent_flush(conn->bufev, EV_WRITE, BEV_FLUSH); + return (r < 0) ? -1 : 0; + }); + return connection_handle_write(conn, 1); +} + /** OpenSSL TLS record size is 16383; this is close. The goal here is to * push data out as soon as we know there's enough for a TLS record, so * during periods of high load we won't read entire megabytes from diff --git a/src/or/connection.h b/src/or/connection.h index 94ae645..8dc0112 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -79,6 +79,8 @@ int connection_fetch_from_buf_http(connection_t *conn, int connection_wants_to_flush(connection_t *conn); int connection_outbuf_too_full(connection_t *conn); int connection_handle_write(connection_t *conn, int force); +int connection_flush(connection_t *conn); + void _connection_write_to_buf_impl(const char *string, size_t len, connection_t *conn, int zlib); static void connection_write_to_buf(const char *string, size_t len, diff --git a/src/or/control.c b/src/or/control.c index 5e71a2e..e65cd26 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -600,7 +600,7 @@ send_control_event_string(uint16_t event, event_format_t which, else if (event == EVENT_STATUS_SERVER) is_err = !strcmpstart(msg, "STATUS_SERVER ERR "); if (is_err) - connection_handle_write(TO_CONN(control_conn), 1); + connection_flush(TO_CONN(control_conn)); } } } SMARTLIST_FOREACH_END(conn); @@ -1257,7 +1257,7 @@ handle_control_signal(control_connection_t *conn, uint32_t len, send_control_done(conn); /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) - connection_handle_write(TO_CONN(conn), 1); + connection_flush(TO_CONN(conn)); process_signal(sig); [View Less]

1 0

[tor/master] Merge branch 'bug3367'
by nickm＠torproject.org 21 Jun '11

21 Jun '11

commit 64a5a4177f905971d0cf9e28a19180c2ea32b02a Merge: 4186b13 e617a34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 21 11:32:52 2011 -0400 Merge branch 'bug3367' changes/bug3367 | 4 ++++ src/or/connection.c | 19 +++++++++++++++++++ src/or/connection.h | 2 ++ src/or/control.c | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug3264'
by nickm＠torproject.org 21 Jun '11

21 Jun '11

commit 4186b1362b21e6af822579cd77ec46f63219e574 Merge: 37ff37a 410e440 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 21 10:28:25 2011 -0400 Merge remote-tracking branch 'public/bug3264' changes/bug3264 | 4 ++++ src/common/tortls.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/master] Log SSL state changes at LOG_DEBUG, LD_HANDSHAKE.
by nickm＠torproject.org 21 Jun '11

21 Jun '11

commit 410e440a8d40e556cc445a1ecc6a8ed4109434b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 6 23:17:35 2010 -0400 Log SSL state changes at LOG_DEBUG, LD_HANDSHAKE. This can be slightly useful for debugging blocking events. Addresses ticket 3116; based on loud_ssl_states branch. --- changes/bug3264 | 4 ++++ src/common/tortls.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/bug3264 b/… [View More]

1 0

r24830: {website} the 0.2.2.29-beta tarballs are available. (website/trunk/include)
by Andrew Lewman 21 Jun '11

21 Jun '11

Author: phobos Date: 2011-06-21 12:58:44 +0000 (Tue, 21 Jun 2011) New Revision: 24830 Modified: website/trunk/include/versions.wmi Log: the 0.2.2.29-beta tarballs are available. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-06-21 12:56:17 UTC (rev 24829) +++ website/trunk/include/versions.wmi 2011-06-21 12:58:44 UTC (rev 24830) @@ -1,5 +1,5 @@ <define-tag version-stable … [View More]

1 0

r24829: {website} tor 0.2.2.29-beta is out, update sponsors for 2011. (in website/trunk: . about/en)
by Andrew Lewman 21 Jun '11

21 Jun '11

Author: phobos Date: 2011-06-21 12:56:17 +0000 (Tue, 21 Jun 2011) New Revision: 24829 Modified: website/trunk/Makefile website/trunk/about/en/sponsors.wml Log: tor 0.2.2.29-beta is out, update sponsors for 2011. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-06-21 09:13:04 UTC (rev 24828) +++ website/trunk/Makefile 2011-06-21 12:56:17 UTC (rev 24829) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/… [View More]home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.28-beta -export DEVTAG=tor-0.2.2.28-beta +export STABLETAG=tor-0.2.2.29-beta +export DEVTAG=tor-0.2.2.29-beta WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2011-06-21 09:13:04 UTC (rev 24828) +++ website/trunk/about/en/sponsors.wml 2011-06-21 12:56:17 UTC (rev 24829) @@ -19,19 +19,19 @@ <h3><i>Magnoliophyta</i> (over $1 million)</h3> <ul> - <li>An anonymous North American NGO (2008-2010)</li> + <li>An anonymous North American NGO (2008-2011)</li> + <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2011)</li> </ul> <h3><i>Liliopsida</i> (up to $750k)</h3> <ul> - <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2010)</li> - <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010)</li> + <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2011)</li> </ul> <h3><i>Asparagales</i> (up to $500k)</h3> <ul> <li><a href="http://www.internews.fr/">Internews Europe</a> (2006-2008)</li> - <li><a href="http://nsf.gov/">National Science Foundation via Drexel University</a> (2009-2010)</li> + <li><a href="http://nsf.gov/">National Science Foundation via Drexel University</a> (2009-2011)</li> </ul> <h3><i>Alliaceae</i> (up to $200k)</h3> @@ -43,17 +43,17 @@ <ul> <li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li> <li><a href="http://chacs.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li> - <li>An anonymous North American ISP (2009-2010)</li> + <li>An anonymous North American ISP (2009-2011)</li> </ul> <h3><i>Allium cepa</i> (up to $50k)</h3> <ul> - <li><a href="<page donate/donate>">More than 500 personal donations from individuals like you</a> (2006-2010)</li> + <li><a href="<page donate/donate>">More than 600 personal donations from individuals like you</a> (2006-2011)</li> <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2010)</li> + <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2011)</li> <li><a href="http://www.hrw.org/">Human Rights Watch</a> (2007)</li> <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li> - <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2010)</li> + <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2011)</li> </ul> <h3>Past sponsors</h3> [View Less]

1 0

r24825: {website} some people need to run the publish script from outside the (website/trunk)
by Roger Dingledine 21 Jun '11

21 Jun '11

Author: arma Date: 2011-06-21 04:41:02 +0000 (Tue, 21 Jun 2011) New Revision: 24825 Modified: website/trunk/publish Log: some people need to run the publish script from outside the tor name space Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-06-19 02:28:58 UTC (rev 24824) +++ website/trunk/publish 2011-06-21 04:41:02 UTC (rev 24825) @@ -9,8 +9,8 @@ # don't copy over stuff with permissions that make it … [View More]

2 1