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

[metrics-web/master] Fix a bug in displaying older news.
by karsten＠torproject.org 28 Aug '17

28 Aug '17

commit 1cf0103c8545004aea844eb1b08f56d738da8d90 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 28 15:41:25 2017 +0200 Fix a bug in displaying older news. --- website/src/main/java/org/torproject/metrics/web/NewsServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java index 3df80d0..6dfaba7 100644 --- a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/website/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -78,7 +78,8 @@ public class NewsServlet extends AnyServlet { String year = String.format("%tY", cal); cutOffDates.put(yearStart, new String[] { year, year }); } while (!this.sortedNews.isEmpty() - && yearStart.compareTo(this.sortedNews.get(0).getStart()) > 0); + && yearStart.compareTo(this.sortedNews.get(this.sortedNews.size() - 1) + .getStart()) > 0); /* Sort news into categories. */ Map<String[], List<String[]>> newsByCategory = new LinkedHashMap<>();

1 0

[metrics-web/master] Update news.json to version 121 of doc/MetricsTimeline.
by karsten＠torproject.org 28 Aug '17

28 Aug '17

commit 384839eb2552e0111a620d2d81dd8c195ceff7a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 28 15:21:14 2017 +0200 Update news.json to version 121 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 446 ++++++++++++++++++++++++++++++- 1 file changed, 432 insertions(+), 14 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index cea9caf..4418ae3 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -99,6 +99,243 @@ ] }, { + "start": "2014-02-15", + "protocols": [ + "meek", + "flashproxy" + ], + "description": "Began running meek-server on bridge already hosting websocket-server for flash proxy." + }, + { + "start": "2014-05-08", + "protocols": [ + "meek", + "flashproxy" + ], + "description": "Reinstalled the bridge running meek and flash proxy." + }, + { + "start": "2014-07-28", + "protocols": [ + "meek" + ], + "description": "Set up meek-amazon CDN configuration." + }, + { + "start": "2014-08-29", + "end": "2014-09-01", + "protocols": [ + "fte" + ], + "description": "Decrease in fte users, perhaps caused by an outage of one of the default Tor Browser bridges.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2014-September/007494.html\">mailing list post</a>" + ] + }, + { + "start": "2014-09-15", + "protocols": [ + "meek", + "flashproxy" + ], + "description": "Split the bridge running meek and flashproxy into separate processes in order to avoid spurious correlation in user counts.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2014-September/007486.html\">mailing list post</a>" + ] + }, + { + "start": "2014-09-16", + "protocols": [ + "meek" + ], + "description": "Switched meek-amazon to HTTPS.", + "links": [ + "<a href=\"https://bugs.torproject.org/13174\">ticket</a>" + ] + }, + { + "start": "2014-09-29", + "protocols": [ + "meek" + ], + "description": "Changed the bridge backing meek-amazon." + }, + { + "start": "2014-10-14", + "protocols": [ + "meek" + ], + "description": "Enabled PublishServerDescriptor on the meek-amazon bridge. Between 2014-09-29 and 2014-10-14, meek-amazon users were not being counted.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2014-October/007611.html\">mailing list post</a>" + ] + }, + { + "start": "2014-10-15", + "protocols": [ + "meek" + ], + "description": "Tor Browser 4.0 released, adding support for meek.", + "links": [ + "<a href=\"https://blog.torproject.org/blog/tor-browser-40-released\">blog post</a>" + ] + }, + { + "start": "2014-10-25", + "protocols": [ + "meek" + ], + "description": "Changed the bridge backing meek-google." + }, + { + "start": "2014-10-25", + "protocols": [ + "meek" + ], + "description": "Changed the meek-google App Engine instance to the F2 class, from F1." + }, + { + "start": "2014-10-27", + "protocols": [ + "meek" + ], + "description": "Changed the meek-google App Engine instance back to the F1 class, from F2." + }, + { + "start": "2014-10-31", + "protocols": [ + "meek" + ], + "description": "Changed the meek-google App Engine instance to the F2 class again, from F1." + }, + { + "start": "2014-11-08", + "protocols": [ + "meek" + ], + "description": "Changed the meek-google App Engine instance back to the F1 class, from F2." + }, + { + "start": "2014-11-15", + "protocols": [ + "meek" + ], + "description": "Moved the meek-google bridge to better hardware." + }, + { + "start": "2015-02-28", + "protocols": [ + "meek" + ], + "description": "Altered performance settings on the meek-google App Engine instance in an effort to reduce instance hours. Set max idle instances to 4 and min pending latency to 500 ms." + }, + { + "start": "2015-04-08", + "protocols": [ + "meek" + ], + "description": "Implemented persistent connections for meek-azure, increasing performance.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2015-April/008637.html\">mailing list post</a>" + ] + }, + { + "start": "2015-04-15", + "protocols": [ + "meek" + ], + "description": "Tor Weekly News covers the meek-azure performance improvement.", + "links": [ + "<a href=\"https://blog.torproject.org/blog/tor-weekly-news-%E2%80%94-april-15th-2015\">covers the meek-azure blog post</a>" + ] + }, + { + "start": "2015-05-22", + "protocols": [ + "meek" + ], + "description": "Rate-limited the meek-google bridge to 1.5 MB/s." + }, + { + "start": "2015-06-02", + "protocols": [ + "meek" + ], + "description": "Further rate-limited meek-google to 1.1 MB/s, from 1.5 MB/s." + }, + { + "start": "2015-06-08", + "protocols": [ + "meek" + ], + "description": "Rate-limited the meek-amazon bridge to 1.1 MB/s." + }, + { + "start": "2015-07-20", + "end": "2015-08-14", + "protocols": [ + "meek" + ], + "description": "Outage of meek-azure.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2015-July/038487.html\">mailing list post about start</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2015-August/038780.html\">mailing list post about end</a>" + ] + }, + { + "start": "2015-07-22", + "protocols": [ + "meek" + ], + "description": "Published a workaround for the meek-azure outage that started 2017-07-20.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2015-July/038496.html\">mailing list post</a>" + ] + }, + { + "start": "2015-09-23", + "protocols": [ + "meek" + ], + "description": "Upgraded meek-azure bridge from KVM to Xen.", + "links": [ + "<a href=\"https://blog.linode.com/2015/06/16/linode-turns-12-heres-some-kvm/\">blog post</a>" + ] + }, + { + "start": "2015-09-30", + "end": "2015-10-09", + "protocols": [ + "meek" + ], + "description": "Outage of meek-amazon caused by an expired certificate.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2015-October/039231.html\">mailing list post about start</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html\">mailing list post about end</a>" + ] + }, + { + "start": "2015-10-02", + "protocols": [ + "meek" + ], + "description": "Rate-limited the meek-azure bridge to 1.1 MB/s. (Azure grant expired.)" + }, + { + "start": "2015-10-30", + "protocols": [ + "meek" + ], + "description": "Altered the performance settings on the meek-google App Engine instance. Set max idle instances to 2 and min pending latency to 1000 ms. This used to be configured through the web interface but is now configured in an application file, which at some point caused the settings from 2015-02-28 to be lost." + }, + { + "start": "2015-10-30", + "protocols": [ + "meek" + ], + "description": "Further rate-limited the meek-azure bridge to 0.8 MB/s, from 1.1 MB/s." + }, + { "start": "2015-11-18", "end": "2015-12-10", "place": "bd", @@ -115,25 +352,103 @@ ] }, { - "start": "2016-04-28", + "start": "2015-12-14", "protocols": [ - "fte" + "meek" ], - "description": "Tor Browser 6.0a5 and 6.0a5-hardened released, which lacks the fte pluggable transport on Mac.", + "description": "Enabled client IP statistics on the meek-azure bridge.", "links": [ - "<a href=\"https://blog.torproject.org/blog/tor-browser-60a5-released\">6.0a5 blog post</a>", - "<a href=\"https://blog.torproject.org/blog/tor-browser-60a5-hardened-released\">6.0a5-hardened blog post</a>", - "<a href=\"https://bugs.torproject.org/18495\">ticket</a>" + "<a href=\"https://bugs.torproject.org/13171#comment:7\">comment</a>" ] }, { - "start": "2016-05-30", + "start": "2015-12-20", + "protocols": [ + "meek" + ], + "description": "Enabled client IP statistics on the meek-google bridge.", + "links": [ + "<a href=\"https://bugs.torproject.org/13171#comment:10\">comment</a>" + ] + }, + { + "start": "2015-12-25", + "protocols": [ + "meek" + ], + "description": "Established an unthrottled bridge <a href=\"https://atlas.torproject.org/#details/C20658946DD706A7A2181159A1A04CD838570…">C20658946DD706A7A2181159A1A04CD838570D04</a> for people who set up their own meek CDN configuration." + }, + { + "start": "2016-01-11", + "protocols": [ + "meek" + ], + "description": "Enabled client IP statistics on the meek-amazon bridge.", + "links": [ + "<a href=\"https://bugs.torproject.org/13171#comment:13\">comment</a>" + ] + }, + { + "start": "2016-01-14", + "protocols": [ + "meek" + ], + "description": "Increased rate limit of the meek-azure bridge to 3 MB/s, from 0.8 MB/s." + }, + { + "start": "2016-01-15", + "protocols": [ + "meek" + ], + "description": "Increased rate limit of the meek-google bridge to 3 MB/s, from 1.1 MB/s." + }, + { + "start": "2016-01-16", + "protocols": [ + "meek" + ], + "description": "Increased rate limit of the meek-amazon bridge to 3 MB/s, from 1.1 MB/s." + }, + { + "start": "2016-01-29", + "end": "2016-02-02", + "protocols": [ + "meek" + ], + "description": "Temporary blocking of an Azure edge server in China.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2016-February/040199.html\">mailing list post about start</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2016-February/040199.html\">mailing list post about end</a>" + ] + }, + { + "start": "2016-03-27", + "end": "2016-03-27", + "protocols": [ + "meek" + ], + "description": "Outage of meek-azure bridge, caused by an expired TLS certificate." + }, + { + "start": "2016-03-27", + "end": "2016-03-31", + "protocols": [ + "meek" + ], + "description": "Temporarily ran an experimental branch for IPv6 counting on the meek-azure bridge.", + "links": [ + "<a href=\"https://gitweb.torproject.org/karsten/tor.git/log/?h=task-18460-2&id=b79d85…">task-18460-2 branch</a>" + ] + }, + { + "start": "2016-04-28", "protocols": [ "fte" ], - "description": "Tor Browser 6.0 released, which lacks the fte pluggable transport on Mac.", + "description": "Tor Browser 6.0a5 and 6.0a5-hardened released, which lacks the fte pluggable transport on Mac.", "links": [ - "<a href=\"https://blog.torproject.org/blog/tor-browser-60-released\">6.0 blog post</a>", + "<a href=\"https://blog.torproject.org/blog/tor-browser-60a5-released\">6.0a5 blog post</a>", + "<a href=\"https://blog.torproject.org/blog/tor-browser-60a5-hardened-released\">6.0a5-hardened blog post</a>", "<a href=\"https://bugs.torproject.org/18495\">ticket</a>" ] }, @@ -152,6 +467,27 @@ ] }, { + "start": "2016-05-13", + "protocols": [ + "meek" + ], + "description": "meek-google's App Engine instance is suspended and meek-google stops working.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2016-June/041057.html\">mailing list post</a>" + ] + }, + { + "start": "2016-05-30", + "protocols": [ + "fte" + ], + "description": "Tor Browser 6.0 released, which lacks the fte pluggable transport on Mac.", + "links": [ + "<a href=\"https://blog.torproject.org/blog/tor-browser-60-released\">6.0 blog post</a>", + "<a href=\"https://bugs.torproject.org/18495\">ticket</a>" + ] + }, + { "start": "2016-06-01", "place": "kz", "protocols": [ @@ -176,6 +512,13 @@ ] }, { + "start": "2016-08-18", + "protocols": [ + "meek" + ], + "description": "Changed the meek-amazon CDN price class from \"All\" to \"Use Only US, Canada and Europe.\"" + }, + { "start": "2016-08-20", "place": "ir", "protocols": [ @@ -267,6 +610,14 @@ "description": "Default obfs3 bridges \"Unnamed\" and \"Unnamed\" (fingerprint <a href=\"https://atlas.torproject.org/#details/AF9F66B7B04F8FF6F32D455F05135250A1654…">AF9F66B7B04F8FF6F32D455F05135250A16543C9</a>) upgrade and begin reporting statistics to the new bridge authority Bifroest." }, { + "start": "2016-09-23", + "end": "2016-11-28", + "protocols": [ + "obfs3" + ], + "description": "Outage of default obfs3 bridges \"Unnamed\" and \"Unnamed\" (fingerprint <a href=\"https://atlas.torproject.org/#details/AF9F66B7B04F8FF6F32D455F05135250A1654…">AF9F66B7B04F8FF6F32D455F05135250A16543C9</a>). (Start date not known for sure, though it must have been after 2016-09-23; discussed in non-archived tor-team email.)" + }, + { "start": "2016-09-24", "protocols": [ "obfs3" @@ -281,6 +632,13 @@ "description": "Default obfs4 bridge LeifEricson upgrades and begins reporting statistics to the new bridge authority Bifroest. This is the last obfs4 bridge that hadn't upgraded." }, { + "start": "2016-09-28", + "protocols": [ + "meek" + ], + "description": "Rate limit on the meek-amazon bridge returns to 3.0 MB/s, having been set to about 1.0 MB/s for some time, cause uncertain." + }, + { "start": "2016-10-02", "end": "2016-10-03", "place": "eg", @@ -339,6 +697,20 @@ ] }, { + "start": "2016-10-28", + "protocols": [ + "meek" + ], + "description": "Decreased the rate limit on the meek-amazon bridge to 1.0 MB/s, from 3.0 MB/s." + }, + { + "start": "2016-10-30", + "protocols": [ + "meek" + ], + "description": "Increased the rate limit on the meek-amazon bridge to 3.0 MB/s, from 1.0 MB/s." + }, + { "start": "2016-11-03", "place": "tr", "description": "Turkey blocks Facebook, Twitter, YouTube, WhatsApp", @@ -389,12 +761,11 @@ ] }, { - "start": "2016-09-23", - "end": "2016-11-28", + "start": "2016-11-22", "protocols": [ - "obfs3" + "meek" ], - "description": "Outage of default obfs3 bridges \"Unnamed\" and \"Unnamed\" (fingerprint <a href=\"https://atlas.torproject.org/#details/AF9F66B7B04F8FF6F32D455F05135250A1654…">AF9F66B7B04F8FF6F32D455F05135250A16543C9</a>). (Start date not known for sure, though it must have been after 2016-09-23; discussed in non-archived tor-team email.)" + "description": "Decreased the rate limit on the meek-amazon bridge to 2.0 MB/s, from 3.0 MB/s." }, { "start": "2016-11-30", @@ -445,6 +816,13 @@ ] }, { + "start": "2017-01-09", + "protocols": [ + "meek" + ], + "description": "Decreased the rate limit on the meek-azure bridge to 2.0 MB/s, from 3.0 MB/s." + }, + { "start": "2017-01-24", "protocols": [ "snowflake" @@ -470,7 +848,27 @@ "protocols": [ "meek" ], - "description": "meek-azure is shut down pending migration to a new CDN configuration.", + "description": "Stopped the meek-azure CDN endpoint az668014.vo.msecnd.net.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-project/2017-March/000981.html\">mailing list post</a>" + ] + }, + { + "start": "2017-03-03", + "protocols": [ + "meek" + ], + "description": "Stopped the meek-azure CDN endpoint az786092.vo.msecnd.net.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-project/2017-March/000981.html\">mailing list post</a>" + ] + }, + { + "start": "2017-03-03", + "protocols": [ + "meek" + ], + "description": "Stopped the (unused) meek-azure CDN endpoint meek-reflect.azureedge.net.", "links": [ "<a href=\"https://lists.torproject.org/pipermail/tor-project/2017-March/000981.html\">mailing list post</a>" ] @@ -511,6 +909,13 @@ ] }, { + "start": "2017-04-30", + "protocols": [ + "meek" + ], + "description": "The meek-amazon bridge upgrades to meek-server 0.27." + }, + { "start": "2017-05-06", "protocols": [ "snowflake" @@ -661,6 +1066,19 @@ ] }, { + "start": "2017-07-29", + "end": "2017-08-17", + "protocols": [ + "meek" + ], + "description": "Outage of meek-amazon bridge, caused by an expired certificate.", + "links": [ + "<a href=\"https://atlas.torproject.org/#details/F4AD82B2032EDEF6C02C5A529C42CFAFE5165…">Atlas</a>", + "<a href=\"https://crt.sh/?id=130970041\">expired certificate</a>", + "<a href=\"https://crt.sh/?id=192217077\">new certificate</a>" + ] + }, + { "start": "2017-08-08", "protocols": [ "snowflake"

