- tor-commits - lists.torproject.org

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 10 Mar '12

10 Mar '12

commit 0f5b63a03102f77d648d67ceab618582dfab0af3 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 9 15:58:27 2012 -0300 Add a changes file --- changes/bug5351 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/bug5351 b/changes/bug5351 new file mode 100644 index 0000000..18e290c --- /dev/null +++ b/changes/bug5351 @@ -0,0 +1 @@ + o Do not ignore the Show on Startup checkbox. Fixes bug 5351. \ No newline at end of file

1 0

[vidalia/alpha] Fix show on startup being ignored by making the StatusTab visible
by chiiph＠torproject.org 10 Mar '12

10 Mar '12

commit 45b914d6842ce88f6578cdb65a730d59cfe24268 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 9 15:19:11 2012 -0300 Fix show on startup being ignored by making the StatusTab visible --- src/vidalia/MainWindow.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a27b197..4307f05 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -130,7 +130,7 @@ MainWindow::MainWindow() TransformProcessType(&psn, kProcessTransformToForegroundApplication); } /* Vidalia launched in background (LSUIElement=true). Bring to foreground. */ - VidaliaWindow::setVisible(true); + VidaliaWindow::setVisible(settings.showMainWindowAtStart()); #endif } @@ -310,7 +310,7 @@ MainWindow::createTrayIcon() _statusTab.checkShowOnStartup(settings.showMainWindowAtStart()); if (_statusTab.isCheckedShowOnStartup()) - show(); + show(); _trayIcon.show(); } @@ -1820,7 +1820,7 @@ MainWindow::addTab(VidaliaTab *tab) _tabMap << tab->getTitle(); connect(tab, SIGNAL(helpRequested(QString)), this, SLOT(showHelpDialog(QString))); - if(!isVisible()) + if(!isVisible() and (tab != &_statusTab)) setVisible(true); }

1 0

[tor/master] Merge branch 'bug5343' into maint-0.2.2
by nickm＠torproject.org 10 Mar '12

10 Mar '12

commit a574f7f3fe7b4f7300c1ced5f67d8e014e04ffbd Merge: 31f253a ec8a06c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 9 13:54:04 2012 -0500 Merge branch 'bug5343' into maint-0.2.2 changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-)

1 0

[tor/master] Require a threshold of exit nodes before building circuits
by nickm＠torproject.org 10 Mar '12

10 Mar '12

