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

[tor-browser-build/master] Release preparations for 7.5a8
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c66cabcdd8b364780be5ad6f80d31d7a414e8aac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 11:18:02 2017 +0000 Release preparations for 7.5a8 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/sandbox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 3 ++- 9 files changed, 32 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 24bb711..5b64726 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.4.1 + firefox_platform_version: 52.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/sandbox/config b/projects/sandbox/config index 0a79ac9..03b6f6d 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.14 +version: 0.0.15 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aa33fff..94dedf2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 7.5a7 -- November 15 2017 + * All Platforms + * Update Firefox to 52.5.0esr + * Update Tor to 0.3.2.4-alpha + * Update Torbutton to 1.9.8.3 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + * Update Tor Launcher to 0.2.14 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Translations update + * Update HTTPS-Everywhere to 2017.10.30 + * Update NoScript to 5.1.5 + * Bug 23968: NoScript icon jumps to the right after update + * Update sandboxed-tor-browser to 0.0.15 + * Bug 10394: Don't autoupdate HTTPS Everywhere anymore + * Windows + * Bug 20636+10026: Create 64bit Tor Browser for Windows + * Bug 24052: Block file:// redirects early + Tor Browser 7.5a7 -- November 4 2017 * OS X * Bug 24052: Streamline handling of file:// resources diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6b7559a..06400be 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb + sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ce9cc90..69da745 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.13 +version: 0.2.14 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index af829cd..e704f13 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.2-alpha +version: 0.3.2.4-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 6e45ef8..f92bb48 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.2 +version: 1.9.8.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 34a22bf..394be49 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a7' + torbrowser_version: '7.5a8' torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a6 + - 7.5a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[webwml/master] Remove Nicholas Merrill from people page
by atagar＠torproject.org 09 Nov '17

09 Nov '17

commit bc0196fc250a9db1d2e94d8d7d30b0bbed05c4f0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 9 09:32:45 2017 -0800 Remove Nicholas Merrill from people page Oops, I screwed up. During the flurry of adding folks Nicholas and I had a discussion about if he was on tor-internal@ but then I got confused and added him anyway. Oops. https://trac.torproject.org/projects/tor/ticket/24188 --- about/en/corepeople.wml | 66 +++++++++++++++++---------------------- images/people/nickcalyx.png | Bin 43384 -> 0 bytes images/people/orig/nickcalyx.png | Bin 550678 -> 0 bytes 3 files changed, 28 insertions(+), 38 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 35270cf6..68fb315c 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -557,25 +557,15 @@ table.people tr td:first-child { </td> <td> - <a id="nickcalyx"></a> - <div class="photo"><img src="$(IMGROOT)/people/nickcalyx.png" alt="nickcalyx" /></div> - <div class="icon"><a href="https://twitter.com/nickcalyx"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> - <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=BC2CB9C4993C086FFDAD8D20…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> - <div class="name"><a href="#nickcalyx">Nicholas Merrill</a></div> - <div class="field"><b>IRC:</b> nickcalyx</div> - <div class="description">Runs a directory authority.</div> - </td> - </tr> - - <tr> - <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> <div class="name"><a href="#nickhopper">Nick Hopper</a></div> <div class="field"><b>IRC:</b> nickhopper</div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> + </tr> + <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -585,9 +575,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickm</div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> - </tr> - <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -596,7 +584,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> boklm</div> <div class="description">Works on Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -606,9 +596,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> - </tr> - <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -616,7 +604,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> + </tr> + <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -625,9 +615,7 @@ table.people tr td:first-child { <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> - </tr> - <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -637,7 +625,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> + </tr> + <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -645,9 +635,7 @@ table.people tr td:first-child { <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> - </tr> - <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -656,7 +644,9 @@ table.people tr td:first-child { <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> + </tr> + <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -666,9 +656,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> - </tr> - <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -678,7 +666,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> + </tr> + <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -688,16 +678,16 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> - </tr> - <tr> <td> <a id="roya"></a> <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div> <div class="name"><a href="#roya">Roya Ensafi</a></div> <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div> </td> + </tr> + <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -705,9 +695,7 @@ table.people tr td:first-child { <div class="name"><a href="#sajolida">sajolida</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr> - <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -715,7 +703,9 @@ table.people tr td:first-child { <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> + </tr> + <tr> <td> <a id="serene"></a> <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div> @@ -724,9 +714,7 @@ table.people tr td:first-child { <div class="name"><a href="#serene">Serene</a></div> <div class="description">Snowflake and Pluggable Transports developer.</div> </td> - </tr> - <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -736,7 +724,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ssteele</div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> + </tr> + <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -746,9 +736,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> - </tr> - <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -758,7 +746,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> + </tr> + <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -768,9 +758,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> stephw</div> <div class="description">Directs communications.</div> </td> - </tr> - <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -780,7 +768,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sjmurdoch</div> <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> </td> + </tr> + <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -789,9 +779,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> - </tr> - <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -801,7 +789,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> catalyst</div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> + </tr> + <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -810,9 +800,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> teor</div> <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> </td> - </tr> - <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -822,7 +810,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> tjr</div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -832,9 +822,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> - </tr> - <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -844,7 +832,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> wseltzer</div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> + </tr> + <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/nickcalyx.png b/images/people/nickcalyx.png deleted file mode 100644 index 529d7e88..00000000 Binary files a/images/people/nickcalyx.png and /dev/null differ diff --git a/images/people/orig/nickcalyx.png b/images/people/orig/nickcalyx.png deleted file mode 100644 index ae82f90d..00000000 Binary files a/images/people/orig/nickcalyx.png and /dev/null differ

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 79eda21ffabcdd4c3b5b4e8aedccf0cf3111ad26 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 17:24:49 2017 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ae44aa6..e660e2f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.13</em:version> + <em:version>0.2.14</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[webwml/master] Replace TWN with 'newsletter'
by atagar＠torproject.org 09 Nov '17