1 0

[tor-browser-build/master] Fix some typos in README.HACKING
by gk＠torproject.org 28 Aug '17

28 Aug '17

commit d2af5fbfaefffbd3d0ef15ef8cea7bf5332401d4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 28 08:24:31 2017 +0000 Fix some typos in README.HACKING --- README.HACKING | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.HACKING b/README.HACKING index ea5d500..df87410 100644 --- a/README.HACKING +++ b/README.HACKING @@ -55,7 +55,7 @@ to the linux-x86_64 and linux targets. You should define an option under the linux target if it applies to Linux on both architectures, or under the linux-x86_64 if it only applies to the x86_64 architecture. -An option that is defined at the root of rbm.conf can be overrided by +An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. You can find the complete priority order in rbm/doc/rbm_config.7. @@ -150,7 +150,7 @@ $platform should be one of the following: - torbrowser-osx-x86_64 -For example, to see the tor's build script for linux x86_64 on the alpha +For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: $ ./rbm/rbm showconf tor build --target alpha --target \ @@ -159,7 +159,7 @@ channel, you can use: If the component you are looking at has many dependencies, the display can take some time as various build_id values need to be computed. If you don't care about the accuracy of input and output file names, you -can add '--target no_build_id' to the command line. For instance if you +can add '--target no_build_id' to the command line. For instance, if you want to look at the build script for the tor-browser component (which has a lot of dependencies), you can use: @@ -168,7 +168,7 @@ has a lot of dependencies), you can use: The same type of commands can be used to look at any option values, replacing build with the name of the option you want to look at. For -instance if you want to know the output filename of tor on linux-x86_64 +instance, if you want to know the output filename of tor on linux-x86_64 on the alpha channel, you can use: $ ./rbm/rbm showconf tor filename --target alpha --target \ @@ -189,7 +189,7 @@ This can be done with the following command: See the previous section "Evaluating a component's build script" for a list of possible values for $channel and $platform. -For instance if you want to build tor for linux-x86_64 on the alpha +For instance, if you want to build tor for linux-x86_64 on the alpha channel, you can run: $ ./rbm/rbm build tor --target alpha --target torbrowser-linux-x86_64 @@ -201,7 +201,7 @@ to find the file with the last modification time. Patching Firefox (or an other component) ---------------------------------------- -If you want to test a firefox patch, the easiest way to do it is to +If you want to test a Firefox patch, the easiest way to do it is to copy the patch file to the projects/firefox/ directory, then edit projects/firefox/config to add the new patch to the list of input_files: @@ -231,10 +231,10 @@ tor-browser.git repository (the .mozconfig, .mozconfig-mac and In the rbm build however, we need to make some small modifications to those files, so we are instead using mozconfig files stored in the -projects/firefox/ directory and ignoring the .mozconfig files from the +projects/firefox/ directory, ignoring the .mozconfig files from the tor-browser.git repository. -This could change in the future, when we are not using gitian anymore. +This could change in the future, when we are not using Gitian anymore. Debugging a build error

1 0

[tor-browser-build/master] Fix typo in README.MAKEFILE
by gk＠torproject.org 28 Aug '17

28 Aug '17

commit 971d6fe6d6a79c3ef2a448638435bdad24a8e329 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 28 08:11:39 2017 +0000 Fix typo in README.MAKEFILE --- README.MAKEFILE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MAKEFILE b/README.MAKEFILE index cd4bf2f..98137b2 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -14,7 +14,7 @@ Same as release, for the selected platform only. alpha ----- Build Tor Browser for the alpha channel, for all supported platforms. -The resulting build can be found in directoryp alpha/$version. +The resulting build can be found in directory alpha/$version. alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} -------------------------------------------------------

