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

r26153: {website} Couple more GSoC projects from sjmurdoch (website/trunk/getinvolved/en)
by Damian Johnson 09 Apr '13

09 Apr '13

Author: atagar Date: 2013-04-09 16:41:49 +0000 (Tue, 09 Apr 2013) New Revision: 26153 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Couple more GSoC projects from sjmurdoch Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:05:53 UTC (rev 26152) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:41:49 UTC (rev 26153) @@ -603,6 +603,11 @@ block Tor. This has both a C and python implementation. </p> + <p> + <b>Project Ideas:</b><br /> + <i><a href="#betterPluggableTransports">Build Better Pluggable Transports</a></i> + </p> + <a id="project-flash-proxy"></a> <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a @@ -1270,7 +1275,62 @@ </p> </li> + <a id="betterPluggableTransports"></a> <li> + <b>Build Better Pluggable Transports</b> + <br> + Effort Level: <i>Medium to High</i> + <br> + Skill Level: <i>Medium</i> + <br> + Likely Mentors: <i>Steven (sjmurdoch)</i> + <p> + For Tor users in censored countries, we currently offer <a + href="https://www.torproject.org/projects/obfsproxy.html.en">obfsproxy</a> + bridges, which disguise Tor traffic by making it look random. This works + for many users, but it has disadvantages: firstly it does not disguise + packet size and secondly it looks like no real protocol. These weaknesses + may result in obfsproxy being blocked. + </p> + + <p> + The goal for this project will be to implement new pluggable transports, + which resolve these weaknesses and so can be deployed if/when obfsproxy is + blocked. Ideas for doing so include: + <ul> + <li>Impersonate a voice-over-IP protocol</li> + <li>Impersonate HTTP sufficiently well that traffic will go through a HTTP-only proxy</li> + <li>Implement <a href="http://cacr.uwaterloo.ca/techreports/2011/cacr2011-21.pdf">scanning resistance</a></a> + </ul> + </p> + + <a id="profileUDPTransport"></a> + <li> + <b>Profile UDP transport protocols</b> + <br> + Effort Level: <i>Medium to High</i> + <br> + Skill Level: <i>High</i> + <br> + Likely Mentors: <i>Steven (sjmurdoch)</i> + <p> + There are <a + href="https://research.torproject.org/techreports/datagram-comparison-2011-11-07.…">lots + of options</a> as to how Tor could send its data over UDP rather than TCP, + and some will likely perform significantly better than others. This project + will evaluate these options, so as to decide which should be used in future + versions of Tor. A first step will be to benchmark the various transport + protocols being considered, in terms of performance and also code quality, + including userspace TCP, <a + href="https://github.com/bittorrent/libutp">μTP</a>, <a + href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">SCTP</a> + and <a href="http://curvecp.org/">CurveCP</a>. Initially these transport + protocols will be examined in isolation, but if the project progresses well + one or more could be integrated in Tor. + </p> + </li> + + <li> <b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a

1 0

r26152: {website} Better emphasizing GSoC is different from OPW Someone showed (website/trunk/getinvolved/en)
by Damian Johnson 09 Apr '13

09 Apr '13

Author: atagar Date: 2013-04-09 16:05:53 +0000 (Tue, 09 Apr 2013) New Revision: 26152 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Better emphasizing GSoC is different from OPW Someone showed up on irc confused, thinking that we were primarily mentoring through OPW. The two programs have different requirements and GSoC is a far, far larger program for us. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-09 10:23:45 UTC (rev 26151) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:05:53 UTC (rev 26152) @@ -100,6 +100,29 @@ <li><a href="https://live.gnome.org/OutreachProgramForWomen#Send_in_an_Application">Send your application</a> to opw-list(a)gnome.org. Please be available and responsive throughout the application period so we can work with you on improving it.</li> </ol> + <a id="gsoc"></a> + <h2><a class="anchor" href="#gsoc">Google Summer of Code</a></h2> + + <p> + Tor is also taking part in this year's <a + href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">Google + Summer of Code</a>! The criteria for this is a little different - either + gender can apply but you need to be either <a + href="https://www.google-melange.com/gsoc/document/show/gsoc_program/google/gsoc2…">a + present student or just graduated</a>. + </p> + + <p> + As mentioned above if you're eligible for either program then please apply + for both! Google Summer of Code is a far, far larger program for us than + OPW so your chances of being applied that way are considerably better. + </p> + + <p> + <b>See our page for <a href="<page about/gsoc>">Google Summer of Code</a> + for more information.</b> + </p> + <a id="Projects"></a> <h2><a class="anchor" href="#Projects">Projects</a></h2>

