March 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] protover: Add missing Padding to translate_to_rust
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit a999cb43df3dc4e64820347486a2d861636bfc2e Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 1 13:50:00 2019 -0500 protover: Add missing Padding to translate_to_rust This commit also explicitly set the value of the PRT enum so we can match/pin the C enum values to the Rust one in protover/ffi.rs. Fixes #29631 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket29631 | 4 ++++ src/core/or/protover.h | 22 +++++++++++----------- src/rust/protover/ffi.rs | 1 + 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/changes/ticket29631 b/changes/ticket29631 new file mode 100644 index 000000000..9fc194ba9 --- /dev/null +++ b/changes/ticket29631 @@ -0,0 +1,4 @@ + o Minor bugfixes (Rust, protover): + - The Rust implementation of protover was missing the "Padding" value in + the translate function from C to Rust. Fixes bug 29631; bugfix on + 0.4.0.1-alpha. diff --git a/src/core/or/protover.h b/src/core/or/protover.h index 27106d4be..567b94a16 100644 --- a/src/core/or/protover.h +++ b/src/core/or/protover.h @@ -33,17 +33,17 @@ struct smartlist_t; /// C_RUST_COUPLED: src/rust/protover/ffi.rs `translate_to_rust` /// C_RUST_COUPLED: src/rust/protover/protover.rs `Proto` typedef enum protocol_type_t { - PRT_LINK, - PRT_LINKAUTH, - PRT_RELAY, - PRT_DIRCACHE, - PRT_HSDIR, - PRT_HSINTRO, - PRT_HSREND, - PRT_DESC, - PRT_MICRODESC, - PRT_CONS, - PRT_PADDING, + PRT_LINK = 0, + PRT_LINKAUTH = 1, + PRT_RELAY = 2, + PRT_DIRCACHE = 3, + PRT_HSDIR = 4, + PRT_HSINTRO = 5, + PRT_HSREND = 6, + PRT_DESC = 7, + PRT_MICRODESC = 8, + PRT_CONS = 9, + PRT_PADDING = 10, } protocol_type_t; bool protover_contains_long_protocol_names(const char *s); diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 6ee63adb1..066b08edd 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -30,6 +30,7 @@ fn translate_to_rust(c_proto: uint32_t) -> Result<Protocol, ProtoverError> { 7 => Ok(Protocol::Desc), 8 => Ok(Protocol::Microdesc), 9 => Ok(Protocol::Cons), + 10 => Ok(Protocol::Padding), _ => Err(ProtoverError::UnknownProtocol), } }

1 0

[tor/release-0.4.0] protover: Add missing Padding to translate_to_rust
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit a999cb43df3dc4e64820347486a2d861636bfc2e Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Mar 1 13:50:00 2019 -0500 protover: Add missing Padding to translate_to_rust This commit also explicitly set the value of the PRT enum so we can match/pin the C enum values to the Rust one in protover/ffi.rs. Fixes #29631 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket29631 | 4 ++++ src/core/or/protover.h | 22 +++++++++++----------- src/rust/protover/ffi.rs | 1 + 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/changes/ticket29631 b/changes/ticket29631 new file mode 100644 index 000000000..9fc194ba9 --- /dev/null +++ b/changes/ticket29631 @@ -0,0 +1,4 @@ + o Minor bugfixes (Rust, protover): + - The Rust implementation of protover was missing the "Padding" value in + the translate function from C to Rust. Fixes bug 29631; bugfix on + 0.4.0.1-alpha. diff --git a/src/core/or/protover.h b/src/core/or/protover.h index 27106d4be..567b94a16 100644 --- a/src/core/or/protover.h +++ b/src/core/or/protover.h @@ -33,17 +33,17 @@ struct smartlist_t; /// C_RUST_COUPLED: src/rust/protover/ffi.rs `translate_to_rust` /// C_RUST_COUPLED: src/rust/protover/protover.rs `Proto` typedef enum protocol_type_t { - PRT_LINK, - PRT_LINKAUTH, - PRT_RELAY, - PRT_DIRCACHE, - PRT_HSDIR, - PRT_HSINTRO, - PRT_HSREND, - PRT_DESC, - PRT_MICRODESC, - PRT_CONS, - PRT_PADDING, + PRT_LINK = 0, + PRT_LINKAUTH = 1, + PRT_RELAY = 2, + PRT_DIRCACHE = 3, + PRT_HSDIR = 4, + PRT_HSINTRO = 5, + PRT_HSREND = 6, + PRT_DESC = 7, + PRT_MICRODESC = 8, + PRT_CONS = 9, + PRT_PADDING = 10, } protocol_type_t; bool protover_contains_long_protocol_names(const char *s); diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 6ee63adb1..066b08edd 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -30,6 +30,7 @@ fn translate_to_rust(c_proto: uint32_t) -> Result<Protocol, ProtoverError> { 7 => Ok(Protocol::Desc), 8 => Ok(Protocol::Microdesc), 9 => Ok(Protocol::Cons), + 10 => Ok(Protocol::Padding), _ => Err(ProtoverError::UnknownProtocol), } }

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit f1890707ccfd4c665ee477655c663accb8891279 Merge: d24acc008 a999cb43d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 5 13:00:07 2019 -0500 Merge branch 'maint-0.4.0' changes/ticket29631 | 4 ++++ src/core/or/protover.h | 22 +++++++++++----------- src/rust/protover/ffi.rs | 1 + 3 files changed, 16 insertions(+), 11 deletions(-)

