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

[stem/master] Test accidently left around a file in /tmp
by atagar＠torproject.org 19 Mar '13

19 Mar '13

commit decc35249d2605644aec5a3ef5bb337cd0d41175 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 18:40:13 2013 -0700 Test accidently left around a file in /tmp The test_save_processed_files_malformed checks that save_processed_files() fails when presented with malformed data. However, this function still writes out a blank file. I noticed this because I just tried running the tests as a different user from prior test runs, causing... ====================================================================== ERROR: test_save_processed_files_malformed ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/integ/descriptor/reader.py", line 172, in test_save_processed_files_malformed self.assertRaises(TypeError, stem.descriptor.reader.save_processed_files, "/tmp/foo", listing) File "/usr/lib/python2.7/unittest/case.py", line 465, in assertRaises callableObj(*args, **kwargs) File "/home/atagar/Desktop/stem/stem/descriptor/reader.py", line 229, in save_processed_files with open(path, "w") as output_file: IOError: [Errno 13] Permission denied: '/tmp/foo' ---------------------------------------------------------------------- Ran 21 tests in 1.558s --- test/integ/descriptor/reader.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 4f92343..39170a0 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -171,6 +171,14 @@ class TestDescriptorReader(unittest.TestCase): for listing in (missing_filename, relative_filename, string_timestamp): self.assertRaises(TypeError, stem.descriptor.reader.save_processed_files, "/tmp/foo", listing) + # Though our attempts to save the processed files fail we'll write an empty + # file. Cleaning it up. + + try: + os.remove("/tmp/foo") + except: + pass + def test_basic_example(self): """ Exercises something similar to the first example in the header

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 19 Mar '13

19 Mar '13

commit 0411fd5cebeec8c36cc8be7edcd91cd6f0f5b9c8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 19 01:16:02 2013 +0000 Update translations for https_everywhere_completed --- lt/https-everywhere.properties | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lt/https-everywhere.properties b/lt/https-everywhere.properties index b35e269..197e5ed 100644 --- a/lt/https-everywhere.properties +++ b/lt/https-everywhere.properties @@ -1,3 +1,6 @@ https-everywhere.menu.globalEnable = Įgalinti HTTPS Everywhere https-everywhere.menu.globalDisable = Uždrausti HTTPS Everywhere - +https-everywhere.menu.enableDisable = Įgalinti / uždrausti taisykles +https-everywhere.menu.noRules = (Nėra taisyklių šiam puslapiui) +https-everywhere.menu.unknownRules = (Šio puslapio taisyklės nežinomos) +https-everywhere.toolbar.hint = HTTPS Everywhere dabar aktyvus. Galite įjungti/išjungti jį konkrečioje svetainėje spausdami ženkliuką adresyno juostoje.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 Mar '13

19 Mar '13

commit 0547184e194d5e8d286eda84d9ef0929f9311b67 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 19 01:15:57 2013 +0000 Update translations for https_everywhere --- lt/https-everywhere.properties | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lt/https-everywhere.properties b/lt/https-everywhere.properties index 2e3426d..197e5ed 100644 --- a/lt/https-everywhere.properties +++ b/lt/https-everywhere.properties @@ -1,6 +1,6 @@ https-everywhere.menu.globalEnable = Įgalinti HTTPS Everywhere https-everywhere.menu.globalDisable = Uždrausti HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) -# https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.menu.enableDisable = Įgalinti / uždrausti taisykles +https-everywhere.menu.noRules = (Nėra taisyklių šiam puslapiui) +https-everywhere.menu.unknownRules = (Šio puslapio taisyklės nežinomos) +https-everywhere.toolbar.hint = HTTPS Everywhere dabar aktyvus. Galite įjungti/išjungti jį konkrečioje svetainėje spausdami ženkliuką adresyno juostoje.

1 0

r26117: {website} Dropping commented out project ideas Why are we still bundli (website/trunk/getinvolved/en)
by Damian Johnson 18 Mar '13

18 Mar '13