commit ec8a06c5a17c1c4c0b5ff17e73810d98fcdf949b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 15:42:54 2012 -0500 Require a threshold of exit nodes before building circuits This mitigates an attack proposed by wanoskarnet, in which all of a client's bridges collude to restrict the exit nodes that the client knows about. Fixes bug 5343. --- changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/changes/bug5343 b/changes/bug5343 new file mode 100644 index 0000000..e4e1489 --- /dev/null +++ b/changes/bug5343 @@ -0,0 +1,7 @@ + o Security fixes: + - Only build circuits if we have a sufficient threshold of the total + descriptors marked in the consensus with the "Exit" flag. This + mitigates an attack proposed by wanoskarnet, in which all of a + client's bridges collude to restrict the exit nodes that the + client knows about. Fixes bug 5343. + diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1edf651..f9d2e85 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4788,18 +4788,21 @@ get_dir_info_status_string(void) * them seem like ones we'd use, and how many of those we have * descriptors for. Store the former in *num_usable and the latter in * *num_present. If in_set is non-NULL, only consider those - * routers in in_set. + * routers in in_set. If exit_only is true, only consider nodes + * with the Exit flag. */ static void count_usable_descriptors(int *num_present, int *num_usable, const networkstatus_t *consensus, or_options_t *options, time_t now, - routerset_t *in_set) + routerset_t *in_set, int exit_only) { *num_present = 0, *num_usable=0; SMARTLIST_FOREACH(consensus->routerstatus_list, routerstatus_t *, rs, { + if (exit_only && ! rs->is_exit) + continue; if (in_set && ! routerset_contains_routerstatus(in_set, rs)) continue; if (client_would_use_router(rs, now, options)) { @@ -4830,7 +4833,7 @@ count_loading_descriptors_progress(void) return 0; /* can't count descriptors if we have no list of them */ count_usable_descriptors(&num_present, &num_usable, - consensus, get_options(), now, NULL); + consensus, get_options(), now, NULL, 0); if (num_usable == 0) return 0; /* don't div by 0 */ @@ -4849,6 +4852,7 @@ static void update_router_have_minimum_dir_info(void) { int num_present = 0, num_usable=0; + int num_exit_present = 0, num_exit_usable = 0; time_t now = time(NULL); int res; or_options_t *options = get_options(); @@ -4875,7 +4879,9 @@ update_router_have_minimum_dir_info(void) } count_usable_descriptors(&num_present, &num_usable, consensus, options, now, - NULL); + NULL, 0); + count_usable_descriptors(&num_exit_present, &num_exit_usable, + consensus, options, now, options->ExitNodes, 1); if (num_present < num_usable/4) { tor_snprintf(dir_info_status, sizeof(dir_info_status), @@ -4889,12 +4895,25 @@ update_router_have_minimum_dir_info(void) num_present, num_present ? "" : "s"); res = 0; goto done; + } else if (num_exit_present < num_exit_usable / 3) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "We have only %d/%d usable exit node descriptors.", + num_exit_present, num_exit_usable); + res = 0; + control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); + goto done; + } else if (num_exit_present < 2) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "Only %d descriptor%s here and believed reachable!", + num_exit_present, num_exit_present ? "" : "s"); + res = 0; + goto done; } /* Check for entry nodes. */ if (options->EntryNodes) { count_usable_descriptors(&num_present, &num_usable, consensus, options, - now, options->EntryNodes); + now, options->EntryNodes, 0); if (!num_usable || !num_present) { tor_snprintf(dir_info_status, sizeof(dir_info_status),

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 10 Mar '12

10 Mar '12

commit d4526e1d4a02b3faa6b7b6030a634cbe20bea9f2 Merge: c13dc51 a574f7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 9 13:57:32 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/routerlist.c changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --cc src/or/routerlist.c index d0ef662,f9d2e85..a9946b8 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -4896,25 -4794,20 +4897,27 @@@ get_dir_info_status_string(void static void count_usable_descriptors(int *num_present, int *num_usable, const networkstatus_t *consensus, - or_options_t *options, time_t now, + const or_options_t *options, time_t now, - routerset_t *in_set) + routerset_t *in_set, int exit_only) { + const int md = (consensus->flavor == FLAV_MICRODESC); *num_present = 0, *num_usable=0; - SMARTLIST_FOREACH(consensus->routerstatus_list, routerstatus_t *, rs, - { + SMARTLIST_FOREACH_BEGIN(consensus->routerstatus_list, routerstatus_t *, rs) + { + if (exit_only && ! rs->is_exit) + continue; - if (in_set && ! routerset_contains_routerstatus(in_set, rs)) + if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1)) continue; if (client_would_use_router(rs, now, options)) { + const char * const digest = rs->descriptor_digest; + int present; ++*num_usable; /* the consensus says we want it. */ - if (router_get_by_descriptor_digest(rs->descriptor_digest)) { + if (md) + present = NULL != microdesc_cache_lookup_by_digest256(NULL, digest); + else + present = NULL != router_get_by_descriptor_digest(digest); + if (present) { /* we have the descriptor listed in the consensus. */ ++*num_present; } @@@ -4960,12 -4852,12 +4963,13 @@@ static voi update_router_have_minimum_dir_info(void) { int num_present = 0, num_usable=0; + int num_exit_present = 0, num_exit_usable = 0; time_t now = time(NULL); int res; - or_options_t *options = get_options(); + const or_options_t *options = get_options(); const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now); + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; if (!consensus) { if (!networkstatus_get_latest_consensus()) @@@ -4986,10 -4878,10 +4990,12 @@@ goto done; } + using_md = consensus->flavor == FLAV_MICRODESC; + count_usable_descriptors(&num_present, &num_usable, consensus, options, now, - NULL); + NULL, 0); + count_usable_descriptors(&num_exit_present, &num_exit_usable, + consensus, options, now, options->ExitNodes, 1); if (num_present < num_usable/4) { tor_snprintf(dir_info_status, sizeof(dir_info_status), @@@ -5000,10 -4891,23 +5006,23 @@@ goto done; } else if (num_present < 2) { tor_snprintf(dir_info_status, sizeof(dir_info_status), - "Only %d descriptor%s here and believed reachable!", - num_present, num_present ? "" : "s"); + "Only %d %sdescriptor%s here and believed reachable!", + num_present, using_md ? "micro" : "", num_present ? "" : "s"); res = 0; goto done; + } else if (num_exit_present < num_exit_usable / 3) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "We have only %d/%d usable exit node descriptors.", + num_exit_present, num_exit_usable); + res = 0; + control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); + goto done; + } else if (num_exit_present < 2) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "Only %d descriptor%s here and believed reachable!", + num_exit_present, num_exit_present ? "" : "s"); + res = 0; + goto done; } /* Check for entry nodes. */