1 0

[tor-launcher/master] Change bridge into a textbox and make it functional.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit d44dfc5db8acc391130579bdf260dc3e1a3610ed Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 11:21:45 2013 -0400 Change bridge into a textbox and make it functional. --- src/chrome/content/network-settings.js | 88 +++++++++++++++++-------- src/chrome/content/network-settings.xul | 23 +++---- src/chrome/locale/en/network-settings.dtd | 5 +- src/chrome/locale/en/torcontroller.properties | 1 + 4 files changed, 72 insertions(+), 45 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 73c10f1..98d4ed7 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -3,6 +3,8 @@ // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: +// TODO: if clean start and "Unable to read Tor settings" error is displayed, we should not bootstrap Tor or start the browser. + const Cc = Components.classes; const Ci = Components.interfaces; const Cu = Components.utils; @@ -405,15 +407,21 @@ function applyFirewallSettings() // Returns true if settings were successfully applied. function applyBridgeSettings() { - // TODO: validate user-entered data. See Vidalia's NetworkPage::save() - var settings = {}; settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; var useBridges = getElemValue(kUseBridgesCheckbox, false); - var bridgeList = getElemValue(kBridgeList, null); + var bridgeStr = getElemValue(kBridgeList, null); + var bridgeList = parseAndValidateBridges(bridgeStr); + if (useBridges && !bridgeList) + { + reportValidationError("error_bridges_missing"); + return false; + } + + setElemValue(kBridgeList, bridgeList); if (useBridges && bridgeList) { settings[kTorConfKeyUseBridges] = true; @@ -424,6 +432,42 @@ function applyBridgeSettings() } +// Returns an array or null. +function parseAndValidateBridges(aStr) +{ + if (!aStr) + return null; + + var resultStr = aStr; + resultStr = resultStr.replace(/bridge/gi, ""); // Remove "bridge" everywhere. + resultStr = resultStr.replace(/\r\n/g, "\n"); // Convert \r\n pairs into \n. + resultStr = resultStr.replace(/\r/g, "\n"); // Convert \r into \n. + resultStr = resultStr.replace(/\n\n/g, "\n"); // Condense blank lines. + + var resultArray = new Array; + var tmpArray = resultStr.split('\n'); + for (var i = 0; i < tmpArray.length; i++) + { + let s = tmpArray[i].trim(); // Remove extraneous whitespace. + if (s.indexOf(' ') >= 0) + { + // Handle a space-separated list of bridge specs. + var tmpArray2 = s.split(' '); + for (var j = 0; j < tmpArray2.length; ++j) + { + let s2 = tmpArray2[j]; + if (s2.length > 0) + resultArray.push(s2); + } + } + else if (s.length > 0) + resultArray.push(s); + } + + return (0 == resultArray.length) ? null : resultArray; +} + + // Returns true if successful. function setConfAndReportErrors(aSettingsObj) { @@ -472,28 +516,27 @@ function setElemValue(aID, aValue) toggleElemUI(elem); break; case "textbox": - case "menulist": - elem.value = (aValue) ? aValue : ""; - break; - case "listbox": - // Remove all existing items. - while (elem.itemCount > 0) - elem.removeItemAt(0); - - // Add new items. - if (aValue && Array.isArray(aValue)) + var s = aValue; + if (Array.isArray(aValue)) { + s = ""; for (var i = 0; i < aValue.length; ++i) - elem.appendItem(aValue[i]); + { + if (s.length > 0) + s += '\n'; + s += aValue[i]; + } } + // fallthru + case "menulist": + elem.value = (s) ? s : ""; break; } } } -// Returns a Boolean (for checkboxes), a string (textbox and menulist), or an -// array of strings (listbox). +// Returns a Boolean (for checkboxes) or a string (textbox and menulist). // Leading and trailing white space is trimmed from strings. function getElemValue(aID, aDefaultValue) { @@ -510,19 +553,6 @@ function getElemValue(aID, aDefaultValue) case "menulist": rv = elem.value; break; - case "listbox": - rv = elem.checked; - if (elem.itemCount > 0) - { - rv = []; - for (var i = 0; i < elem.itemCount; ++i) - { - var item = elem.getItemAtIndex(i); - if (item.label) - rv.push(item.label.trim()); - } - } - break; } } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index e1d839e..5daabac 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -110,22 +110,21 @@ oncommand="toggleElemUI(this);" /> <groupbox id="bridgeSpecificSettings"> <hbox> - <textbox id="addBridgeText" style="width: 320px" /> - <button id="addBridgeBtn" label="&addButton;" oncommand="AddBridge();" - style="width: 20px !important" /> - </hbox> - <hbox> - <listbox id="bridgeList" rows="4" style="width: 320px" /> + <vbox flex="1"> + <label value="&torsettings.useBridges.label;" control="bridgeList"/> + <textbox id="bridgeList" multiline="true" rows="4" /> + </vbox> + + </hbox> </groupbox> </vbox> </vbox> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 1fc15bb..5d5fa99 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -17,7 +17,4 @@ <!ENTITY torsettings.firewall.checkbox "My firewall only lets me connect to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My ISP blocks connections to the Tor network"> - -<!ENTITY addButton "+"> -<!ENTITY deleteButton "-"> -<!ENTITY todo "TODO"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays in the form address:port."> diff --git a/src/chrome/locale/en/torcontroller.properties b/src/chrome/locale/en/torcontroller.properties index 88882db..9331ecf 100644 --- a/src/chrome/locale/en/torcontroller.properties +++ b/src/chrome/locale/en/torcontroller.properties @@ -19,6 +19,7 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.connect=Connect torlauncher.quit=Quit

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit bea8abf529bbdaf61c500b122719c3cc72fed36f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 14:45:36 2013 +0000 Update translations for vidalia_help --- sv/netview.po | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sv/netview.po b/sv/netview.po index 5b891b7..ed042db 100644 --- a/sv/netview.po +++ b/sv/netview.po @@ -1,40 +1,41 @@ # # Translators: +# <cryptohead(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-04-09 14:36+0000\n" +"Last-Translator: cryptohead <cryptohead(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "" +msgstr "Nätverksöversikt" #. type: Content of: <html><body><p> #: en/netview.html:20 msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." -msgstr "" +msgstr "Nätverksöversikten låter dig se reläer i Tor-nätverket och hur din trafik flyter." #. type: Content of: <html><body> #: en/netview.html:25 msgid "<a name=\"overview\"/>" -msgstr "" +msgstr "<a name=\"overview\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:26 msgid "Overview" -msgstr "" +msgstr "Översikt" #. type: Content of: <html><body><p> #: en/netview.html:28 @@ -245,5 +246,3 @@ msgstr "" #: en/netview.html:168 msgid "Date this relay's information was last updated." msgstr "" - -

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit a633c22dffeccfeb6a2f4d67be7ee4bb44c81bc1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 11:46:11 2013 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.properties | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 87bedd7..2e53112 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere -https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere -https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = （对此页面没有规则） -https-everywhere.menu.unknownRules = （对此页面的规则未知） -https-everywhere.toolbar.hint = HTTPS Everywhere 现在已激活。根据每个网站，可点击地址栏中图标进行打开或关闭该功能。 +https-everywhere.menu.globalEnable = \u5f00\u542f HTTPS Everywhere +https-everywhere.menu.globalDisable = \u5173\u95ed HTTPS Everywhere +https-everywhere.menu.enableDisable = \u542f\u52a8/\u7981\u7528\u89c4\u5219 +https-everywhere.menu.noRules = \uff08\u5bf9\u6b64\u9875\u9762\u6ca1\u6709\u89c4\u5219\uff09 +https-everywhere.menu.unknownRules = \uff08\u5bf9\u6b64\u9875\u9762\u7684\u89c4\u5219\u672a\u77e5\uff09 +https-everywhere.toolbar.hint = HTTPS Everywhere \u73b0\u5728\u5df2\u6fc0\u6d3b\u3002\u6839\u636e\u6bcf\u4e2a\u7f51\u7ad9\uff0c\u53ef\u70b9\u51fb\u5730\u5740\u680f\u4e2d\u56fe\u6807\u8fdb\u884c\u6253\u5f00\u6216\u5173\u95ed\u8be5\u529f\u80fd\u3002

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit bdb8c7cdd1670dbda2cda154314e2169ac5e26af Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 11:46:04 2013 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.properties | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-CN/https-everywhere.properties b/zh-CN/https-everywhere.properties index 87bedd7..2e53112 100644 --- a/zh-CN/https-everywhere.properties +++ b/zh-CN/https-everywhere.properties @@ -1,6 +1,6 @@ -https-everywhere.menu.globalEnable = 开启 HTTPS Everywhere -https-everywhere.menu.globalDisable = 关闭 HTTPS Everywhere -https-everywhere.menu.enableDisable = 启动/禁用规则 -https-everywhere.menu.noRules = （对此页面没有规则） -https-everywhere.menu.unknownRules = （对此页面的规则未知） -https-everywhere.toolbar.hint = HTTPS Everywhere 现在已激活。根据每个网站，可点击地址栏中图标进行打开或关闭该功能。 +https-everywhere.menu.globalEnable = \u5f00\u542f HTTPS Everywhere +https-everywhere.menu.globalDisable = \u5173\u95ed HTTPS Everywhere +https-everywhere.menu.enableDisable = \u542f\u52a8/\u7981\u7528\u89c4\u5219 +https-everywhere.menu.noRules = \uff08\u5bf9\u6b64\u9875\u9762\u6ca1\u6709\u89c4\u5219\uff09 +https-everywhere.menu.unknownRules = \uff08\u5bf9\u6b64\u9875\u9762\u7684\u89c4\u5219\u672a\u77e5\uff09 +https-everywhere.toolbar.hint = HTTPS Everywhere \u73b0\u5728\u5df2\u6fc0\u6d3b\u3002\u6839\u636e\u6bcf\u4e2a\u7f51\u7ad9\uff0c\u53ef\u70b9\u51fb\u5730\u5740\u680f\u4e2d\u56fe\u6807\u8fdb\u884c\u6253\u5f00\u6216\u5173\u95ed\u8be5\u529f\u80fd\u3002