Author: atagar Date: 2013-03-18 22:50:47 +0000 (Mon, 18 Mar 2013) New Revision: 26117 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping commented out project ideas Why are we still bundling dozens of commented out tasks with the page? If we want to add these back in later then we should... well, add them back in later. That's what SCMs are for (even if svn sucks at it). :P This is slowing down page loads, and most ideas are getting to be pretty old anyway. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-18 22:32:51 UTC (rev 26116) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-18 22:50:47 UTC (rev 26117) @@ -412,14 +412,6 @@ privacy and security issues in mainline version. -  - <a id="project-torbutton"></a> <h3><a href="<page torbutton/index>">Torbutton</a> (<a href="https://gitweb.torproject.org/torbutton.git">code</a>, <a @@ -459,14 +451,6 @@ lead with pushing the project forward. -  - <a id="project-arm"></a> <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a href="https://gitweb.torproject.org/arm.git">code</a>, <a @@ -481,14 +465,6 @@ a bit more. -  - <a id="project-orbot"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a> (<a href="https://gitweb.torproject.org/orbot.git">code</a>, <a @@ -500,15 +476,6 @@ development up through Fall 2010, after which things have been quiet. -  - <a id="project-tails"></a> <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a href="http://git.immerda.ch/?p=amnesia.git;a=summary">code</a>, <a @@ -523,16 +490,6 @@ and still under very active development. -  - <a id="project-torramdisk"></a> <h3><a href="http://opensource.dyc.edu/tor-ramdisk">Tor-ramdisk</a> (<a href="http://opensource.dyc.edu/gitweb/?p=tor-ramdisk.git;a=summary">code</a>, <a @@ -567,13 +524,6 @@ otherwise feature complete. -  - <a id="project-torbirdy"></a> <h3>TorBirdy (<a href="https://github.com/ioerror/torbirdy">code</a>, <a @@ -597,15 +547,6 @@ block Tor. This has both a C and python implementation. -  - <a id="project-flash-proxy"></a> <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a @@ -900,33 +841,6 @@ <ol> -  - <a id="txtorcon-stemIntegration"></a> <li> Txtorcon/Stem Integration @@ -949,216 +863,6 @@ bonus points if it's Twisted. </li> -  - -  - -  - -  - -  - -  - <a id="httpsImpersonation"></a> <li> HTTPS Server Impersonation @@ -1178,168 +882,6 @@ </li> -  - -  - -  - -  - -  - <a id="chutneyExpansion"></a> <li> Make Chutney Do More, More Reliably @@ -1363,132 +905,6 @@ </li> -  - -  - -  - -  - <a id="limitCapabilities"></a> <li> Run With Limited Capabilities @@ -1570,42 +986,6 @@ data. </li> -  - <a id="stemUsability"></a> <li> Stem Usability and Porting @@ -1681,93 +1061,6 @@ As part of your application for this project please write some code to expand stem's tests. Bonus points if it impelments one of your suggestions for better testing Tor! -  - <a id="torCleanup"></a> <li> Tor Codebase Cleanup @@ -1804,141 +1097,7 @@ </li> -  - -  - -  - -  - -  - - <li> Bring up new ideas! Don't like any of these? Look at the <a

1 0

r26116: {website} Adding JTor back to the volunteer page Now that someone's du (website/trunk/getinvolved/en)
by Damian Johnson 18 Mar '13

18 Mar '13