1 0

[sbws/master] fix: docs: !minor Add country to configuration examples
by juga＠torproject.org 05 Mar '19

05 Mar '19

commit ca72016c889afd836dfd239d442ac975f8f6ac00 Author: juga0 <juga(a)riseup.net> Date: Tue Mar 5 17:41:44 2019 +0000 fix: docs: !minor Add country to configuration examples --- docs/source/examples/sbws.example.ini | 10 +++++++++- docs/source/man_sbws.ini.rst | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/source/examples/sbws.example.ini b/docs/source/examples/sbws.example.ini index 2f0a6bd..5b9b756 100644 --- a/docs/source/examples/sbws.example.ini +++ b/docs/source/examples/sbws.example.ini @@ -2,6 +2,9 @@ [scanner] # A human-readable string with chars in a-zA-Z0-9 to identify your scanner nickname = sbws_default +# ISO 3166-1 alpha-2 country code where the Web server destination is located. +# Default AA, to detect it was not edited. +country = SN [destinations] # With several destinations, the scanner can continue even if some of them @@ -15,7 +18,12 @@ foo = on [destinations.foo] # the domain and path to the 1GB file. url = https://example.com/does/not/exist.bin - +# Whether to verify or not the TLS certificate. Default True +verify = False +# ISO 3166-1 alpha-2 country code where the Web server destination is located. +# Default AA, to detect it was not edited. +# Use ZZ if the location is unknown (for instance, a CDN). +country = ZZ ## The following logging options are set by default. ## There is no need to change them unless other options are prefered. diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 8f64b0d..5f4241b 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -6,14 +6,12 @@ DESCRIPTION Tor bandwidth scanner configuration file. -**sbws** (1) ``scanner`` command requires a configuration file with a -"[destinations]" section. -"[destinations]" is the only section that does not have a default value. +**sbws** (1) ``scanner`` command requires a configuration file with the +"[scanner]", "[destinations]" "[destination.<name>]" sections. -It is also required to configure "country" in the "[scanner]" section. -It is recommended, but not required to configure "nickname" in the "[scanner]" -section. +There must be at least one "[destination.<name>]". +See an **EXAMPLES** below for a minimal configuration. SECTIONS --------- @@ -186,6 +184,10 @@ EXAMPLES Example ``destinations`` section:: + [scanner] + nickname = Manual + country = US + [destinations] foo = on bar = on @@ -194,14 +196,18 @@ Example ``destinations`` section:: [destinations.foo] # using HTTP url = http://example.org/sbws.bin + country = ZZ + verify = False [destinations.bar] # using HTTPS url = https://example.com/data + country = SN [destinations.baz] # this will be ignored url = https://example.net/ask/stan/where/the/file/is.exe + country = TH FILES -----

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/759'
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit d24acc008dcdc0b9515ac754ac54e00753b0f8b5 Merge: f8e38d21c c9a9de120 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 5 12:01:28 2019 -0500 Merge remote-tracking branch 'tor-github/pr/759' changes/ticket25614 | 3 +++ src/feature/client/transports.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/master] Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit 4578c3eb219e93da9b1aaa37c4f3c5f61c7106f5 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 22 23:54:17 2019 -0700 Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too. Closes #25614. --- changes/ticket25614 | 3 +++ src/feature/client/transports.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/ticket25614 b/changes/ticket25614 new file mode 100644 index 000000000..ad0554902 --- /dev/null +++ b/changes/ticket25614 @@ -0,0 +1,3 @@ + o Minor bugfixes (pluggable transports): + - Tor now sets TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports as + well as servers. Closes ticket 25614. diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e7ff3bf34..6fb357b46 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1424,11 +1424,6 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } else { smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT="); } - - /* All new versions of tor will keep stdin open, so PTs can use it - * as a reliable termination detection mechanism. - */ - smartlist_add_asprintf(envs, "TOR_PT_EXIT_ON_STDIN_CLOSE=1"); } else { /* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the * TOR_PT_PROXY line. @@ -1439,6 +1434,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } } + /* All new versions of tor will keep stdin open, so PTs can use it + * as a reliable termination detection mechanism. + */ + smartlist_add_asprintf(envs, "TOR_PT_EXIT_ON_STDIN_CLOSE=1"); + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { set_environment_variable_in_smartlist(merged_env_vars, env_var, tor_free_, 1);

