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

[tor/master] Stricter HiddenServicePort parsing
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 3890ad25787ad6142acd65d064168ead53e9a289 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Aug 28 18:32:31 2018 +0300 Stricter HiddenServicePort parsing --- changes/bug27044 | 5 +++++ src/feature/rend/rendservice.c | 8 ++++++++ src/test/test_controller.c | 7 +++++++ src/test/test_hs_config.c | 14 ++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/changes/bug27044 b/changes/bug27044 new file mode 100644 index 000000000..0ce9c48b8 --- /dev/null +++ b/changes/bug27044 @@ -0,0 +1,5 @@ + o Minor bugfixes (configuration, Onion Services): + - In rend_service_parse_port_config(), disallow any input to + remain after address-port pair was parsed. This will catch + address and port being whitespace-separated by mistake of + the user. Fixes bug 27044; bugfix on 0.2.9.10. diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 1a99bd56e..beb0040e5 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -451,11 +451,19 @@ rend_service_parse_port_config(const char *string, const char *sep, int is_unix; ret = port_cfg_line_extract_addrport(addrport_element, &addrport, &is_unix, &rest); + if (ret < 0) { tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden " "service configuration", addrport_element); goto err; } + + if (rest && strlen(rest)) { + err_msg = tor_strdup("HiddenServicePort parse error: invalid port " + "mapping"); + goto err; + } + if (is_unix) { socket_path = addrport; is_unix_addr = 1; diff --git a/src/test/test_controller.c b/src/test/test_controller.c index d0aa86844..7cdd435fa 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -346,6 +346,13 @@ test_rend_service_parse_port_config(void *arg) "in hidden service port configuration."); tor_free(err_msg); + /* Wrong target address and port separation */ + cfg = rend_service_parse_port_config("80,127.0.0.1 1234", sep, + &err_msg); + tt_ptr_op(cfg, OP_EQ, NULL); + tt_assert(err_msg); + tor_free(err_msg); + done: rend_service_port_config_free(cfg); tor_free(err_msg); diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 498d2df19..553b96758 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -139,6 +139,20 @@ test_invalid_service(void *arg) teardown_capture_of_logs(); } + /* Bad target addr:port separation. */ + { + const char *conf = + "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n" + "HiddenServiceVersion 2\n" + "HiddenServicePort 80 127.0.0.1 8000\n"; + setup_full_capture_of_logs(LOG_WARN); + ret = helper_config_service(conf, 1); + tt_int_op(ret, OP_EQ, -1); + expect_log_msg_containing("HiddenServicePort parse error: " + "invalid port mapping"); + teardown_capture_of_logs(); + } + /* Out of order directives. */ { const char *conf =

1 0

[tor/master] manpage: Warn users about comma-separating addr-port pairs
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 326b510bae0b0d479dd924a233c6f6150737eb8b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Aug 14 19:25:10 2018 +0300 manpage: Warn users about comma-separating addr-port pairs --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0c010d94f..99db63cea 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2816,7 +2816,7 @@ The following options are used to configure a hidden service. paths may be quoted, and may use standard C escapes.) You may also have multiple lines with the same VIRTPORT: when a user connects to that VIRTPORT, one of the TARGETs from those lines will be - chosen at random. + chosen at random. Note that address-port pairs have to be comma-separated. [[PublishHidServDescriptors]] **PublishHidServDescriptors** **0**|**1**:: If set to 0, Tor will run any hidden services you configure, but it won't

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/294'
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 8815960c4615da0015e78c3256c3f611a30f6e6c Merge: 6edee54af 326b510ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:47:32 2018 -0400 Merge remote-tracking branch 'tor-github/pr/294' changes/bug27044 | 5 +++++ doc/tor.1.txt | 2 +- src/feature/rend/rendservice.c | 8 ++++++++ src/test/test_controller.c | 7 +++++++ src/test/test_hs_config.c | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0

[tor/master] control: Add new 'uptime' message to GETINFO
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 4ba26f95d5b2ba8a3795317f4777bfefff0e62a9 Author: Kevin Gallagher <kgallagher(a)pandora.com> Date: Mon Jul 16 19:19:10 2018 -0700 control: Add new 'uptime' message to GETINFO Sends the Tor controller the uptime in seconds. Highly useful for monitoring purposes. --- src/feature/control/control.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 12f10926b..e2611ee50 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -1896,6 +1896,9 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, tor_asprintf(answer, "%"PRIu64, (get_bytes_read())); } else if (!strcmp(question, "traffic/written")) { tor_asprintf(answer, "%"PRIu64, (get_bytes_written())); + } else if (!strcmp(question, "uptime")) { + long uptime_secs = get_uptime(); + tor_asprintf(answer, "%ld", uptime_secs); } else if (!strcmp(question, "process/pid")) { int myPid = -1; @@ -3356,6 +3359,7 @@ static const getinfo_item_t getinfo_items[] = { ITEM("traffic/read", misc,"Bytes read since the process was started."), ITEM("traffic/written", misc, "Bytes written since the process was started."), + ITEM("uptime", misc, "Uptime of the Tor daemon in seconds."), ITEM("process/pid", misc, "Process id belonging to the main tor process."), ITEM("process/uid", misc, "User id running the tor process."), ITEM("process/user", misc,

1 0

[tor/master] Merge remote-tracking branch 'ageis/control-getinfo-uptime'
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit e95b13f8ce383634eb10dc0a634971fb020daa76 Merge: bcfab63ca 4ba26f95d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:30:55 2018 -0400 Merge remote-tracking branch 'ageis/control-getinfo-uptime' src/feature/control/control.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Changes file for 25132
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 6edee54afaaa60f34bed0dedb2792766f8683cd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:31:39 2018 -0400 Changes file for 25132 --- changes/feature25132 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/feature25132 b/changes/feature25132 new file mode 100644 index 000000000..138cba9e9 --- /dev/null +++ b/changes/feature25132 @@ -0,0 +1,3 @@ + o Minor features (controller): + - The GETINFO command now support an "uptime" argument, to return + Tor's uptime in seconds. Closes ticket 25132.

1 0

[torspec/master] Merge remote-tracking branch 'ageis/control-getinfo-uptime'
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 4959085ca15fa6170b720139b5e1aeab95dee5c0 Merge: 43c2a65 5508508 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:30:29 2018 -0400 Merge remote-tracking branch 'ageis/control-getinfo-uptime' control-spec.txt | 2 ++ 1 file changed, 2 insertions(+)

1 0

[torspec/master] control: Add new 'uptime' message to GETINFO
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit 5508508c0083e06e3ab68cf0c6c1d9a9bfaee9e3 Author: Kevin Gallagher <kevingallagher(a)gmail.com> Date: Sat Feb 3 03:56:13 2018 -0800 control: Add new 'uptime' message to GETINFO --- control-spec.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 2fca25c..6882c0f 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -718,6 +718,8 @@ "traffic/written" -- Total bytes written (uploaded). + "uptime" -- Uptime of the Tor daemon (in seconds). + "accounting/enabled" "accounting/hibernating" "accounting/bytes"

1 0

[torspec/master] Note when uptime was added.
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit e9ef62412f145279e5d0a0204ae2a6b8594e77fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:29:13 2018 -0400 Note when uptime was added. --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 3faa9d4..6f0a543 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -717,7 +717,8 @@ "traffic/written" -- Total bytes written (uploaded). - "uptime" -- Uptime of the Tor daemon (in seconds). + "uptime" -- Uptime of the Tor daemon (in seconds). Added in + 0.3.5.1-alpha. "accounting/enabled" "accounting/hibernating"

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27467'
by nickm＠torproject.org 06 Sep '18

06 Sep '18

commit bcfab63ca5713638cc2155a8870e51657a2a0ef2 Merge: b8a2bdbdc d0965561a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 6 09:24:47 2018 -0400 Merge remote-tracking branch 'teor/ticket27467' changes/ticket27467 | 3 +++ src/lib/net/address.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-)

1 0