1 0

[nyx/master] Replace fetch_attr helper
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 7304dd2a95798d8631938556a522f8009470c75c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 27 16:30:04 2017 -0700 Replace fetch_attr helper We can do better than bundling this into the ConfigEntry. --- nyx/panel/config.py | 60 +++++++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 00a6ccb..c51c609 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -6,6 +6,7 @@ Panel presenting the configuration state for tor or nyx. Options can be edited and the resulting configuration files saved. """ +import collections import curses import nyx.curses @@ -22,7 +23,14 @@ from nyx.menu import MenuItem, Submenu from stem.util import conf, enum, log, str_tools +try: + # added in python 3.2 + from functools import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + SortAttr = enum.Enum('NAME', 'VALUE', 'VALUE_TYPE', 'CATEGORY', 'USAGE', 'SUMMARY', 'DESCRIPTION', 'MAN_PAGE_ENTRY', 'IS_SET') +ManualEntry = collections.namedtuple('ManualEntry', ['category', 'usage', 'summary', 'description', 'position']) DETAILS_HEIGHT = 8 NAME_WIDTH = 25 @@ -43,6 +51,17 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) +@lru_cache() +def manual(option): + result = stem.manual.query('SELECT category, usage, summary, description, position FROM torrc WHERE key=?', option.upper()).fetchone() + + if result: + return ManualEntry(*result) + else: + log.info("No manual information found for '%s'" % option) + return None + + class ConfigEntry(object): """ Configuration option presented in the panel. @@ -55,13 +74,6 @@ class ConfigEntry(object): self.name = name self.value_type = value_type - self._is_fetched = False - self._category = None - self._usage = None - self._summary = None - self._description = None - self._position = None - def value(self): """ Provides the value of this configuration option. @@ -121,47 +133,23 @@ class ConfigEntry(object): @property def category(self): - if not self._category: - self._fetch_attr() - - return self._category + return getattr(manual(self.name), 'category') @property def usage(self): - if not self._usage: - self._fetch_attr() - - return self._usage + return getattr(manual(self.name), 'usage') @property def summary(self): - if not self._is_fetched: - self._fetch_attr() - - return self._summary + return getattr(manual(self.name), 'summary') @property def description(self): - if not self._is_fetched: - self._fetch_attr() - - return self._description + return getattr(manual(self.name), 'description') @property def position(self): - if not self._is_fetched: - self._fetch_attr() - - return 99999 if self._position is None else self._position - - def _fetch_attr(self): - result = stem.manual.query('SELECT category, usage, summary, description, position FROM torrc WHERE key=?', self.name.upper()).fetchone() - self._is_fetched = True - - if result: - self._category, self._usage, self._summary, self._description, self._position = result - else: - log.info("No manual information found for '%s'" % self.name) + return getattr(manual(self.name), 'position', 99999) class ConfigPanel(nyx.panel.Panel):

1 0

[doctor/master] Disable bwauth notices for gabelmoo
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 90f6fde1c89c11623e65cd49a5e0f640e0ff2725 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 27 16:23:51 2017 -0700 Disable bwauth notices for gabelmoo Requested by Sebastian. --- consensus_health_checker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index ba9c2b1..3b3d779 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -545,6 +545,11 @@ def voting_bandwidth_scanners(latest_consensus, consensuses, votes): contains_measured_bandwidth = True break + # TODO: re-enable when gabelmoo is fixed + + if authority == 'gabelmoo': + continue + if DIRECTORY_AUTHORITIES[authority].is_bandwidth_authority and not contains_measured_bandwidth: missing_authorities.append(authority) if not DIRECTORY_AUTHORITIES[authority].is_bandwidth_authority and contains_measured_bandwidth:

1 0

[nyx/master] Fetch manual information when needed
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 7c341f9028162af1ca4f4de6af1b8a041a9aa7b8 Merge: 68211c5 0712265 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 27 12:25:21 2017 -0700 Fetch manual information when needed By default the config panel only show the most important torrc options, so why fetch data about everything? The full manual has more information than we need, not to mention commandline argument descriptions and the like. Fetching information we need on demand from a sqlite database instead. Honestly, the results of this are smaller than I hoped. A 2 MB drop in memory (40.1 MB to 38.0 MB, 5%) and a drop in startup time from 1.4s to 1.2s (14%). Not much, but oh well. Bit simpler too since we no longer attempt to read the user's local man page. nyx/__init__.py | 2 +- nyx/panel/config.py | 120 ++++++++++++++++++++++++++++++++++----------------- test/panel/config.py | 7 +-- 3 files changed, 84 insertions(+), 45 deletions(-)

1 0

[nyx/master] Avoid initially reading all manual information
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 0712265c339c74dafac4e8e4beda081d9b0d65a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 27 11:07:14 2017 -0700 Avoid initially reading all manual information We only need most manual information if users show all config options (which precious few do). As such lazy loading this on demand. This was only done for sorting anyway, and there's little point in sorting options that aren't visible. ;P --- nyx/panel/config.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 5f09e66..00a6ccb 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -172,7 +172,8 @@ class ConfigPanel(nyx.panel.Panel): def __init__(self): nyx.panel.Panel.__init__(self) - self._contents = [] + self._all_content = [] + self._important_content = [] self._scroller = nyx.curses.CursorScroller() self._sort_order = CONFIG['config_order'] self._show_all = False # show all options, or just the important ones @@ -195,9 +196,13 @@ class ConfigPanel(nyx.panel.Panel): elif value_type == 'Virtual' and not CONFIG['show_virtual_options']: continue - self._contents.append(ConfigEntry(name, value_type)) + entry = ConfigEntry(name, value_type) + self._all_content.append(entry) - self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + if stem.manual.is_important(entry.name): + self._important_content.append(entry) + + self._sort_content() except stem.ControllerError as exc: log.warn('Unable to determine the configuration options tor supports: %s' % exc) @@ -211,7 +216,7 @@ class ConfigPanel(nyx.panel.Panel): if results: self._sort_order = results - self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + self._sort_content() def _show_write_dialog(self): """ @@ -262,6 +267,7 @@ class ConfigPanel(nyx.panel.Panel): def _toggle_show_all(): self._show_all = not self._show_all + self._sort_content() self.redraw() return ( @@ -324,7 +330,13 @@ class ConfigPanel(nyx.panel.Panel): break def _get_config_options(self): - return self._contents if self._show_all else list(filter(lambda entry: stem.manual.is_important(entry.name) or entry.is_set(), self._contents)) + return self._all_content if self._show_all else self._important_content + + def _sort_content(self): + if self._show_all: + self._all_content = sorted(self._all_content, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) + else: + self._important_content = sorted(self._important_content, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) def _draw_line(subwindow, x, y, entry, is_selected, value_width, description_width):

1 0

[nyx/master] Fetch manual information on demand
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 32b44dc3f9fcea7e5dd19a9cade9f2f947f32672 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 26 15:32:51 2017 -0700 Fetch manual information on demand Fetching just the manual information we need, when we need it. Rather than loading the whole manual this now retrieves information from the sqlite manual cache. This should mean slightly faster startup and reduced memory usage. However, this no longer parses the local man page (so information cannot be more up-to-date than stem's cache). We can re-introduce usage of local man pages later if this becomes something folks care about. --- nyx/panel/config.py | 97 +++++++++++++++++++++++++++++++++------------------- test/panel/config.py | 7 ++-- 2 files changed, 64 insertions(+), 40 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 07a04b0..db04dbb 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -7,7 +7,6 @@ and the resulting configuration files saved. """ import curses -import os import nyx.curses import nyx.panel @@ -17,9 +16,9 @@ import stem.control import stem.manual import stem.util.connection +from nyx import tor_controller, input_prompt, show_message from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu -from nyx import tor_controller, data_directory, input_prompt, show_message from stem.util import conf, enum, log, str_tools @@ -50,14 +49,16 @@ class ConfigEntry(object): :var str name: name of the configuration option :var str value_type: type of value - :var stem.manual.ConfigOption manual: manual information about the option """ - def __init__(self, name, value_type, manual): + def __init__(self, name, value_type): self.name = name self.value_type = value_type - self.manual = manual.config_options.get(name, stem.manual.ConfigOption(name)) - self._index = list(manual.config_options.keys()).index(name) if name in manual.config_options else 99999 + self._category = None + self._usage = None + self._summary = None + self._description = None + self._position = None def value(self): """ @@ -98,7 +99,7 @@ class ConfigEntry(object): """ if attr == SortAttr.CATEGORY: - return self.manual.category + return self.category elif attr == SortAttr.NAME: return self.name elif attr == SortAttr.VALUE: @@ -106,16 +107,59 @@ class ConfigEntry(object): elif attr == SortAttr.VALUE_TYPE: return self.value_type elif attr == SortAttr.USAGE: - return self.manual.usage + return self.usage elif attr == SortAttr.SUMMARY: - return self.manual.summary + return self.summary elif attr == SortAttr.DESCRIPTION: - return self.manual.description + return self.description elif attr == SortAttr.MAN_PAGE_ENTRY: - return self._index + return self.position elif attr == SortAttr.IS_SET: return not self.is_set() + @property + def category(self): + if not self._category: + self._fetch_attr() + + return self._category + + @property + def usage(self): + if not self._usage: + self._fetch_attr() + + return self._usage + + @property + def summary(self): + if not self._summary: + self._fetch_attr() + + return self._summary + + @property + def description(self): + if not self._description: + self._fetch_attr() + + return self._description + + @property + def position(self): + if not self._position: + self._fetch_attr() + + return self._position + + def _fetch_attr(self): + result = stem.manual.query('SELECT category, usage, summary, description, position FROM torrc WHERE key=?', self.name.upper()).fetchone() + + if result: + self._category, self._usage, self._summary, self._description, self._position = result + else: + log.info("No manual information found for '%s'" % self.name) + class ConfigPanel(nyx.panel.Panel): """ @@ -130,23 +174,6 @@ class ConfigPanel(nyx.panel.Panel): self._sort_order = CONFIG['config_order'] self._show_all = False # show all options, or just the important ones - cached_manual_path = data_directory('manual') - - if cached_manual_path: - if os.path.exists(cached_manual_path): - manual = stem.manual.Manual.from_cache(cached_manual_path) - else: - try: - manual = stem.manual.Manual.from_man() - - try: - manual.save(cached_manual_path) - except IOError as exc: - log.debug("Unable to cache manual information to '%s'. This is fine, but means starting Nyx takes a little longer than usual: " % (cached_manual_path, exc)) - except IOError as exc: - log.debug("Unable to use 'man tor' to get information about config options (%s), using bundled information instead" % exc) - manual = stem.manual.Manual.from_cache() - try: for line in tor_controller().get_info('config/names').splitlines(): # Lines of the form "<option> <type>[ <documentation>]". Documentation @@ -165,7 +192,7 @@ class ConfigPanel(nyx.panel.Panel): elif value_type == 'Virtual' and not CONFIG['show_virtual_options']: continue - self._contents.append(ConfigEntry(name, value_type, manual)) + self._contents.append(ConfigEntry(name, value_type)) self._contents = sorted(self._contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) except stem.ControllerError as exc: @@ -302,13 +329,13 @@ def _draw_line(subwindow, x, y, entry, is_selected, value_width, description_wid Show an individual configuration line. """ - attr = [CONFIG['attr.config.category_color'].get(entry.manual.category, WHITE)] + attr = [CONFIG['attr.config.category_color'].get(entry.category, WHITE)] attr.append(BOLD if entry.is_set() else NORMAL) attr.append(HIGHLIGHT if is_selected else NORMAL) option_label = str_tools.crop(entry.name, NAME_WIDTH).ljust(NAME_WIDTH + 1) value_label = str_tools.crop(entry.value(), value_width).ljust(value_width + 1) - summary_label = str_tools.crop(entry.manual.summary, description_width).ljust(description_width) + summary_label = str_tools.crop(entry.summary, description_width).ljust(description_width) subwindow.addstr(x, y, option_label + value_label + summary_label, *attr) @@ -318,14 +345,14 @@ def _draw_selection_details(subwindow, selected): Shows details of the currently selected option. """ - attr = ', '.join(('custom' if selected.is_set() else 'default', selected.value_type, 'usage: %s' % selected.manual.usage)) - selected_color = CONFIG['attr.config.category_color'].get(selected.manual.category, WHITE) + attr = ', '.join(('custom' if selected.is_set() else 'default', selected.value_type, 'usage: %s' % selected.usage)) + selected_color = CONFIG['attr.config.category_color'].get(selected.category, WHITE) subwindow.box(0, 0, subwindow.width, DETAILS_HEIGHT) - subwindow.addstr(2, 1, '%s (%s Option)' % (selected.name, selected.manual.category), selected_color, BOLD) + subwindow.addstr(2, 1, '%s (%s Option)' % (selected.name, selected.category), selected_color, BOLD) subwindow.addstr(2, 2, 'Value: %s (%s)' % (selected.value(), str_tools.crop(attr, max(0, subwindow.width - len(selected.value()) - 13))), selected_color, BOLD) - description = 'Description: %s' % selected.manual.description + description = 'Description: %s' % selected.description for i in range(DETAILS_HEIGHT - 4): if not description: diff --git a/test/panel/config.py b/test/panel/config.py index 0289406..99bbaec 100644 --- a/test/panel/config.py +++ b/test/panel/config.py @@ -4,7 +4,6 @@ Unit tests for nyx.panel.config. import unittest -import stem.manual import nyx.panel.config import test @@ -32,8 +31,7 @@ class TestConfigPanel(unittest.TestCase): tor_controller_mock().get_info.return_value = True tor_controller_mock().get_conf.return_value = ['9051'] - manual = stem.manual.Manual.from_cache() - entry = nyx.panel.config.ConfigEntry('ControlPort', 'LineList', manual) + entry = nyx.panel.config.ConfigEntry('ControlPort', 'LineList') rendered = test.render(nyx.panel.config._draw_line, 0, 0, entry, False, 10, 35) self.assertEqual(EXPECTED_LINE, rendered.content) @@ -44,8 +42,7 @@ class TestConfigPanel(unittest.TestCase): tor_controller_mock().get_info.return_value = True tor_controller_mock().get_conf.return_value = ['9051'] - manual = stem.manual.Manual.from_cache() - selected = nyx.panel.config.ConfigEntry('ControlPort', 'LineList', manual) + selected = nyx.panel.config.ConfigEntry('ControlPort', 'LineList') rendered = test.render(nyx.panel.config._draw_selection_details, selected) self.assertEqual(EXPECTED_DETAIL_DIALOG, rendered.content)

1 0

[nyx/master] Only attempt to fetch manual information once
by atagar＠torproject.org 27 Aug '17

27 Aug '17

commit 61a2c4bd701802627ac3262b90342a9c07d3af66 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 27 10:56:40 2017 -0700 Only attempt to fetch manual information once No reason to repeatedly fetch information that doesn't exist. --- nyx/panel/config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index db04dbb..5f09e66 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -54,6 +54,8 @@ class ConfigEntry(object): def __init__(self, name, value_type): self.name = name self.value_type = value_type + + self._is_fetched = False self._category = None self._usage = None self._summary = None @@ -133,27 +135,28 @@ class ConfigEntry(object): @property def summary(self): - if not self._summary: + if not self._is_fetched: self._fetch_attr() return self._summary @property def description(self): - if not self._description: + if not self._is_fetched: self._fetch_attr() return self._description @property def position(self): - if not self._position: + if not self._is_fetched: self._fetch_attr() - return self._position + return 99999 if self._position is None else self._position def _fetch_attr(self): result = stem.manual.query('SELECT category, usage, summary, description, position FROM torrc WHERE key=?', self.name.upper()).fetchone() + self._is_fetched = True if result: self._category, self._usage, self._summary, self._description, self._position = result

1 0