1 0

r26151: {website} Update year in GSoC page title (website/trunk/about/en)
by Karsten Loesing 09 Apr '13

09 Apr '13

Author: kloesing Date: 2013-04-09 10:23:45 +0000 (Tue, 09 Apr 2013) New Revision: 26151 Modified: website/trunk/about/en/gsoc.wml Log: Update year in GSoC page title Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2013-04-09 03:48:32 UTC (rev 26150) +++ website/trunk/about/en/gsoc.wml 2013-04-09 10:23:45 UTC (rev 26151) @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2012" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Google Summer of Code 2013" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a>

1 0

[onionoo/master] Implement maintenance mode.
by karsten＠torproject.org 09 Apr '13

09 Apr '13

commit 69993b96a1aeb49a9095de67df5ccc561a7e4e90 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 9 09:39:56 2013 +0200 Implement maintenance mode. When set, respond to all requests with 503 Service Unavailable. --- etc/web.xml.template | 4 +++ src/org/torproject/onionoo/ResourceServlet.java | 25 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/etc/web.xml.template b/etc/web.xml.template index b7fbf9e..25314aa 100644 --- a/etc/web.xml.template +++ b/etc/web.xml.template @@ -15,6 +15,10 @@ <param-name>outDir</param-name> <param-value>/srv/onionoo/out/</param-value> </init-param> + <init-param> + <param-name>maintenance</param-name> + <param-value>0</param-value> + </init-param> </servlet> <servlet-mapping> <servlet-name>Resource</servlet-name> diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 19dc752..8c88781 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -31,15 +31,21 @@ public class ResourceServlet extends HttpServlet { private static final long serialVersionUID = 7236658979947465319L; + private boolean maintenanceMode = false; + private File summaryFile; private String outDirString; public void init(ServletConfig config) throws ServletException { super.init(config); - this.outDirString = config.getInitParameter("outDir"); - this.summaryFile = new File(outDirString, "summary"); - this.readSummaryFile(); + this.maintenanceMode = config.getInitParameter("maintenance") != null + && config.getInitParameter("maintenance").equals("1"); + if (!this.maintenanceMode) { + this.outDirString = config.getInitParameter("outDir"); + this.summaryFile = new File(outDirString, "summary"); + this.readSummaryFile(); + } } long summaryFileLastModified = -1L; @@ -168,13 +174,22 @@ public class ResourceServlet extends HttpServlet { } public long getLastModified(HttpServletRequest request) { - this.readSummaryFile(); - return this.summaryFileLastModified; + if (this.maintenanceMode) { + return super.getLastModified(request); + } else { + this.readSummaryFile(); + return this.summaryFileLastModified; + } } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + if (this.maintenanceMode) { + response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); + return; + } + this.readSummaryFile(); if (!this.readSummaryFile) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);