1 0

[tor/master] Fix changelog for ticket 25614 to make it pass check-changes.
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit c9a9de120f4287ccb5cd3998916cbe7b81dba89a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Mar 5 15:50:30 2019 +0100 Fix changelog for ticket 25614 to make it pass check-changes. Yawning's commit in fda61e030e12cbd66a2be9905e6855ec6c6a3c63 was used to find which version this is a bugfix on. --- changes/ticket25614 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket25614 b/changes/ticket25614 index ad0554902..82988eeac 100644 --- a/changes/ticket25614 +++ b/changes/ticket25614 @@ -1,3 +1,3 @@ o Minor bugfixes (pluggable transports): - Tor now sets TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports as - well as servers. Closes ticket 25614. + well as servers. Fixes bug 25614; bugfix on 0.2.7.1-alpha.

1 0

[tor/master] manpage: fix formatting of example on quoting options with spaces
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit 27eec505270ba6378e8ff732da5432b30ac107f7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 3 11:51:08 2019 +0200 manpage: fix formatting of example on quoting options with spaces --- changes/ticket29635 | 3 +++ doc/tor.1.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29635 b/changes/ticket29635 new file mode 100644 index 000000000..cbadbf648 --- /dev/null +++ b/changes/ticket29635 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation, manpage): + - Use proper formatting when providing an example on quoting options that + contain whitespace. Fixes bug 29635; bugfix on 0.2.3.18-rc. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 52f5bfa0c..ee9197606 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -147,8 +147,8 @@ instance, you can tell Tor to start listening for SOCKS connections on port 9999 by passing --SocksPort 9999 or SocksPort 9999 to it on the command line, or by putting "SocksPort 9999" in the configuration file. You will need to quote options with spaces in them: if you want Tor to log all debugging -messages to debug.log, you will probably need to say --Log 'debug file -debug.log'. +messages to debug.log, you will probably need to say **--Log** `"debug file +debug.log"`. Options on the command line override those in configuration files. See the next section for more information.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/753'
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit f8e38d21c27f25af8bfacfda2dbd0160214361b3 Merge: 72751f0c3 27eec5052 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 5 11:57:20 2019 -0500 Merge remote-tracking branch 'tor-github/pr/753' changes/ticket29635 | 3 +++ doc/tor.1.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Update test-network.sh to bash script to use array
by nickm＠torproject.org 05 Mar '19

05 Mar '19

commit f888b3e2ee23f6e0394c9c7589c10e320714deda Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 2 16:46:30 2019 +0200 Update test-network.sh to bash script to use array This lets us to save original script argument to array (POSIX shell does not support that). Fixes shellcheck warnings SC2124 and SC2086. --- src/test/test-network.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 51b298ca8..e382eec66 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # This script calls the equivalent script in chutney/tools @@ -20,7 +20,7 @@ myname=$(basename $0) # Save the arguments before we destroy them # This might not preserve arguments with spaces in them -ORIGINAL_ARGS="$@" +ORIGINAL_ARGS=( "$@" ) # We need to find CHUTNEY_PATH, so that we can call the version of this script # in chutney/tools with the same arguments. We also need to respect --quiet. @@ -99,7 +99,7 @@ if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then # this may fail if some arguments have spaces in them # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces # will be handled correctly - exec "$TEST_NETWORK" $ORIGINAL_ARGS + exec "$TEST_NETWORK" "${ORIGINAL_ARGS[@]}" # $ORIGINAL_ARGS else $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." $ECHO "$myname: Please update your chutney using 'git pull'."

1 0