Author: atagar Date: 2013-03-18 22:32:51 +0000 (Mon, 18 Mar 2013) New Revision: 26116 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding JTor back to the volunteer page Now that someone's dusting off JTor and making commits to it adding it back to the project table. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-18 22:07:53 UTC (rev 26115) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-18 22:32:51 UTC (rev 26116) @@ -97,6 +97,14 @@ </tr> <tr class="alt"> + <td>*<a href="#project-jtor">JTor</a></td> + <td>Core</td> + <td>Java</td> + <td>None</td> + <td>bleidl</td> + </tr> + + <tr> <td><a href="#project-torbrowser">Tor Browser</a></td> <td>Bundle</td> <td>C, Scripting</td> @@ -104,7 +112,7 @@ <td>mikeperry, Erinn</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torbutton">Torbutton</a></td> <td>Browser Add-on</td> <td>Javascript</td> @@ -112,7 +120,7 @@ <td>mikeperry</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-httpseverywhere">HTTPS Everywhere</a></td> <td>Browser Add-on</td> <td>Javascript</td> @@ -120,7 +128,7 @@ <td>pde, mikeperry</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-vidalia">Vidalia</a></td> <td>User Interface</td> <td>C++, Qt</td> @@ -128,7 +136,7 @@ <td>chiiph</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-arm">Arm</a></td> <td>User Interface</td> <td>Python, Curses</td> @@ -136,7 +144,7 @@ <td>atagar</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-orbot">Orbot</a></td> <td>User Interface</td> <td>Java</td> @@ -144,7 +152,7 @@ <td>n8fr8</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-tails">Tails</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -152,7 +160,7 @@ <td><a href="https://tails.boum.org/">#tails</a></td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torramdisk">tor-ramdisk</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -160,7 +168,7 @@ <td>blueness</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-torouter">Torouter</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -168,7 +176,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torsocks">Torsocks</a></td> <td>Usability</td> <td>C</td> @@ -176,7 +184,7 @@ <td>ioerror, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torbirdy">TorBirdy</a></td> <td>Browser Add-on</td> <td>JavaScript</td> @@ -184,7 +192,7 @@ <td>Sukhbir (sukhe), ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>C, Python</td> @@ -192,7 +200,7 @@ <td>asn, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-flash-proxy">Flash Proxy</a></td> <td>Client Add-on</td> <td>Python, JavaScript, Go</td> @@ -200,7 +208,7 @@ <td>dcf, aallai, jct</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> @@ -208,7 +216,7 @@ <td>chiiph, Erinn, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-shadow">Shadow</a></td> <td>Simulator</td> <td>C, Python</td> @@ -216,7 +224,7 @@ <td>robgjansen</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -224,7 +232,7 @@ <td>atagar</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-txtorcon">Txtorcon</a></td> <td>Library</td> <td>Python, Twisted</td> @@ -232,7 +240,7 @@ <td>meejah</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> @@ -240,7 +248,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -248,7 +256,7 @@ <td>karsten</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -256,7 +264,7 @@ <td>hellais, karsten</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -264,7 +272,7 @@ <td></td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -272,7 +280,7 @@ <td>gsathya, karsten, cwacek</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -280,7 +288,7 @@ <td>karsten, gsathya</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -288,7 +296,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -296,7 +304,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -304,7 +312,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -312,7 +320,7 @@ <td>kaner, nickm</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -320,7 +328,7 @@ <td>hellais, isis, ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -328,7 +336,7 @@ <td>aagbsn, mikeperry</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -336,7 +344,7 @@ <td>Sebastian</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> <td>Python</td> @@ -344,7 +352,7 @@ <td>hellais</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-anonbib">Anonbib</a></td> <td>Website</td> <td>Python</td> @@ -379,7 +387,6 @@ <a href="#chutneyExpansion">Make Chutney Do More, More Reliably</a> -  <a id="project-torbrowser"></a> <h3><a href="<page projects/torbrowser>">Tor Browser Bundle</a> (<a

1 0

r26115: {website} Dropping 'Improving TorBirdy' When I've spoken with Sukhbir (website/trunk/getinvolved/en)
by Damian Johnson 18 Mar '13

18 Mar '13

