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

[metrics-web/master] Include Relay Search assets in generated WAR (See: #25258)
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit f5a27ce3ae8fdbcbeebd978f1b7d1f55358327e2 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 15 12:59:53 2018 +0000 Include Relay Search assets in generated WAR (See: #25258) --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 28a6a62..4b67ae6 100644 --- a/build.xml +++ b/build.xml @@ -179,7 +179,7 @@ includes="logback.xml" /> <zipfileset dir="${resources}/web" prefix="" - includes="css/* images/* js/* fonts/**" /> + includes="css/* images/* js/* fonts/** rs/**" /> <zipfileset dir="${resources}/web/jsps" prefix="WEB-INF" includes="*.jsp"/>

1 0

[metrics-web/master] Adds a servlet mapping for RelaySearchServlet (See: #25258)
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit e1035d8af074797c37bc5acc276a59a1c795ee8d Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 15 13:01:32 2018 +0000 Adds a servlet mapping for RelaySearchServlet (See: #25258) --- src/main/resources/web.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index e6e6a69..99df1db 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -324,6 +324,17 @@ <url-pattern>/research.html</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>RelaySearch</servlet-name> + <servlet-class> + org.torproject.metrics.web.RelaySearchServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>RelaySearch</servlet-name> + <url-pattern>/rs.html</url-pattern> + </servlet-mapping> + <welcome-file-list> <welcome-file>index.html</welcome-file> </welcome-file-list>

1 0

[metrics-web/master] Allows additional stylesheets to be specified
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit 2cb348ec7bc2e014eba28c55bdd01a6772aa1fd7 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Feb 14 17:15:16 2018 +0000 Allows additional stylesheets to be specified This change allows for servlets or JSPs to specify additional stylesheets to be included in the <head> section of HTML outputs when using top.jsp. Fixes: #25255 --- src/main/resources/web/jsps/top.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/web/jsps/top.jsp b/src/main/resources/web/jsps/top.jsp index f7a702f..146c45a 100644 --- a/src/main/resources/web/jsps/top.jsp +++ b/src/main/resources/web/jsps/top.jsp @@ -40,6 +40,9 @@  <link rel="stylesheet" href="/css/style.css"> <script src="/js/script.js"></script> + <c:forEach var="additionalStylesheet" items="${additionalStylesheets}"> + <link rel="stylesheet" href="${additionalStylesheet}"> + </c:forEach> </head>

1 0

[metrics-web/master] Adds RelaySearchServlet and accompanying JSP (Fixes: #25258)
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit 9b42e1712595546144fe56e3e0afdc58388e492c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 15 13:00:57 2018 +0000 Adds RelaySearchServlet and accompanying JSP (Fixes: #25258) --- .../torproject/metrics/web/RelaySearchServlet.java | 33 ++++++++++++++++ src/main/resources/web/jsps/rs.jsp | 44 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java b/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java new file mode 100644 index 0000000..9a235ce --- /dev/null +++ b/src/main/java/org/torproject/metrics/web/RelaySearchServlet.java @@ -0,0 +1,33 @@ +/* Copyright 2011--2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class RelaySearchServlet extends AnyServlet { + + private static final long serialVersionUID = 1L; + + @Override + public void init() throws ServletException { + super.init(); + } + + @Override + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + /* Forward the request to the JSP that does all the hard work. */ + String[] additionalStylesheets = {"/rs/css/atlas.css"}; + request.setAttribute("additionalStylesheets", additionalStylesheets); + request.setAttribute("categories", this.categories); + request.getRequestDispatcher("WEB-INF/rs.jsp").forward(request, + response); + } +} + diff --git a/src/main/resources/web/jsps/rs.jsp b/src/main/resources/web/jsps/rs.jsp new file mode 100644 index 0000000..22a8377 --- /dev/null +++ b/src/main/resources/web/jsps/rs.jsp @@ -0,0 +1,44 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<jsp:include page="top.jsp"> + <jsp:param name="pageTitle" value="Relay Search"/> + <jsp:param name="navActive" value="Services"/> +</jsp:include> + +<div class="container"> + <ul class="breadcrumb"> + <li><a href="/">Home</a></li> + <li><a href="/services.html">Services</a></li> + <li class="active">Relay Search</li> + </ul> + <form class="hidden-xs navbar-form pull-right" role="search" id="secondary-search"> + <div class="input-group add-on"> + <input class="form-control" placeholder="Search" name="secondary-search-query" id="secondary-search-query" type="text" autocorrect="off" autocapitalize="none"> + <div class="input-group-btn"> + <button class="btn btn-danger" id="secondary-search-clear" type="button" title="Clear Search Query"><i class="glyphicon glyphicon-remove-circle"></i></button> + <button class="btn btn-primary" id="secondary-search-submit" type="submit" title="Perform Search"><i class="glyphicon glyphicon-search"></i></button> + <button class="btn btn-secondary" id="secondary-search-aggregate" type="button" title="Perform Aggregated Search"><i class="fa fa-compress"></i></button> + </div> + </div> + </form> + <h1>Relay Search</h1> + <div class="progress progress-info progress-striped active"> + <div class="progress-bar">Rendering results...</div> + </div> + <div id="content"> + <noscript> + <div class="alert alert-warning"> + <p><strong>JavaScript required</strong><br> + Please enable JavaScript to use this service. If you are using Tor Browser on High Security mode, it is possible to enable JavaScript to run only on this page. Click the NoScript <img src="img/noscript.png"> icon on your address bar and select "Temporarily allow all on this page". Relay Search only uses JavaScript resources that are hosted by the Tor Metrics team.</p> + </noscript> + </div> +</div>  + +<script> + var require = { + urlArgs: "v29" + }; +</script> +<script data-main="/rs/js/main" src="/rs/js/libs/require/require.js"></script> + +<jsp:include page="bottom.jsp"/>

1 0

[metrics-web/master] Update Relay Search link on the Services page.
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit 78769f653bde8eb7aa5a372465c2d407dd17396f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 16 09:36:15 2018 +0100 Update Relay Search link on the Services page. --- src/main/resources/web/jsps/services.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/services.jsp b/src/main/resources/web/jsps/services.jsp index dcd296c..2283dbe 100644 --- a/src/main/resources/web/jsps/services.jsp +++ b/src/main/resources/web/jsps/services.jsp @@ -29,7 +29,7 @@ <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> <p>The following tools let you explore currently running relays and bridges.</p> <ul> - <li><a href="https://atlas.torproject.org/">Relay Search</a> displays data about single relays and bridges in the Tor Network.</li> + <li><a href="/rs.html">Relay Search</a> displays data about single relays and bridges in the Tor Network.</li> <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> <li><a href="https://tormap.void.gr/" target="_blank">Tor Map</a> displays an interactive map of Tor relays and provides KML files for relay locations.</li> <li><a href="https://nusenu.github.io/OrNetStats/" target="_blank">OrNetStats</a> displays statistics for monitoring diversity in the Tor network.</li>

1 0

[metrics-web/master] Include Relay Search as a submodule (See: #25258)
by karsten＠torproject.org 16 Feb '18

16 Feb '18

commit eacf2fca3400fa7a01585b4657cdfa86a273d61c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Feb 15 12:59:09 2018 +0000 Include Relay Search as a submodule (See: #25258) --- .gitmodules | 3 +++ src/main/resources/web/rs | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 99bca1b..9cf7b11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "src/submods/metrics-lib"] path = src/submods/metrics-lib url = https://git.torproject.org/metrics-lib.git +[submodule "src/main/resources/web/rs"] + path = src/main/resources/web/rs + url = https://git.torproject.org/atlas.git diff --git a/src/main/resources/web/rs b/src/main/resources/web/rs new file mode 160000 index 0000000..295f48a --- /dev/null +++ b/src/main/resources/web/rs @@ -0,0 +1 @@ +Subproject commit 295f48afbf7912f993379173456c7913daf22a16

1 0

[meek/master] Update programVersion = "0.29".
by dcf＠torproject.org 16 Feb '18

16 Feb '18

commit d0c352322e6765ebfb30ad3ab075acc802c84492 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 15 22:16:47 2018 -0800 Update programVersion = "0.29". --- meek-server/meek-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index f0f03b9..73f3f7b 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -42,7 +42,7 @@ import ( ) const ( - programVersion = "0.28" + programVersion = "0.29" ptMethodName = "meek" // Reject session ids shorter than this, as a weak defense against

1 0

[meek/master] Have meek-client-torbrowser give meek-client a stdin that doesn't close.
by dcf＠torproject.org 16 Feb '18

16 Feb '18

commit a47e634f594c26a5e6676bf5de3f0d1d5bb620af Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jan 11 12:31:02 2018 -0800 Have meek-client-torbrowser give meek-client a stdin that doesn't close. https://bugs.torproject.org/24642 Running meek-client-torbrowser with the environment variable TOR_PT_EXIT_ON_STDIN_CLOSE=1 would cause meek-client to exit immediately, as it sensed that its stdin was closed. meek-client-torbrowser was running the meek-client subprocess with a nil Stdin, which causes its stdin to be /dev/null (or NUL on Windows), which returns an immediate EOF. So instead, give meek-client an StdinPipe and just keep it open. (We could alternatively keep track of it and close it when necessary, but that would take further refactoring.) The commit where things would have first broken was 0ec986eb2b4bc23d81e6e8beffd382890f55bfb1 (part of tag 0.28), which added TOR_PT_EXIT_ON_STDIN_CLOSE awareness to meek-client. But it was not meek-client's fault. This bug did not affect any releases of Tor Browser, despite that on Windows we unconditionally set TOR_PT_EXIT_ON_STDIN_CLOSE=1 via terminateprocess-buffer, because Tor Browser is still using tag 0.25, which doesn't have the TOR_PT_EXIT_ON_STDIN_CLOSE change in meek-client. --- meek-client-torbrowser/meek-client-torbrowser.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index db35080..0064b4b 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -268,6 +268,12 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec args := meekClientCommandLine[1:] args = append(args, []string{"--helper", helperAddr}...) cmd = exec.Command(meekClientPath, args...) + // Give the subprocess a stdin for TOR_PT_EXIT_ON_STDIN_CLOSE purposes. + // https://bugs.torproject.org/24642 + _, err = cmd.StdinPipe() + if err != nil { + return + } cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr log.Printf("running meek-client command %q", cmd.Args)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit d662d4470a9030ad485dde1eb5426f063f9c3cf1 Merge: 799c82be7 652d3a5b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 15 21:05:08 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3 changes/ticket24343 | 6 ++++++ doc/tor.1.txt | 8 ++++---- src/or/config.c | 5 +++-- src/or/connection.c | 2 -- src/or/main.c | 2 +- src/or/or.h | 5 +---- 6 files changed, 15 insertions(+), 13 deletions(-)

1 0

[tor/release-0.3.3] Remove anything related to the old SocksSockets option
by nickm＠torproject.org 16 Feb '18

16 Feb '18

commit 652d3a5b665f8045374eb527494dd9d80ef98d13 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 7 14:05:33 2018 -0500 Remove anything related to the old SocksSockets option At this commit, the SocksSocketsGroupWritable option is renamed to UnixSocksGroupWritable. A deprecated warning is triggered if the old option is used and tor will use it properly. Fixes #24343 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket24343 | 6 ++++++ doc/tor.1.txt | 8 ++++---- src/or/config.c | 5 +++-- src/or/connection.c | 2 -- src/or/main.c | 2 +- src/or/or.h | 5 +---- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/changes/ticket24343 b/changes/ticket24343 new file mode 100644 index 000000000..e62d65eb5 --- /dev/null +++ b/changes/ticket24343 @@ -0,0 +1,6 @@ + o Minor bugfixes (man page, SocksPort): + - Remove dead code about the old "SocksSockets" option. To do so, the + SocksSocketsGroupWritable option has been renamed to + UnixSockssGroupWritable which does the same exact thing. The old option + is still usable but will warn that it is deprecated. Fixes bug 24343; + bugfix on 0.2.6.3. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9a4e70c76..da5f79140 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -238,7 +238,7 @@ GENERAL OPTIONS [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: If not 0, limit the maximum token bucket size (also known as the burst) for \_relayed traffic_ to the given number of bytes in each direction. - They do not include directory fetches by the relay (from authority + They do not include directory fetches by the relay (from authority or other relays), because that is considered "client" activity. (Default: 0) [[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: @@ -608,10 +608,10 @@ GENERAL OPTIONS in accordance to RFC 1929. Both username and password must be between 1 and 255 characters. -[[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**:: +[[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and - write unix sockets (e.g. SocksSocket). If the option is set to 1, make - the SocksSocket socket readable and writable by the default GID. (Default: 0) + write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make + the Unix socket readable and writable by the default GID. (Default: 0) [[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: To keep firewalls from expiring connections, send a padding keepalive cell diff --git a/src/or/config.c b/src/or/config.c index c246bd00e..d76a53a37 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -171,6 +171,7 @@ static config_abbrev_t option_abbrevs_[] = { { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0}, + { "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1}, { NULL, NULL, 0, 0}, }; @@ -284,7 +285,7 @@ static config_var_t option_vars_[] = { V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), V(ControlSocketsGroupWritable, BOOL, "0"), - V(SocksSocketsGroupWritable, BOOL, "0"), + V(UnixSocksGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -7356,7 +7357,7 @@ parse_ports(or_options_t *options, int validate_only, *n_ports_out = 0; - const unsigned gw_flag = options->SocksSocketsGroupWritable ? + const unsigned gw_flag = options->UnixSocksGroupWritable ? CL_PORT_DFLT_GROUP_WRITABLE : 0; if (parse_port_config(ports, options->SocksPort_lines, diff --git a/src/or/connection.c b/src/or/connection.c index fb87e5b05..2a6b10763 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -336,8 +336,6 @@ entry_connection_new(int type, int socket_family) entry_conn->entry_cfg.ipv4_traffic = 1; else if (socket_family == AF_INET6) entry_conn->entry_cfg.ipv6_traffic = 1; - else if (socket_family == AF_UNIX) - entry_conn->is_socks_socket = 1; return entry_conn; } diff --git a/src/or/main.c b/src/or/main.c index 9ffc962d3..d1f004409 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -342,7 +342,7 @@ connection_remove(connection_t *conn) smartlist_len(connection_array)); if (conn->type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { - log_info(LD_NET, "Closing SOCKS SocksSocket connection"); + log_info(LD_NET, "Closing SOCKS Unix socket connection"); } control_event_conn_bandwidth(conn); diff --git a/src/or/or.h b/src/or/or.h index 03efdd1d8..edf89be9a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1818,9 +1818,6 @@ typedef struct entry_connection_t { * the exit has sent a CONNECTED cell) and we have chosen to use it. */ unsigned int may_use_optimistic_data : 1; - - /** Are we a socks SocksSocket listener? */ - unsigned int is_socks_socket:1; } entry_connection_t; /** Subtype of connection_t for an "directory connection" -- that is, an HTTP @@ -3794,7 +3791,7 @@ typedef struct { * for control connections. */ int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ - int SocksSocketsGroupWritable; /**< Boolean: Are SOCKS sockets g+rw? */ + int UnixSocksGroupWritable; /**< Boolean: Are SOCKS Unix sockets g+rw? */ /** Ports to listen on for directory connections. */ config_line_t *DirPort_lines; config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */

1 0