February 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Check arguments and initialise variables in compute_weighted_bandwidths()
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 4f944cc4cc1971baf2924bc3f713feef7b010691 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 8 14:17:37 2017 +1100 Check arguments and initialise variables in compute_weighted_bandwidths() Cleanup after 23318. --- src/or/routerlist.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 80486cccb..c9d2cbaea 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2547,9 +2547,12 @@ compute_weighted_bandwidths(const smartlist_t *sl, double Wg = -1, Wm = -1, We = -1, Wd = -1; double Wgb = -1, Wmb = -1, Web = -1, Wdb = -1; guardfraction_bandwidth_t guardfraction_bw; - double *bandwidths; + double *bandwidths = NULL; double total_bandwidth = 0.0; + tor_assert(sl); + tor_assert(bandwidths_out); + /* Can't choose exit and guard at same time */ tor_assert(rule == NO_WEIGHTING || rule == WEIGHT_FOR_EXIT || @@ -2557,6 +2560,8 @@ compute_weighted_bandwidths(const smartlist_t *sl, rule == WEIGHT_FOR_MID || rule == WEIGHT_FOR_DIR); + *bandwidths_out = NULL; + if (total_bandwidth_out) { *total_bandwidth_out = 0.0; }

1 0

[tor/release-0.3.1] Use node counts in networks with all zero-bandwidths
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 14b0bba06e65a1dfca6a2f15f3016cb36409183f Author: teor <teor2345(a)gmail.com> Date: Wed Nov 8 14:09:50 2017 +1100 Use node counts in networks with all zero-bandwidths When calculating the fraction of nodes that have descriptors, and all all nodes in the network have zero bandwidths, count the number of nodes instead. Fixes bug 23318; bugfix on 0.2.4.10-alpha. --- changes/bug23318 | 4 ++++ src/or/routerlist.c | 28 ++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/changes/bug23318 b/changes/bug23318 index 32c85eb19..7fcb8d448 100644 --- a/changes/bug23318 +++ b/changes/bug23318 @@ -5,3 +5,7 @@ integer. This had the biggest effect when a relay's weight adjustments should have given it weight 0, but it got weight 1 instead. Fixes bug 23318; bugfix on 0.2.4.3-alpha. + - When calculating the fraction of nodes that have descriptors, and all + all nodes in the network have zero bandwidths, count the number of nodes + instead. + Fixes bug 23318; bugfix on 0.2.4.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index faf2eeda5..d6347c49f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -149,7 +149,8 @@ typedef struct cert_list_t cert_list_t; /* static function prototypes */ static int compute_weighted_bandwidths(const smartlist_t *sl, bandwidth_weight_rule_t rule, - double **bandwidths_out); + double **bandwidths_out, + double *total_bandwidth_out); static const routerstatus_t *router_pick_trusteddirserver_impl( const smartlist_t *sourcelist, dirinfo_type_t auth, int flags, int *n_busy_out); @@ -2513,7 +2514,7 @@ smartlist_choose_node_by_bandwidth_weights(const smartlist_t *sl, double *bandwidths_dbl=NULL; uint64_t *bandwidths_u64=NULL; - if (compute_weighted_bandwidths(sl, rule, &bandwidths_dbl) < 0) + if (compute_weighted_bandwidths(sl, rule, &bandwidths_dbl, NULL) < 0) return NULL; bandwidths_u64 = tor_calloc(smartlist_len(sl), sizeof(uint64_t)); @@ -2533,11 +2534,14 @@ smartlist_choose_node_by_bandwidth_weights(const smartlist_t *sl, * smartlist_choose_node_by_bandwidth_weights, compute weighted bandwidth * values for each node and store them in a freshly allocated * *bandwidths_out of the same length as sl, and holding results - * as doubles. Return 0 on success, -1 on failure. */ + * as doubles. If total_bandwidth_out is non-NULL, set it to the total + * of all the bandwidths. + * Return 0 on success, -1 on failure. */ static int compute_weighted_bandwidths(const smartlist_t *sl, bandwidth_weight_rule_t rule, - double **bandwidths_out) + double **bandwidths_out, + double *total_bandwidth_out) { int64_t weight_scale; double Wg = -1, Wm = -1, We = -1, Wd = -1; @@ -2545,6 +2549,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, uint64_t weighted_bw = 0; guardfraction_bandwidth_t guardfraction_bw; double *bandwidths; + double total_bandwidth = 0.0; /* Can't choose exit and guard at same time */ tor_assert(rule == NO_WEIGHTING || @@ -2553,6 +2558,10 @@ compute_weighted_bandwidths(const smartlist_t *sl, rule == WEIGHT_FOR_MID || rule == WEIGHT_FOR_DIR); + if (total_bandwidth_out) { + *total_bandwidth_out = 0.0; + } + if (smartlist_len(sl) == 0) { log_info(LD_CIRC, "Empty routerlist passed in to consensus weight node " @@ -2714,6 +2723,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, } bandwidths[node_sl_idx] = final_weight; + total_bandwidth += final_weight; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based " @@ -2724,6 +2734,10 @@ compute_weighted_bandwidths(const smartlist_t *sl, *bandwidths_out = bandwidths; + if (total_bandwidth_out) { + *total_bandwidth_out = total_bandwidth; + } + return 0; } @@ -2740,7 +2754,8 @@ frac_nodes_with_descriptors(const smartlist_t *sl, if (smartlist_len(sl) == 0) return 0.0; - if (compute_weighted_bandwidths(sl, rule, &bandwidths) < 0) { + if (compute_weighted_bandwidths(sl, rule, &bandwidths, &total) < 0 || + total <= 0.0) { int n_with_descs = 0; SMARTLIST_FOREACH(sl, const node_t *, node, { if (node_has_descriptor(node)) @@ -2759,9 +2774,6 @@ frac_nodes_with_descriptors(const smartlist_t *sl, tor_free(bandwidths); - if (total < 1.0) - return 0; - return present / total; }

1 0

[tor/release-0.3.1] Merge branch 'bug23318-redux_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit e91bae66d88a863970658174f8734b303042a161 Merge: 84c13336c 6e4ebd41b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:03 2018 -0500 Merge branch 'bug23318-redux_029' into maint-0.2.9 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 0f4b1020af4a622976273383dbee1b3d3320a449 Merge: 97c988c43 91109bc81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/release-0.3.1] Stop calculating total twice in frac_nodes_with_descriptors()
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 6e4ebd41bb5479ffe05ed173a1d7aeffcf592248 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 8 14:18:46 2017 +1100 Stop calculating total twice in frac_nodes_with_descriptors() Cleanup after 23318. --- src/or/routerlist.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c9d2cbaea..8f53c0200 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2768,12 +2768,10 @@ frac_nodes_with_descriptors(const smartlist_t *sl, return ((double)n_with_descs) / (double)smartlist_len(sl); } - total = present = 0.0; + present = 0.0; SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { - const double bw = bandwidths[node_sl_idx]; - total += bw; if (node_has_descriptor(node)) - present += bw; + present += bandwidths[node_sl_idx]; } SMARTLIST_FOREACH_END(node); tor_free(bandwidths);

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 12 Feb '18

12 Feb '18

commit 72aedef6152b242fd30e6f5e5b3a737d907c44b8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 12 09:19:58 2018 +0000 Update translations for tor-messenger-otrproperties --- br/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/otr.properties b/br/otr.properties index 11b23be4d..95a250802 100644 --- a/br/otr.properties +++ b/br/otr.properties @@ -27,5 +27,5 @@ query.msg=%S has requested an Off-the Record private conversation. However, you trust.unused=Unused trust.not_private=Not Private trust.unverified=Unverified -trust.private=Private +trust.private=Prevez trust.finished=Finished

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 12 Feb '18

12 Feb '18

commit e1ad385a631394edd74c546974ad48beaae9e2c2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 12 09:19:18 2018 +0000 Update translations for tails-onioncircuits --- br/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/onioncircuits.pot b/br/onioncircuits.pot index a61ddc788..2775d01ea 100644 --- a/br/onioncircuits.pot +++ b/br/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2018-01-12 12:57+0000\n" +"PO-Revision-Date: 2018-02-12 08:56+0000\n" "Last-Translator: Irriep Nala Novram <allannkorh(a)yahoo.fr>\n" "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n" "MIME-Version: 1.0\n"

1 0

[doctor/master] Dynamically get package versions from the wiki
by atagar＠torproject.org 12 Feb '18

12 Feb '18

commit d7c1caadb5af4431ad8bafb54bbb1fb716b88a68 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 11 19:15:45 2018 -0800 Dynamically get package versions from the wiki The biggest time sync for me to keep this wiki up to date is bumping versions in this DocTor script. It's brittle, but instead having this script get the current versions on the wiki first so all I need to do to update is fix the wiki. --- package_versions.py | 161 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 121 insertions(+), 40 deletions(-) diff --git a/package_versions.py b/package_versions.py index 6c6e3f6..aa10bad 100755 --- a/package_versions.py +++ b/package_versions.py @@ -26,57 +26,58 @@ NETBSD_VERSION = 'CURRENT, Version: ([0-9\.]+),' COLUMN = '| %-10s | %-10s | %-10s | %-50s |' DIV = '+%s+%s+%s+%s+' % ('-' * 12, '-' * 12, '-' * 12, '-' * 52) +TRAC_URL = 'https://trac.torproject.org/projects/tor/wiki/doc/packages' -Package = collections.namedtuple('Package', ['platform', 'url', 'version', 'regex']) +Package = collections.namedtuple('Package', ['platform', 'url', 'regex']) PACKAGES = [ ('tor', [ - Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', '0.3.2.9', 'tor-([0-9\.]+).tar.gz'), - Package('debian', 'https://packages.debian.org/sid/tor', '0.3.2.9', DEBIAN_VERSION), - Package('fedora', 'https://apps.fedoraproject.org/packages/tor', '0.3.2.9', FEDORA_VERSION), - Package('gentoo', 'https://packages.gentoo.org/packages/net-vpn/tor', '0.3.2.9', None), - Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/tor/', '0.3.2.9', ARCH_LINUX_VERSION), - Package('slackware', 'https://slackbuilds.org/repository/14.2/network/tor/', '0.3.2.9', 'tor-([0-9\.]+).tar.gz'), - Package('freebsd', 'https://www.freshports.org/security/tor/', '0.3.2.9', FREEBSD_VERSION), - Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/Makefile?rev=HEAD&c…', '0.3.2.9', OPENBSD_DIST_VERSION), - Package('netbsd', 'http://pkgsrc.se/net/tor', '0.3.2.9', NETBSD_VERSION), + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', 'tor-([0-9\.]+).tar.gz'), + Package('debian', 'https://packages.debian.org/sid/tor', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/tor', FEDORA_VERSION), + Package('gentoo', 'https://packages.gentoo.org/packages/net-vpn/tor', None), + Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/tor/', ARCH_LINUX_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/network/tor/', 'tor-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/tor/', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/Makefile?rev=HEAD&c…', OPENBSD_DIST_VERSION), + Package('netbsd', 'http://pkgsrc.se/net/tor', NETBSD_VERSION), ]), ('nyx', [ - Package('gentoo', 'https://packages.gentoo.org/packages/net-misc/nyx', '2.0.4', None), - Package('archlinux', 'https://aur.archlinux.org/packages/nyx/', '2.0.4', AUR_VERSION), - Package('slackware', 'https://slackbuilds.org/repository/14.2/python/nyx/', '2.0.4', 'nyx-([0-9\.]+).tar.gz'), - Package('freebsd', 'https://www.freshports.org/security/nyx/', '2.0.4', FREEBSD_VERSION), - Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/nyx/Makefile?rev=HEAD&c…', '2.0.4', OPENBSD_EGG_VERSION), + Package('gentoo', 'https://packages.gentoo.org/packages/net-misc/nyx', None), + Package('archlinux', 'https://aur.archlinux.org/packages/nyx/', AUR_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/nyx/', 'nyx-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/nyx/', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/nyx/Makefile?rev=HEAD&c…', OPENBSD_EGG_VERSION), ]), ('stem', [ - Package('debian', 'https://packages.debian.org/sid/python-stem', '1.6.0', DEBIAN_VERSION), - Package('fedora', 'https://apps.fedoraproject.org/packages/python-stem', '1.6.0', FEDORA_VERSION), - Package('gentoo', 'https://packages.gentoo.org/packages/net-libs/stem', '1.6.0', None), - Package('archlinux', 'https://aur.archlinux.org/packages/stem/', '1.6.0', AUR_VERSION), - Package('slackware', 'https://slackbuilds.org/repository/14.2/python/stem/', '1.6.0', 'stem-([0-9\.]+).tar.gz'), - Package('freebsd', 'https://www.freshports.org/security/py-stem/', '1.6.0', FREEBSD_VERSION), - Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/py-stem/Makefile?rev=HE…', '1.6.0', OPENBSD_EGG_VERSION), + Package('debian', 'https://packages.debian.org/sid/python-stem', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/python-stem', FEDORA_VERSION), + Package('gentoo', 'https://packages.gentoo.org/packages/net-libs/stem', None), + Package('archlinux', 'https://aur.archlinux.org/packages/stem/', AUR_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/stem/', 'stem-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/py-stem/', FREEBSD_VERSION), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/py-stem/Makefile?rev=HE…', OPENBSD_EGG_VERSION), ]), ('txtorcon', [ - Package('debian', 'https://packages.debian.org/sid/python-txtorcon', '0.19.3', DEBIAN_VERSION), - Package('gentoo', 'https://packages.gentoo.org/packages/dev-python/txtorcon', '0.19.3', None), - Package('slackware', 'https://slackbuilds.org/repository/14.2/python/txtorcon/', '0.19.3', 'txtorcon-([0-9\.]+).tar.gz'), - Package('freebsd', 'https://www.freshports.org/security/py-txtorcon/', '0.19.3', FREEBSD_VERSION), + Package('debian', 'https://packages.debian.org/sid/python-txtorcon', DEBIAN_VERSION), + Package('gentoo', 'https://packages.gentoo.org/packages/dev-python/txtorcon', None), + Package('slackware', 'https://slackbuilds.org/repository/14.2/python/txtorcon/', 'txtorcon-([0-9\.]+).tar.gz'), + Package('freebsd', 'https://www.freshports.org/security/py-txtorcon/', FREEBSD_VERSION), ]), ('torsocks', [ - Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', '2.2.0', ':tag => "v([0-9\.]+)",'), - Package('debian', 'https://packages.debian.org/sid/torsocks', '2.2.0', DEBIAN_VERSION), - Package('fedora', 'https://apps.fedoraproject.org/packages/torsocks', '2.1.0', FEDORA_VERSION), - Package('gentoo', 'https://packages.gentoo.org/packages/net-proxy/torsocks', '2.2.0', None), - Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/torsocks/', '2.2.0', ARCH_LINUX_VERSION), - Package('slackware', 'https://slackbuilds.org/repository/14.2/network/torsocks/', '2.2.0', 'torsocks \(([0-9\.]+)\) </h2>'), - Package('freebsd', 'https://www.freshports.org/net/torsocks/', '2.2.0', 'SHA256 \(dgoulet-torsocks-v([0-9\.]+)_GH0.tar.gz\)'), - Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/torsocks/Makefile?rev=H…', '1.2', OPENBSD_DIST_VERSION), + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor…', ':tag => "v([0-9\.]+)",'), + Package('debian', 'https://packages.debian.org/sid/torsocks', DEBIAN_VERSION), + Package('fedora', 'https://apps.fedoraproject.org/packages/torsocks', FEDORA_VERSION), + Package('gentoo', 'https://packages.gentoo.org/packages/net-proxy/torsocks', None), + Package('archlinux', 'https://www.archlinux.org/packages/community/x86_64/torsocks/', ARCH_LINUX_VERSION), + Package('slackware', 'https://slackbuilds.org/repository/14.2/network/torsocks/', 'torsocks \(([0-9\.]+)\) </h2>'), + Package('freebsd', 'https://www.freshports.org/net/torsocks/', 'SHA256 \(dgoulet-torsocks-v([0-9\.]+)_GH0.tar.gz\)'), + Package('openbsd', 'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/torsocks/Makefile?rev=H…', OPENBSD_DIST_VERSION), ]), ('ooni probe', [ - Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/oon…', '2.2.0', 'ooniprobe-([0-9\.]+).tar.gz'), - Package('debian', 'https://packages.debian.org/sid/ooniprobe', '2.2.0', DEBIAN_VERSION), - Package('archlinux', 'https://aur.archlinux.org/packages/ooniprobe/', '1.2.2', AUR_VERSION), + Package('mac', 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/oon…', 'ooniprobe-([0-9\.]+).tar.gz'), + Package('debian', 'https://packages.debian.org/sid/ooniprobe', DEBIAN_VERSION), + Package('archlinux', 'https://aur.archlinux.org/packages/ooniprobe/', AUR_VERSION), ]), ] @@ -94,6 +95,76 @@ def fetch_url(url): raise IOError(str(exc)) +def wiki_package_versions(): + # Provides versions present on the wiki of the form... + # + # {project => {platform => version}} + # + # Unfortunately the wiki table lacks good handles to match against so this is + # gonna be very, very brittle. That's fine though - this is just an effort + # saving measure for me anyway. ;P + + request = fetch_url(TRAC_URL) + version_entries = [] + + for line in request.splitlines(): + m = re.search('Version: <a href=".*">(.*)</a>', line) + + if m: + version_entries.append(m.group(1)) + + if len(version_entries) != 38: + raise IOError('Table on %s no longer matches what this daemon expects (had %i entries)' % (TRAC_URL, len(version_entries))) + + return { + 'tor': { + 'mac': version_entries[0], + 'debian': version_entries[1], + 'fedora': version_entries[2], + 'gentoo': version_entries[3], + 'archlinux': version_entries[4], + 'slackware': version_entries[5], + 'freebsd': version_entries[6], + 'openbsd': version_entries[7], + 'netbsd': version_entries[8], + }, 'nyx': { + 'fedora': version_entries[9], + 'gentoo': version_entries[10], + 'archlinux': version_entries[11], + 'slackware': version_entries[12], + 'freebsd': version_entries[13], + 'openbsd': version_entries[14], + }, 'stem': { + 'debian': version_entries[15], + 'fedora': version_entries[16], + 'gentoo': version_entries[17], + 'archlinux': version_entries[18], + 'slackware': version_entries[19], + 'freebsd': version_entries[20], + 'openbsd': version_entries[21], + }, 'txtorcon': { + 'debian': version_entries[22], + 'gentoo': version_entries[23], + 'archlinux': version_entries[24], + 'slackware': version_entries[25], + 'freebsd': version_entries[26], + }, 'torsocks': { + 'mac': version_entries[27], + 'debian': version_entries[28], + 'fedora': version_entries[29], + 'gentoo': version_entries[30], + 'archlinux': version_entries[31], + 'slackware': version_entries[32], + 'freebsd': version_entries[33], + 'openbsd': version_entries[34], + }, 'ooni probe': { + 'mac': version_entries[35], + 'debian': version_entries[36], + 'archlinux': version_entries[37], + } + } + + def gentoo_version(request): # Unlike other platforms gentoo lists all package versions, so we # need to figure out what's the latest. @@ -118,6 +189,11 @@ def email_content(): lines.append(DIV) lines.append(COLUMN % ('Project', 'Platform', 'Version', 'Status')) + try: + wiki_versions = wiki_package_versions() + except IOError as exc: + return str(exc), True + has_issue = False for project, packages in PACKAGES: @@ -125,6 +201,11 @@ def email_content(): for package in packages: try: + wiki_version = wiki_versions[project][package.platform] + except KeyError: + return 'Failed to get wiki version for %s on %s' % (project, package.platform), True + + try: request = fetch_url(package.url) if package.platform == 'gentoo': @@ -136,10 +217,10 @@ def email_content(): if not current_version: msg = 'unable to determine current version' has_issue = True - elif current_version == package.version: + elif current_version == wiki_version: msg = 'up to date' else: - msg = 'current version is %s but wiki has %s' % (current_version, package.version) + msg = 'current version is %s but wiki has %s' % (current_version, wiki_version) has_issue = True except IOError as exc: msg = 'unable to retrieve current version: %s' % exc @@ -150,7 +231,7 @@ def email_content(): if package.platform == 'gentoo': has_issue = True - lines.append(COLUMN % (project, package.platform, package.version, msg)) + lines.append(COLUMN % (project, package.platform, wiki_version, msg)) lines.append(DIV) return '\n'.join(lines), has_issue

1 0

[doctor/master] Move curling to a helper
by atagar＠torproject.org 12 Feb '18

12 Feb '18

commit 22080b3f4b08f05c2c6e2fa841c259620ed66d72 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 11 18:23:35 2018 -0800 Move curling to a helper No reason to bundle retries and such in the main function. --- package_versions.py | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/package_versions.py b/package_versions.py index 9d56659..6c6e3f6 100755 --- a/package_versions.py +++ b/package_versions.py @@ -83,6 +83,17 @@ PACKAGES = [ log = util.get_logger('package_versions') +def fetch_url(url): + for i in range(3): + try: + return urllib2.urlopen(url, timeout = 5).read() + except Exception as exc: + if i < 2: + time.sleep(2 ** i) + else: + raise IOError(str(exc)) + + def gentoo_version(request): # Unlike other platforms gentoo lists all package versions, so we # need to figure out what's the latest. @@ -113,19 +124,9 @@ def email_content(): lines.append(DIV) for package in packages: - request, request_exc = None, None - - for i in range(3): - try: - request = urllib2.urlopen(package.url, timeout = 5).read() - break - except Exception as exc: - request_exc = exc # note exception and retry + try: + request = fetch_url(package.url) - if i != 2: - time.sleep(2 ** i) - - if request: if package.platform == 'gentoo': current_version = gentoo_version(request) else: @@ -140,9 +141,14 @@ def email_content(): else: msg = 'current version is %s but wiki has %s' % (current_version, package.version) has_issue = True - else: - msg = 'unable to retrieve current version: %s' % request_exc - has_issue = True + except IOError as exc: + msg = 'unable to retrieve current version: %s' % exc + + # Gentoo's site fails pretty routinely. No need to generate notices for + # it. + + if package.platform == 'gentoo': + has_issue = True lines.append(COLUMN % (project, package.platform, package.version, msg))

1 0