1 0

[metrics-lib/master] Parse Unmeasured=1 in w lines of consensuses.
by karsten＠torproject.org 09 Apr '13

09 Apr '13

commit 5b2104481930132b8ef7b2343e161a83cee1a89d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 9 08:36:53 2013 +0200 Parse Unmeasured=1 in w lines of consensuses. Pointed out by atagar. --- .../torproject/descriptor/NetworkStatusEntry.java | 6 ++++ .../descriptor/impl/NetworkStatusEntryImpl.java | 8 ++++++ .../impl/RelayNetworkStatusConsensusImplTest.java | 25 ++++++++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/NetworkStatusEntry.java b/src/org/torproject/descriptor/NetworkStatusEntry.java index 3bda176..2f0bb89 100644 --- a/src/org/torproject/descriptor/NetworkStatusEntry.java +++ b/src/org/torproject/descriptor/NetworkStatusEntry.java @@ -55,6 +55,12 @@ public interface NetworkStatusEntry { * bandwidth line. */ public long getMeasured(); + /* Return whether the status entry contained an Unmeasured=1 entry in + * its bandwidth line, meaning that the bandwidth authorities didn't + * measure this relay yet. Only included in consensuses using method + * 17 or higher. */ + public boolean getUnmeasured(); + /* Return the default policy of the port summary or null if the status * entry didn't contain a port summary line. */ public String getDefaultPolicy(); diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 901e17e..337484e 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -160,6 +160,9 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { if (pairs.containsKey("Measured")) { this.measured = pairs.remove("Measured"); } + if (pairs.containsKey("Unmeasured")) { + this.unmeasured = pairs.remove("Unmeasured") == 1L; + } if (!pairs.isEmpty()) { /* Ignore unknown key-value pair. */ } @@ -255,6 +258,11 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return this.measured; } + private boolean unmeasured = false; + public boolean getUnmeasured() { + return this.unmeasured; + } + private String defaultPolicy; public String getDefaultPolicy() { return this.defaultPolicy; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index e5a20e3..ca7ea7f 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -13,6 +13,7 @@ import java.util.List; import org.junit.Test; +import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.RelayNetworkStatusConsensus; /* TODO Add test cases for all lines starting with "opt ". */ @@ -940,6 +941,30 @@ public class RelayNetworkStatusConsensusImplTest { new RelayNetworkStatusConsensusImpl(cb.buildConsensus(), true); } + @Test() + public void testWLineUnmeasured() throws DescriptorParseException { + StatusEntryBuilder sb = new StatusEntryBuilder(); + sb.wLine = "w Bandwidth=42424242 Unmeasured=1"; + ConsensusBuilder cb = new ConsensusBuilder(); + cb.statusEntries.add(sb.buildStatusEntry()); + RelayNetworkStatusConsensus consensus = + new RelayNetworkStatusConsensusImpl(cb.buildConsensus(), true); + for (NetworkStatusEntry s : consensus.getStatusEntries().values()) { + if (s.getBandwidth() == 42424242L) { + assertTrue(s.getUnmeasured()); + } + } + } + + @Test() + public void testWLineNotUnmeasured() throws DescriptorParseException { + RelayNetworkStatusConsensus consensus = + StatusEntryBuilder.createWithWLine("w Bandwidth=20"); + for (NetworkStatusEntry s : consensus.getStatusEntries().values()) { + assertFalse(s.getUnmeasured()); + } + } + @Test(expected = DescriptorParseException.class) public void testPLineNoPolicy() throws DescriptorParseException { StatusEntryBuilder.createWithPLine("p 80");

1 0

r26150: {website} Dropping the navbar menu from stem's gsoc idea Project was t (website/trunk/getinvolved/en)
by Damian Johnson 09 Apr '13

09 Apr '13

Author: atagar Date: 2013-04-09 03:48:32 +0000 (Tue, 09 Apr 2013) New Revision: 26150 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping the navbar menu from stem's gsoc idea Project was too tasty, did it this last weekend. :P Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-09 03:46:16 UTC (rev 26149) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-09 03:48:32 UTC (rev 26150) @@ -1096,7 +1096,6 @@ <ol> <li>Come up with a better, more developer friendly "Module Overview" for our documentation (<a href="https://stem.torproject.org/api/control.html">example page</a>). For instance, it would be nice to provide interlinking between the overview and the classes/methods that it lists. This will probably involve asking for help from the <a href="http://sphinx-doc.org/">Sphinx user list</a>. (<a href="https://trac.torproject.org/7632">ticket</a>)</li> - <li>Navigation of <a href="https://stem.torproject.org">stem's site</a> is clunky, in large part due to the linear page flow supported by sphinx. One possible fix for this would be css-only menus, ideally as a sphinx plugin so we could contribute it back upstream.(<a href="https://trac.torproject.org/8431">ticket</a>)</li> <li>After getting some exposure to stem it would be time to give using it a try. Tor has a couple clients (<a href="https://trac.torproject.org/8263">TorBEL</a> and <a href="https://trac.torproject.org/8264">Tor Weather</a>) that are ready to be moved to stem. Hopefully porting these will also provide us with some lessons on how we can further improve stem's API. <b>Note that this would also involve polishing off <a href="#project-torbel">TorBEL</a>, including the <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">issues that prevent us from deploying it</a></b>. This later portion would be primarily mentored by Sebastian.</li> <li><b>... other ideas?</b> The above are just some ideas I've come up with to improve usability and likely not enough to fill the summer. Feel free to suggest some of your own! For instance, one option would be to expand <a href="https://stem.torproject.org/tutorial.html">stem's tutorials</a> with more examples, maybe <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev/">contacting tor-dev@</a> to brainstorm ideas. This last bit is pretty open so I look forward to seeing what you come up with!</li> </ol>

1 0