Author: atagar Date: 2013-03-18 22:07:53 +0000 (Mon, 18 Mar 2013) New Revision: 26115 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping 'Improving TorBirdy' When I've spoken with Sukhbir he mentioned that he doesn't think there's enough torbirdy tasks remaining to fill a summer. We can add this back in if he changes his mind. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-17 15:17:23 UTC (rev 26114) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-18 22:07:53 UTC (rev 26115) @@ -578,11 +578,6 @@ TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients. - - Project Ideas: - <a href="#improveTorbirdy">Improving TorBirdy</a> - - <a id="project-obfsproxy"></a> <h3><a href="<page projects/obfsproxy>">Obfsproxy</a> (<a href="https://gitweb.torproject.org/obfsproxy.git">C codebase</a>, <a @@ -1310,59 +1305,6 @@ </li> --> - <a id="improveTorbirdy"></a> - <li> - Improving TorBirdy - - Effort Level: High - - Skill Level: Medium to High - - Likely Mentors: Sukhbir, Jacob - - TorBirdy is Torbutton for Thunderbird, Icedove and related Mozilla mail - clients. - - - TorBirdy is under active development and is available from <a - href="https://trac.torproject.org/projects/tor/wiki/torbirdy">our wiki</a> - and <a - href="https://addons.mozilla.org/en-US/thunderbird/addon/torbirdy/">mozilla's - addons site</a>. - - - - The goal of this project is to improve TorBirdy by: - - - <ul> - <li> - Writing a Thunderbird patch to plug known leaks. We have already <a - href="https://bugzilla.mozilla.org/show_bug.cgi?id=776397">submitted a - patch to Thunderbird</a> but we anticipate there will be much more work - required before it is accepted, possibly involving rewriting the entire - patch; this appears trivial, but it is not, as we are proposing a - completely new privacy-safe message-ID header generation algorithm for - Thunderbird. - </li> - <li> - Implementing a JavaScript HTTP proxy (see the <a - href="https://trac.torproject.org/projects/tor/ticket/6958">ticket</a>) - </li> - <li> - Auditing TorBirdy for leaks and for use with other add-ons (as an - example see its <a - href="https://trac.torproject.org/projects/tor/ticket/6319">ticket</a>) - </li> - </ul> - - - A student undertaking this project should have some C++ and JavaScript - development experience. Previous experience with Firefox/Thunderbird - extension development is a plus, but not required. - - </li> - <!-- <a id="user-space-transport"></a> <li>

1 0

[stem/master] Dropping the memory usage assertion when reading descriptors
by atagar＠torproject.org 18 Mar '13

18 Mar '13

commit bc155d6ee800c1741fb7b1b7780cf696217115f4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 14:00:45 2013 -0700 Dropping the memory usage assertion when reading descriptors Our integ test for reading descriptors tries to check that we aren't consuming gobs of memory. Unfortunately this assertion seems to be platform dependent (it fails on OSX) so dropping the assertion. Yea, yea, I should be fixing it but we haven't had this issue for a very long while and it isn't likely to reoccure. --- test/integ/descriptor/networkstatus.py | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 6bfd137..31378fa 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -6,7 +6,6 @@ from __future__ import with_statement import datetime import os -import resource import unittest import stem @@ -46,10 +45,6 @@ class TestNetworkStatus(unittest.TestCase): for router in stem.descriptor.parse_file(descriptor_file, "network-status-consensus-3 1.0"): count += 1 - # We should have constant memory usage. Fail if we're using over 200 MB. - if resource.getrusage(resource.RUSAGE_SELF).ru_maxrss > 200000: - self.fail() - # check if there's any unknown flags # TODO: this should be a 'new capability' check later rather than # failing the tests @@ -91,9 +86,6 @@ class TestNetworkStatus(unittest.TestCase): for router in stem.descriptor.parse_file(descriptor_file, "network-status-microdesc-consensus-3 1.0"): count += 1 - if resource.getrusage(resource.RUSAGE_SELF).ru_maxrss > 200000: - self.fail() - # check if there's any unknown flags # TODO: this should be a 'new capability' check later rather than # failing the tests

1 0

[stem/master] Tor switched from server to microdescriptors in 0.2.3.3
by atagar＠torproject.org 18 Mar '13

18 Mar '13