09 Nov '17

commit 41a5d2b1a4a30e730240c233146e31a2d53bc13d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 9 09:24:44 2017 -0800 Replace TWN with 'newsletter' Request by Steph on... https://trac.torproject.org/projects/tor/ticket/24184 --- getinvolved/en/volunteer.wml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index f9b77670..74dbf4c5 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -55,9 +55,7 @@ href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, - and summarize noteworthy exchanges into articles for <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor - Weekly News</a>.</li> + and summarize noteworthy changes into articles for our blog and newsletter.</li> <li>Create a presentation that can be used for various user group meetings around the world.</li> <li>Create a video about the positive uses of Tor, what Tor is,

1 0

[tor/master] slight improvement to rust idiomicity
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit 039a77636730633e12410d42191f13dbdf5aea50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 09:48:52 2017 -0500 slight improvement to rust idiomicity --- src/rust/protover/protover.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 85cdb3060..b8bf280d4 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -364,12 +364,7 @@ pub fn protover_string_supports_protocol_or_later( None => return false, }; - for v in supported_versions.iter() { - if v >= &vers { - return true; - } - } - return false; + supported_versions.iter().any(|v| v >= &vers) } /// Fully expand a version range. For example, 1-3 expands to 1,2,3

1 0

[tor/master] Rust implementation of protocol_list_supports_protocol_or_later()
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit c80bb04542b4a56f2c174b526006f6d3e402eecc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 09:42:09 2017 -0500 Rust implementation of protocol_list_supports_protocol_or_later() --- src/rust/protover/ffi.rs | 33 ++++++++++++++++++++++++++++++ src/rust/protover/protover.rs | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index cf2e9fd78..cebf9e12f 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -101,6 +101,39 @@ pub extern "C" fn protocol_list_supports_protocol( } /// Provide an interface for C to translate arguments and return types for +/// protover::list_supports_protocol_or_later +#[no_mangle] +pub extern "C" fn protocol_list_supports_protocol_or_later( + c_protocol_list: *const c_char, + c_protocol: uint32_t, + version: uint32_t, +) -> c_int { + if c_protocol_list.is_null() { + return 1; + } + + // Require an unsafe block to read the version from a C string. The pointer + // is checked above to ensure it is not null. + let c_str: &CStr = unsafe { CStr::from_ptr(c_protocol_list) }; + + let protocol_list = match c_str.to_str() { + Ok(n) => n, + Err(_) => return 1, + }; + + let protocol = match translate_to_rust(c_protocol) { + Ok(n) => n, + Err(_) => return 0, + }; + + let is_supported = + protover_string_supports_protocol_or_later( + protocol_list, protocol, version); + + return if is_supported { 1 } else { 0 }; +} + +/// Provide an interface for C to translate arguments and return types for /// protover::get_supported_protocols #[no_mangle] pub extern "C" fn protover_get_supported_protocols() -> *mut c_char { diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index f19f7972f..85cdb3060 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -325,6 +325,53 @@ pub fn protover_string_supports_protocol( supported_versions.contains(&vers) } +/// As protover_string_supports_protocol(), but also returns True if +/// any later version of the protocol is supported. +/// +/// # Examples +/// ``` +/// use protover::*; +/// +/// let is_supported = protover_string_supports_protocol_or_later( +/// "Link=3-4 Cons=5", Proto::Cons, 5); +/// +/// assert_eq!(true, is_supported); +/// +/// let is_supported = protover_string_supports_protocol_or_later( +/// "Link=3-4 Cons=5", Proto::Cons, 4); +/// +/// assert_eq!(true, is_supported); +/// +/// let is_supported = protover_string_supports_protocol_or_later( +/// "Link=3-4 Cons=5", Proto::Cons, 6); +/// +/// assert_eq!(false, is_supported); +/// ``` +pub fn protover_string_supports_protocol_or_later( + list: &str, + proto: Proto, + vers: u32, +) -> bool { + let supported: HashMap<Proto, HashSet<u32>>; + + match parse_protocols_from_string(list) { + Ok(result) => supported = result, + Err(_) => return false, + } + + let supported_versions = match supported.get(&proto) { + Some(n) => n, + None => return false, + }; + + for v in supported_versions.iter() { + if v >= &vers { + return true; + } + } + return false; +} + /// Fully expand a version range. For example, 1-3 expands to 1,2,3 /// Helper for get_versions ///