1 0

[tor/maint-0.2.2] Require a threshold of exit nodes before building circuits
by nickm＠torproject.org 10 Mar '12

10 Mar '12

commit ec8a06c5a17c1c4c0b5ff17e73810d98fcdf949b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 8 15:42:54 2012 -0500 Require a threshold of exit nodes before building circuits This mitigates an attack proposed by wanoskarnet, in which all of a client's bridges collude to restrict the exit nodes that the client knows about. Fixes bug 5343. --- changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/changes/bug5343 b/changes/bug5343 new file mode 100644 index 0000000..e4e1489 --- /dev/null +++ b/changes/bug5343 @@ -0,0 +1,7 @@ + o Security fixes: + - Only build circuits if we have a sufficient threshold of the total + descriptors marked in the consensus with the "Exit" flag. This + mitigates an attack proposed by wanoskarnet, in which all of a + client's bridges collude to restrict the exit nodes that the + client knows about. Fixes bug 5343. + diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1edf651..f9d2e85 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4788,18 +4788,21 @@ get_dir_info_status_string(void) * them seem like ones we'd use, and how many of those we have * descriptors for. Store the former in *num_usable and the latter in * *num_present. If in_set is non-NULL, only consider those - * routers in in_set. + * routers in in_set. If exit_only is true, only consider nodes + * with the Exit flag. */ static void count_usable_descriptors(int *num_present, int *num_usable, const networkstatus_t *consensus, or_options_t *options, time_t now, - routerset_t *in_set) + routerset_t *in_set, int exit_only) { *num_present = 0, *num_usable=0; SMARTLIST_FOREACH(consensus->routerstatus_list, routerstatus_t *, rs, { + if (exit_only && ! rs->is_exit) + continue; if (in_set && ! routerset_contains_routerstatus(in_set, rs)) continue; if (client_would_use_router(rs, now, options)) { @@ -4830,7 +4833,7 @@ count_loading_descriptors_progress(void) return 0; /* can't count descriptors if we have no list of them */ count_usable_descriptors(&num_present, &num_usable, - consensus, get_options(), now, NULL); + consensus, get_options(), now, NULL, 0); if (num_usable == 0) return 0; /* don't div by 0 */ @@ -4849,6 +4852,7 @@ static void update_router_have_minimum_dir_info(void) { int num_present = 0, num_usable=0; + int num_exit_present = 0, num_exit_usable = 0; time_t now = time(NULL); int res; or_options_t *options = get_options(); @@ -4875,7 +4879,9 @@ update_router_have_minimum_dir_info(void) } count_usable_descriptors(&num_present, &num_usable, consensus, options, now, - NULL); + NULL, 0); + count_usable_descriptors(&num_exit_present, &num_exit_usable, + consensus, options, now, options->ExitNodes, 1); if (num_present < num_usable/4) { tor_snprintf(dir_info_status, sizeof(dir_info_status), @@ -4889,12 +4895,25 @@ update_router_have_minimum_dir_info(void) num_present, num_present ? "" : "s"); res = 0; goto done; + } else if (num_exit_present < num_exit_usable / 3) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "We have only %d/%d usable exit node descriptors.", + num_exit_present, num_exit_usable); + res = 0; + control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0); + goto done; + } else if (num_exit_present < 2) { + tor_snprintf(dir_info_status, sizeof(dir_info_status), + "Only %d descriptor%s here and believed reachable!", + num_exit_present, num_exit_present ? "" : "s"); + res = 0; + goto done; } /* Check for entry nodes. */ if (options->EntryNodes) { count_usable_descriptors(&num_present, &num_usable, consensus, options, - now, options->EntryNodes); + now, options->EntryNodes, 0); if (!num_usable || !num_present) { tor_snprintf(dir_info_status, sizeof(dir_info_status),

1 0

[tor/maint-0.2.2] Merge branch 'bug5343' into maint-0.2.2
by nickm＠torproject.org 10 Mar '12

10 Mar '12

commit a574f7f3fe7b4f7300c1ced5f67d8e014e04ffbd Merge: 31f253a ec8a06c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 9 13:54:04 2012 -0500 Merge branch 'bug5343' into maint-0.2.2 changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-)

1 0

[vidalia/master] Use consensus bandwidth when microdescriptors is enabled
by chiiph＠torproject.org 09 Mar '12

09 Mar '12

commit 66203b2d4c1a5fba5257605d514fe4db0ac93438 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 9 14:53:57 2012 -0300 Use consensus bandwidth when microdescriptors is enabled Conflicts: src/vidalia/network/NetViewer.cpp --- src/torcontrol/RouterDescriptor.cpp | 3 +++ src/torcontrol/RouterStatus.cpp | 13 +++++++++++++ src/torcontrol/RouterStatus.h | 3 +++ src/vidalia/network/NetViewer.cpp | 3 ++- 4 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp index 3634f3e..21643f2 100644 --- a/src/torcontrol/RouterDescriptor.cpp +++ b/src/torcontrol/RouterDescriptor.cpp @@ -106,4 +106,7 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs) _ip = rs.ipAddress(); _orPort = rs.orPort(); _dirPort = rs.dirPort(); + _avgBandwidth = rs.bandwidth(); + _burstBandwidth = rs.bandwidth(); + _observedBandwidth = rs.bandwidth(); } diff --git a/src/torcontrol/RouterStatus.cpp b/src/torcontrol/RouterStatus.cpp index 9ee795b..02f13b5 100644 --- a/src/torcontrol/RouterStatus.cpp +++ b/src/torcontrol/RouterStatus.cpp @@ -40,6 +40,8 @@ RouterStatus::RouterStatus(const QStringList &status) _valid = false; _flags = 0; + _bandwidth = 0; + foreach (QString line, status) { if (line.startsWith("r ")) { QStringList parts = line.split(" ", QString::SkipEmptyParts); @@ -83,6 +85,17 @@ RouterStatus::RouterStatus(const QStringList &status) foreach (QString flag, flags) { _flags |= flagValue(flag); } + } else if (line.startsWith("w ")) { + /* Status flags */ + QStringList parts = line.split(" ", QString::SkipEmptyParts); + parts.removeFirst(); /* Remove the "w" */ + + if(parts.size() > 0) { + QStringList bw = parts.at(0).split("=", QString::SkipEmptyParts); + if(bw.size() == 2) { + _bandwidth = (quint64)bw.at(1).toULongLong(); + } + } } } } diff --git a/src/torcontrol/RouterStatus.h b/src/torcontrol/RouterStatus.h index c71e548..cff3b8a 100644 --- a/src/torcontrol/RouterStatus.h +++ b/src/torcontrol/RouterStatus.h @@ -67,6 +67,8 @@ public: Flags flags() const { return _flags; } /** Returns true if this router is currently listed as Running. */ bool isRunning() const { return (flags() & Running); } + /** Returns the consensus bandwidth */ + quint64 bandwidth() const { return _bandwidth; } /** Returns true if this router status object is valid. This method should * be called to verify that the QStringList given in this object's @@ -89,6 +91,7 @@ private: quint16 _orPort; /**< Current OR port. */ quint16 _dirPort; /**< Current directory port. */ Flags _flags; /**< OR-ed field of the router's current status flags. */ + quint64 _bandwidth; /**< Consensus bandwidth */ }; Q_DECLARE_OPERATORS_FOR_FLAGS(RouterStatus::Flags) diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 6a67d57..2ce6b46 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -312,7 +312,8 @@ void NetViewer::loadNetworkStatus() { NetworkStatus networkStatus = _torControl->getNetworkStatus(); - foreach (RouterStatus rs, networkStatus) { + + foreach(RouterStatus rs, networkStatus) { if (!rs.isRunning()) continue;

1 0

[vidalia/master] Add changes file
by chiiph＠torproject.org 09 Mar '12

09 Mar '12

commit 703b6b91559cc052594852aac2d84d9c6780ba1d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 9 14:56:07 2012 -0300 Add changes file --- changes/bug3287 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3287 b/changes/bug3287 new file mode 100644 index 0000000..f850742 --- /dev/null +++ b/changes/bug3287 @@ -0,0 +1,2 @@ + o Use consensus bandwidth for routers when microdescriptors is + enabled. Fixes bug 3287. \ No newline at end of file

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 09 Mar '12

09 Mar '12

commit f973920a9fe07af201be32300d3d4b02b195908c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 9 14:56:07 2012 -0300 Add changes file --- changes/bug3287 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3287 b/changes/bug3287 new file mode 100644 index 0000000..f850742 --- /dev/null +++ b/changes/bug3287 @@ -0,0 +1,2 @@ + o Use consensus bandwidth for routers when microdescriptors is + enabled. Fixes bug 3287. \ No newline at end of file

1 0