commit c614080d911cec936a90b1f106e777f962ad8249 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 18 13:53:17 2013 -0700 Tor switched from server to microdescriptors in 0.2.3.3 --- stem/version.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/version.py b/stem/version.py index fcf628e..fa0c0fe 100644 --- a/stem/version.py +++ b/stem/version.py @@ -306,7 +306,7 @@ Requirement = stem.util.enum.Enum( ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), ("LOADCONF", Version("0.2.1.1")), - ("MICRODESCRIPTOR_IS_DEFAULT", Version("0.2.3.25")), + ("MICRODESCRIPTOR_IS_DEFAULT", Version("0.2.3.3")), ("TAKEOWNERSHIP", Version("0.2.2.28-beta")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_PORT_FORWARDING", Version("0.2.3.1-alpha")),

1 0

[tor/master] Stop frobbing timestamp_dirty as our sole means to mark circuits unusable
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 62fb209d837f3f5510075ef8bdb6e231ebdfa9bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 18:29:17 2013 -0500 Stop frobbing timestamp_dirty as our sole means to mark circuits unusable In a number of places, we decrement timestamp_dirty by MaxCircuitDirtiness in order to mark a stream as "unusable for any new connections. This pattern sucks for a few reasons: * It is nonobvious. * It is error-prone: decrementing 0 can be a bad choice indeed. * It really wants to have a function. It can also introduce bugs if the system time jumps backwards, or if MaxCircuitDirtiness is increased. So in this patch, I add an unusable_for_new_conns flag to origin_circuit_t, make it get checked everywhere it should (I looked for things that tested timestamp_dirty), and add a new function to frob it. For now, the new function does still frob timestamp_dirty (after checking for underflow and whatnot), in case I missed any cases that should be checking unusable_for_new_conns. Fixes bug 6174. We first used this pattern in 516ef41ac1fd26f338c, which I think was in 0.0.2pre26 (but it could have been 0.0.2pre27). --- changes/bug6174 | 6 ++++++ src/or/circuitlist.c | 9 ++++----- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/connection_edge.c | 18 ++++++------------ src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 7 files changed, 56 insertions(+), 23 deletions(-) diff --git a/changes/bug6174 b/changes/bug6174 new file mode 100644 index 0000000..79d2930 --- /dev/null +++ b/changes/bug6174 @@ -0,0 +1,6 @@ + o Major bugfixes: + - When we mark a circuit as unusable for new circuits, have it + continue to be unusable for new circuits even if MaxCircuitDirtiness + is increased too much at the wrong time, or the system clock jumped + backwards. Fix for bug 6174; bugfix on 0.0.2pre26. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ef32680..ae0955d 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1204,6 +1204,7 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, if ((!need_uptime || circ->build_state->need_uptime) && (!need_capacity || circ->build_state->need_capacity) && (internal == circ->build_state->is_internal) && + !circ->unusable_for_new_conns && circ->remaining_relay_early_cells && circ->build_state->desired_path_len == DEFAULT_ROUTE_LEN && !circ->build_state->onehop_tunnel && @@ -1304,15 +1305,13 @@ void circuit_expire_all_dirty_circs(void) { circuit_t *circ; - const or_options_t *options = get_options(); for (circ=global_circuitlist; circ; circ = circ->next) { if (CIRCUIT_IS_ORIGIN(circ) && !circ->marked_for_close && - circ->timestamp_dirty) - /* XXXX024 This is a screwed-up way to say "This is too dirty - * for new circuits. */ - circ->timestamp_dirty -= options->MaxCircuitDirtiness; + circ->timestamp_dirty) { + mark_circuit_unusable_for_new_conns(TO_ORIGIN_CIRCUIT(circ)); + } } } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c061203..7ee58fc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -85,10 +85,14 @@ circuit_is_acceptable(const origin_circuit_t *origin_circ, } if (purpose == CIRCUIT_PURPOSE_C_GENERAL || - purpose == CIRCUIT_PURPOSE_C_REND_JOINED) + purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { if (circ->timestamp_dirty && circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now) return 0; + } + + if (origin_circ->unusable_for_new_conns) + return 0; /* decide if this circ is suitable for this conn */ @@ -798,9 +802,12 @@ circuit_stream_is_being_handled(entry_connection_t *conn, circ->purpose == CIRCUIT_PURPOSE_C_GENERAL && (!circ->timestamp_dirty || circ->timestamp_dirty + get_options()->MaxCircuitDirtiness > now)) { - cpath_build_state_t *build_state = TO_ORIGIN_CIRCUIT(circ)->build_state; + origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); + cpath_build_state_t *build_state = origin_circ->build_state; if (build_state->is_internal || build_state->onehop_tunnel) continue; + if (!origin_circ->unusable_for_new_conns) + continue; exitnode = build_state_get_exit_node(build_state); if (exitnode && (!need_uptime || build_state->need_uptime)) { @@ -842,6 +849,7 @@ circuit_predict_and_launch_new(void) /* First, count how many of each type of circuit we have already. */ for (circ=global_circuitlist;circ;circ = circ->next) { cpath_build_state_t *build_state; + origin_circuit_t *origin_circ; if (!CIRCUIT_IS_ORIGIN(circ)) continue; if (circ->marked_for_close) @@ -850,7 +858,10 @@ circuit_predict_and_launch_new(void) continue; /* only count clean circs */ if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL) continue; /* only pay attention to general-purpose circs */ - build_state = TO_ORIGIN_CIRCUIT(circ)->build_state; + origin_circ = TO_ORIGIN_CIRCUIT(circ); + if (origin_circ->unusable_for_new_conns) + continue; + build_state = origin_circ->build_state; if (build_state->onehop_tunnel) continue; num++; @@ -2272,3 +2283,22 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) } } +/** Mark circ so that no more connections can be attached to it. */ +void +mark_circuit_unusable_for_new_conns(origin_circuit_t *circ) +{ + const or_options_t *options = get_options(); + tor_assert(circ); + + /* XXXX025 This is a kludge; we're only keeping it around in case there's + * something that doesn't check unusable_for_new_conns, and to avoid + * deeper refactoring of our expiration logic. */ + if (! circ->base_.timestamp_dirty) + circ->base_.timestamp_dirty = approx_time(); + if (options->MaxCircuitDirtiness >= circ->base_.timestamp_dirty) + circ->base_.timestamp_dirty = 1; /* prevent underflow */ + else + circ->base_.timestamp_dirty -= options->MaxCircuitDirtiness; + + circ->unusable_for_new_conns = 1; +} diff --git a/src/or/circuituse.h b/src/or/circuituse.h index d4d68aa..11e5a64 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -55,6 +55,7 @@ void circuit_change_purpose(circuit_t *circ, uint8_t new_purpose); int hostname_in_track_host_exits(const or_options_t *options, const char *address); +void mark_circuit_unusable_for_new_conns(origin_circuit_t *circ); #endif diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index fcbcb95..76c5f6a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -674,12 +674,10 @@ connection_ap_expire_beginning(void) /* un-mark it as ending, since we're going to reuse it */ conn->edge_has_sent_end = 0; conn->end_reason = 0; - /* kludge to make us not try this circuit again, yet to allow - * current streams on it to survive if they can: make it - * unattractive to use for new streams */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->timestamp_dirty); - circ->timestamp_dirty -= options->MaxCircuitDirtiness; + /* make us not try this circuit again, but allow + * current streams on it to survive if they can */ + mark_circuit_unusable_for_new_conns(TO_ORIGIN_CIRCUIT(circ)); + /* give our stream another 'cutoff' seconds to try */ conn->base_.timestamp_lastread += cutoff; if (entry_conn->num_socks_retries < 250) /* avoid overflow */ @@ -1806,9 +1804,7 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn) connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); return -1; } @@ -1899,9 +1895,7 @@ connection_ap_handshake_send_resolve(entry_connection_t *ap_conn) connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); return -1; } diff --git a/src/or/or.h b/src/or/or.h index 45eb467..e5c6045 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2944,6 +2944,10 @@ typedef struct origin_circuit_t { */ ENUM_BF(path_state_t) path_state : 3; + /* If this flag is set, we should not consider attaching any more + * connections to this circuit. */ + unsigned int unusable_for_new_conns : 1; + /** * Tristate variable to guard against pathbias miscounting * due to circuit purpose transitions changing the decision diff --git a/src/or/relay.c b/src/or/relay.c index 9ff9e1e..fb15141 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -17,6 +17,7 @@ #include "channel.h" #include "circuitbuild.h" #include "circuitlist.h" +#include "circuituse.h" #include "config.h" #include "connection.h" #include "connection_edge.h" @@ -851,9 +852,7 @@ connection_ap_process_end_not_open( /* We haven't retried too many times; reattach the connection. */ circuit_log_path(LOG_INFO,LD_APP,circ); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); if (conn->chosen_exit_optional) { /* stop wanting a specific exit */

1 0

[tor/master] Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:36:25 2013 -0400 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 changes/bug6174 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 12 +++++------- src/or/circuitlist.h | 2 +- src/or/circuituse.c | 36 +++++++++++++++++++++++++++++++++--- src/or/circuituse.h | 1 + src/or/config.c | 2 +- src/or/connection_edge.c | 18 ++++++------------ src/or/main.c | 4 ++-- src/or/or.h | 4 ++++ src/or/relay.c | 5 ++--- 11 files changed, 62 insertions(+), 30 deletions(-)

1 0