1 0

[tor/master] Fix unit test behavior: we need to be in STATE_LIVE.
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit 6ea3db6fa776e2b2b9d3f4da377a6ceaea0a323f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 09:30:43 2017 -0500 Fix unit test behavior: we need to be in STATE_LIVE. --- src/test/test_routerlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 05d0820d8..fd29e8f17 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -5,11 +5,12 @@ #include <math.h> #include <time.h> +#define CONNECTION_PRIVATE +#define DIRECTORY_PRIVATE #define DIRVOTE_PRIVATE #define ENTRYNODES_PRIVATE -#define DIRECTORY_PRIVATE +#define HIBERNATE_PRIVATE #define NETWORKSTATUS_PRIVATE -#define CONNECTION_PRIVATE #define ROUTERLIST_PRIVATE #define TOR_UNIT_TESTING #include "or.h" @@ -20,6 +21,7 @@ #include "directory.h" #include "dirvote.h" #include "entrynodes.h" +#include "hibernate.h" #include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" @@ -453,6 +455,8 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg) (void) arg; + hibernate_set_state_for_testing_(HIBERNATE_STATE_LIVE); + /* Initialize the SRV subsystem */ MOCK(get_my_v3_authority_cert, get_my_v3_authority_cert_m); mock_cert = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL);

1 0

[tor/master] missing subcategory
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit aa9688a4ad4d7ab30d633610fea155a4251d5c5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 09:23:12 2017 -0500 missing subcategory --- changes/bug12062 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug12062 b/changes/bug12062 index c02fd7503..8972929d8 100644 --- a/changes/bug12062 +++ b/changes/bug12062 @@ -1,4 +1,4 @@ - o Minor bugfixes: + o Minor bugfixes (hibernation, bandwidth accounting, shutdown): - When hibernating, do not attempt to launch DNS checks. Fixes a case of bug 12062; bugfix on 0.1.2.2-alpha.

1 0

[tor/master] Audit all of the "is the network turned off" checks.
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit 0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 14:34:36 2017 -0400 Audit all of the "is the network turned off" checks. DisableNetwork is a subset of net_is_disabled(), which is (now) a subset of should_delay_dir_fetches(). Some of these changes are redundant with others higher or lower in the call stack. The ones that I think are behavior-relevant are listed in the changes file. I've also added comments in a few places where the behavior is subtle. Fixes bug 12062; bugfix on various versions. --- changes/bug12062 | 16 ++++++++++++++++ src/or/connection.c | 6 +++++- src/or/dns.c | 4 ++-- src/or/main.c | 14 +++++++++----- src/or/networkstatus.c | 9 +++++++++ src/or/routerlist.c | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/changes/bug12062 b/changes/bug12062 new file mode 100644 index 000000000..c02fd7503 --- /dev/null +++ b/changes/bug12062 @@ -0,0 +1,16 @@ + o Minor bugfixes: + + - When hibernating, do not attempt to launch DNS checks. Fixes a + case of bug 12062; bugfix on 0.1.2.2-alpha. + + - Resolve several bugs related to descriptor fetching on bridge + clients with bandwidth accounting enabled. (This combination is + not recommended!) Fixes a case of bug 12062; bugfix on + 0.2.0.3-alpha. + + - When hibernating, do not try to upload or download + descriptors. Fixes a case of bug 12062; bugfix on 0.0.9pre5. + + - Do not attempt to launch self-reachability tests when entering + hibernation. Fixes a base of bug 12062; bugfix on 0.0.9pre5. + diff --git a/src/or/connection.c b/src/or/connection.c index 632a83365..66eccf7ce 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1746,7 +1746,11 @@ connection_connect_sockaddr,(connection_t *conn, if (get_options()->DisableNetwork) { /* We should never even try to connect anyplace if DisableNetwork is set. - * Warn if we do, and refuse to make the connection. */ + * Warn if we do, and refuse to make the connection. + * + * We only check DisableNetwork here, not we_are_hibernating(), since + * we'll still try to fulfill client requests sometimes in the latter case + * (if it is soft hibernation) */ static ratelim_t disablenet_violated = RATELIM_INIT(30*60); *socket_error = SOCK_ERRNO(ENETUNREACH); log_fn_ratelim(&disablenet_violated, LOG_WARN, LD_BUG, diff --git a/src/or/dns.c b/src/or/dns.c index 078bde3ef..1de606f8d 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1648,7 +1648,7 @@ launch_resolve,(cached_resolve_t *resolve)) tor_addr_t a; int r; - if (get_options()->DisableNetwork) + if (net_is_disabled()) return -1; /* What? Nameservers not configured? Sounds like a bug. */ @@ -1883,7 +1883,7 @@ launch_test_addresses(evutil_socket_t fd, short event, void *args) (void)event; (void)args; - if (options->DisableNetwork) + if (net_is_disabled()) return; log_info(LD_EXIT, "Launching checks to see whether our nameservers like to " diff --git a/src/or/main.c b/src/or/main.c index 65b0b8f4d..7eeaf4004 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1405,7 +1405,9 @@ run_scheduled_events(time_t now) /* Maybe enough time elapsed for us to reconsider a circuit. */ circuit_upgrade_circuits_from_guard_wait(); - if (options->UseBridges && !options->DisableNetwork) { + if (options->UseBridges && !net_is_disabled()) { + /* Note: this check uses net_is_disabled(), not should_delay_dir_fetches() + * -- the latter is only for fetching consensus-derived directory info. */ fetch_bridge_descriptors(options, now); } @@ -1511,7 +1513,7 @@ rotate_onion_key_callback(time_t now, const or_options_t *options) if (router_rebuild_descriptor(1)<0) { log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); } - if (advertised_server_mode() && !options->DisableNetwork) + if (advertised_server_mode() && !net_is_disabled()) router_upload_dir_desc_to_dirservers(0); return ONION_KEY_CONSENSUS_CHECK_INTERVAL; } @@ -1877,9 +1879,11 @@ check_descriptor_callback(time_t now, const or_options_t *options) * address has changed. */ #define CHECK_DESCRIPTOR_INTERVAL (60) + (void)options; + /* 2b. Once per minute, regenerate and upload the descriptor if the old * one is inaccurate. */ - if (!options->DisableNetwork) { + if (!net_is_disabled()) { check_descriptor_bandwidth_changed(now); check_descriptor_ipaddress_changed(now); mark_my_descriptor_dirty_if_too_old(now); @@ -1911,7 +1915,7 @@ check_for_reachability_bw_callback(time_t now, const or_options_t *options) * 20 minutes of our uptime. */ if (server_mode(options) && (have_completed_a_circuit() || !any_predicted_circuits(now)) && - !we_are_hibernating()) { + !net_is_disabled()) { if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { consider_testing_reachability(1, dirport_reachability_count==0); if (++dirport_reachability_count > 5) @@ -2405,7 +2409,7 @@ do_hup(void) /* retry appropriate downloads */ router_reset_status_download_failures(); router_reset_descriptor_download_failures(); - if (!options->DisableNetwork) + if (!net_is_disabled()) update_networkstatus_downloads(time(NULL)); /* We'll retry routerstatus downloads in about 10 seconds; no need to diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 93bb8643d..9590fe080 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -52,6 +52,7 @@ #include "dirserv.h" #include "dirvote.h" #include "entrynodes.h" +#include "hibernate.h" #include "main.h" #include "microdesc.h" #include "networkstatus.h" @@ -1208,6 +1209,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) return 1; } + if (we_are_hibernating()) { + if (msg_out) { + *msg_out = "We are hibernating or shutting down."; + } + log_info(LD_DIR, "Delaying dir fetches (Hibernating or shutting down)"); + return 1; + } + if (options->UseBridges) { if (!any_bridge_descriptors_known()) { if (msg_out) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c7c109253..d005df945 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4531,7 +4531,7 @@ signed_desc_digest_is_recognized(signed_descriptor_t *desc) void update_all_descriptor_downloads(time_t now) { - if (get_options()->DisableNetwork) + if (should_delay_dir_fetches(get_options(), NULL)) return; update_router_descriptor_downloads(now); update_microdesc_downloads(now);

1 0

[tor/master] Merge branch 'ticket12062_squashed'
by nickm＠torproject.org 09 Nov '17

09 Nov '17

commit 552218437ccbe8fc13ad431fbe2167331b886497 Merge: 062603156 0c6eabf08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 09:20:55 2017 -0500 Merge branch 'ticket12062_squashed' changes/bug12062 | 16 ++++++++++++++++ src/or/connection.c | 6 +++++- src/or/dns.c | 4 ++-- src/or/main.c | 14 +++++++++----- src/or/networkstatus.c | 9 +++++++++ src/or/routerlist.c | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-)

1 0