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

[tor-messenger-build/master] Some more rebased patches (IRC, XMPP default servers)
by sukhbir＠torproject.org 02 Sep '15

02 Sep '15

commit 304c28fef74fe6f8616454da3435f6e9c59829b2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Sep 2 10:10:09 2015 -0400 Some more rebased patches (IRC, XMPP default servers) --- projects/instantbird/config | 4 +--- projects/instantbird/irc-default-server.patch | 13 +++++++++++++ projects/instantbird/irc.patch | 13 ------------- projects/instantbird/xmpp-default-domain.patch | 15 +++------------ projects/instantbird/xmpp-resource.patch | 13 ------------- 5 files changed, 17 insertions(+), 41 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 2089829..59bab4b 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -68,8 +68,7 @@ input_files: pkg_type: src - filename: spi-cacert.der - filename: preferences.patch - - filename: irc.patch - - filename: gtalk-resource.patch + - filename: irc-default-server.patch - filename: top-protocols.patch - filename: disable-links.patch - filename: account-picture.patch @@ -81,7 +80,6 @@ input_files: - filename: xmpp-default-domain.patch - filename: xmppRegister.js - filename: xmppRegister.xul - - filename: xmpp-resource.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/irc-default-server.patch b/projects/instantbird/irc-default-server.patch new file mode 100644 index 0000000..9ad53b0 --- /dev/null +++ b/projects/instantbird/irc-default-server.patch @@ -0,0 +1,13 @@ +diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js +index fc90494..d546b6b 100644 +--- a/chat/protocols/irc/irc.js ++++ b/chat/protocols/irc/irc.js +@@ -1960,7 +1960,7 @@ ircProtocol.prototype = { + + usernameSplits: [ + {get label() { return _("options.server"); }, separator: "@", +- defaultValue: "chat.freenode.net", reverse: true} ++ defaultValue: "", reverse: true} + ], + + options: { diff --git a/projects/instantbird/irc.patch b/projects/instantbird/irc.patch deleted file mode 100644 index 29632dd..0000000 --- a/projects/instantbird/irc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js -index c581e2d..cf0d085 100644 ---- a/chat/protocols/irc/irc.js -+++ b/chat/protocols/irc/irc.js -@@ -1916,7 +1916,7 @@ ircProtocol.prototype = { - - usernameSplits: [ - {get label() _("options.server"), separator: "@", -- defaultValue: "chat.freenode.net", reverse: true} -+ defaultValue: "", reverse: true} - ], - - options: { diff --git a/projects/instantbird/xmpp-default-domain.patch b/projects/instantbird/xmpp-default-domain.patch index f9480f0..d2ebe9c 100644 --- a/projects/instantbird/xmpp-default-domain.patch +++ b/projects/instantbird/xmpp-default-domain.patch @@ -1,22 +1,13 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js +index f7dfc46..c2c3a09 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js -@@ -24,17 +24,17 @@ XMPPProtocol.prototype = { - __proto__: GenericProtocolPrototype, - get normalizedName() "jabber", - get name() "XMPP", - get iconBaseURI() "chrome://prpl-jabber/skin/", - getAccount: function(aImAccount) new XMPPAccount(this, aImAccount), +@@ -31,7 +31,7 @@ XMPPProtocol.prototype = { usernameSplits: [ - {get label() _("options.domain"), separator: "@", + {get label() { return _("options.domain"); }, separator: "@", - defaultValue: "jabber.org", reverse: true} + defaultValue: "", reverse: true} ], options: { - resource: {get label() _("options.resource"), - get default() XMPPDefaultResource}, - priority: {get label() _("options.priority"), default: 0}, - connection_security: { - get label() _("options.connectionSecurity"), diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch deleted file mode 100644 index 3e861da..0000000 --- a/projects/instantbird/xmpp-resource.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index f99a238..a35f99a 100644 ---- a/chat/protocols/xmpp/xmpp.js -+++ b/chat/protocols/xmpp/xmpp.js -@@ -34,7 +34,7 @@ XMPPProtocol.prototype = { - - options: { - resource: {get label() _("options.resource"), -- get default() XMPPDefaultResource}, -+ default: "Instantbird"}, - priority: {get label() _("options.priority"), default: 0}, - connection_security: { - get label() _("options.connectionSecurity"),

1 0

[chutney/master] Enable sandboxing in chutney tests
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit f15e235131529ef88a0443977dfbee569d2c0b19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 10:03:53 2015 -0400 Enable sandboxing in chutney tests --- torrc_templates/common.i | 3 +++ 1 file changed, 3 insertions(+) diff --git a/torrc_templates/common.i b/torrc_templates/common.i index 67f60ce..e244565 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -29,6 +29,9 @@ TestingMinExitFlagThreshold 0 # VoteOnHidServDirectoriesV2 needs to be set for HSDirs to get the HSDir flag #Default VoteOnHidServDirectoriesV2 1 +## Options that we always want to test ## +Sandbox 1 + DataDirectory $dir RunAsDaemon 1 ConnLimit $connlimit

1 0

[tor/master] Let bridge authorities run under the sandbox
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 910e25358a148268815a23ff2040599291100a97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:59:22 2015 -0400 Let bridge authorities run under the sandbox (found thanks to teor's chutney haxx) --- changes/bug16964 | 4 ++++ src/or/main.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug16964 b/changes/bug16964 new file mode 100644 index 0000000..46ff565 --- /dev/null +++ b/changes/bug16964 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Allow bridge authorities to run correctly under the seccomp2 + sandbox. Fixes bug 16964; bugfix on 0.2.5.1-alpha. + diff --git a/src/or/main.c b/src/or/main.c index 0b0207b..915b3e2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3040,6 +3040,12 @@ sandbox_init_filter(void) OPEN("/etc/hosts"); OPEN("/proc/meminfo"); + if (options->BridgeAuthoritativeDir) + OPEN_DATADIR_SUFFIX("networkstatus-bridges", ".tmp"); + + if (authdir_mode_handles_descs(options, -1)) + OPEN_DATADIR("approved-routers"); + if (options->ServerDNSResolvConfFile) sandbox_cfg_allow_open_filename(&cfg, tor_strdup(options->ServerDNSResolvConfFile)); @@ -3080,6 +3086,9 @@ sandbox_init_filter(void) RENAME_SUFFIX("unparseable-desc", ".tmp"); RENAME_SUFFIX("v3-status-votes", ".tmp"); + if (options->BridgeAuthoritativeDir) + RENAME_SUFFIX("networkstatus-bridges", ".tmp"); + #define STAT_DATADIR(name) \ sandbox_cfg_allow_stat_filename(&cfg, get_datadir_fname(name))

1 0

[tor/master] Let recent relays run with the chutney sandbox.
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit f6bd8fbb806abaf4015d8b8e08a737bc09ec63f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:59:50 2015 -0400 Let recent relays run with the chutney sandbox. Fixes 16965 --- changes/bug16965 | 4 ++++ src/or/main.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/changes/bug16965 b/changes/bug16965 new file mode 100644 index 0000000..841d723 --- /dev/null +++ b/changes/bug16965 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Allow routers with ed25519 keys to run correctly under the seccomp2 + sandbox. Fixes bug 16964; bugfix on 0.2.7.2-alpha. + diff --git a/src/or/main.c b/src/or/main.c index 915b3e2..5dca9bc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3034,6 +3034,7 @@ sandbox_init_filter(void) OPEN_DATADIR_SUFFIX("state", ".tmp"); OPEN_DATADIR_SUFFIX("unparseable-desc", ".tmp"); OPEN_DATADIR_SUFFIX("v3-status-votes", ".tmp"); + OPEN_DATADIR("key-pinning-journal"); OPEN("/dev/srandom"); OPEN("/dev/urandom"); OPEN("/dev/random"); @@ -3157,6 +3158,13 @@ sandbox_init_filter(void) OPEN_DATADIR2("keys", "secret_onion_key.old"); OPEN_DATADIR2("keys", "secret_onion_key_ntor.old"); + OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_secret_key", ".tmp"); + OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_secret_key_encrypted", + ".tmp"); + OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_public_key", ".tmp"); + OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key", ".tmp"); + OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_cert", ".tmp"); + OPEN_DATADIR2_SUFFIX("stats", "bridge-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "dirreq-stats", ".tmp"); @@ -3187,6 +3195,12 @@ sandbox_init_filter(void) RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp"); + RENAME_SUFFIX2("keys", "ed25519_master_id_secret_key", ".tmp"); + RENAME_SUFFIX2("keys", "ed25519_master_id_secret_key_encrypted", ".tmp"); + RENAME_SUFFIX2("keys", "ed25519_master_id_public_key", ".tmp"); + RENAME_SUFFIX2("keys", "ed25519_signing_secret_key", ".tmp"); + RENAME_SUFFIX2("keys", "ed25519_signing_cert", ".tmp"); + sandbox_cfg_allow_rename(&cfg, get_datadir_fname2("keys", "secret_onion_key"), get_datadir_fname2("keys", "secret_onion_key.old"));

1 0

[chutney/master] If $PYTHON isn't set, use python2 or python
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 2a3b01ff68b99119689fb7d36ca60f62c810df2c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Aug 27 10:35:37 2015 +1000 If $PYTHON isn't set, use python2 or python If $PYTHON isn't set, use "command" to check for python2, then python. (python3 check is disabled due to #16904 - chutney doesn't work with python3.) If neither of the "command" checks work, assume a strange shell or "command", and fall back to python2. Fixes default install of chutney on OS X, which has neither $PYTHON set, nor python2; but does have python, which happens to be version 2. Resolves #16902. --- chutney | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/chutney b/chutney index 4a26464..cbbc673 100755 --- a/chutney +++ b/chutney @@ -1,4 +1,12 @@ #!/bin/sh export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}" +# Use python2, python, python3 in that order +[ -n "$PYTHON" ] || { + command -v python2 >/dev/null 2>&1 && PYTHON=python2 || \ + command -v python >/dev/null 2>&1 && PYTHON=python # || \ +# Not yet supported +# command -v python3 >/dev/null 2>&1 && PYTHON=python3 +} +# Use python2 if the checks that use "command" fail ${PYTHON:=python2} -m chutney.TorNet "$@"

1 0

[chutney/master] Merge remote-tracking branch 'teor/fallback-to-python'
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 971eb49caaddbd554127a77577450276c3c1ac39 Merge: 396da92 2a3b01f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:21:36 2015 -0400 Merge remote-tracking branch 'teor/fallback-to-python' chutney | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0

[tor/master] Autodetect CHUTNEY_PATH if chutney is next to tor
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit d9948dfc9d2b44de66e5a85a486c65a7e2781933 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Aug 27 10:31:35 2015 +1000 Autodetect CHUTNEY_PATH if chutney is next to tor If the chutney and tor sources are side-by-side in the same parent directory, autodetect the chutney path. Closes ticket 16903. Patch by "teor". --- Makefile.am | 11 ++++++++--- changes/autodetect-chutney-path | 4 ++++ src/test/test-network.sh | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9b68d27..b5e71aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,9 +73,14 @@ test: all need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ - echo '$$CHUTNEY_PATH was not set.'; echo; \ - echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \ - exit 1; \ + echo '$$CHUTNEY_PATH was not set.'; \ + if test -d $(top_srcdir)/../chutney -a -x $(top_srcdir)/../chutney/chutney; then \ + echo "Assuming test-network.sh will find" $(top_srcdir)/../chutney; \ + else \ + echo; \ + echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \ + exit 1; \ + fi \ fi # Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. diff --git a/changes/autodetect-chutney-path b/changes/autodetect-chutney-path new file mode 100644 index 0000000..4da6b24 --- /dev/null +++ b/changes/autodetect-chutney-path @@ -0,0 +1,4 @@ + o Minor features (testing): + - Autodetect CHUTNEY_PATH if the chutney and tor sources are + side-by-side in the same parent directory. + Closes ticket 16903. Patch by "teor". diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cc74c0f..806eb18 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -59,8 +59,16 @@ NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic} CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR myname=$(basename $0) +[ -n "$CHUTNEY_PATH" ] || { + echo "$myname: \$CHUTNEY_PATH not set, trying $TOR_DIR/../chutney" + CHUTNEY_PATH="$TOR_DIR/../chutney" +} + [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" + echo "$myname: Get chutney: git clone https://git.torproject.org/\ +chutney.git" + echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export CHUTNEY_PATH=\`pwd\`/chutney" exit 1 }

1 0

[tor/master] Merge remote-tracking branch 'teor/master'
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 569368e5a9a7f418caee513bfd4d4b4dfce9d032 Merge: f273295 5cde98e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:15:16 2015 -0400 Merge remote-tracking branch 'teor/master' changes/test-network-bridges-hs | 6 ++++++ src/test/test-network.sh | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/master] Test bridges and hidden services in make test-network
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit 5cde98e882408854bf9f0a3bb3c0995d1f7317af Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Sep 2 00:52:30 2015 +1000 Test bridges and hidden services in make test-network Make "bridges+hs" the default test network. This tests almost all tor functionality during make test-network, while allowing tests to succeed on non-IPv6 systems. Requires chutney commit 396da92 in test-network-bridges-hs. Closes tickets 16945 (tor), 16946 (chutney) . Patches by "teor". --- changes/test-network-bridges-hs | 6 ++++++ src/test/test-network.sh | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/changes/test-network-bridges-hs b/changes/test-network-bridges-hs new file mode 100644 index 0000000..a8f3521 --- /dev/null +++ b/changes/test-network-bridges-hs @@ -0,0 +1,6 @@ + o Minor features (testing, bridges, hidden services): + - Make "bridges+hs" the default test network. This tests almost all + tor functionality during make test-network, while allowing tests + to succeed on non-IPv6 systems. + Requires chutney commit 396da92 in test-network-bridges-hs. + Closes tickets 16945 (tor), 16946 (chutney) . Patches by "teor". diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cc74c0f..b5d7f7c 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -55,12 +55,20 @@ do done TOR_DIR="${TOR_DIR:-$PWD}" -NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic} +NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR myname=$(basename $0) +[ -n "$CHUTNEY_PATH" ] || { + echo "$myname: \$CHUTNEY_PATH not set, trying $TOR_DIR/../chutney" + CHUTNEY_PATH="$TOR_DIR/../chutney" +} + [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" + echo "$myname: Get chutney: git clone https://git.torproject.org/\ +chutney.git" + echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export CHUTNEY_PATH=\`pwd\`/chutney" exit 1 }

1 0

[tor/master] Add test_keygen.sh to dist
by nickm＠torproject.org 02 Sep '15

02 Sep '15

commit b637bda91f3df4ae5621206a5ccd0015595c98ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 2 09:17:43 2015 -0400 Add test_keygen.sh to dist --- src/test/include.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index ff5e456..ef2fd4f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -186,4 +186,5 @@ EXTRA_DIST += \ src/test/bt_test.py \ src/test/ntor_ref.py \ src/test/slownacl_curve25519.py \ - src/test/zero_length_keys.sh + src/test/zero_length_keys.sh \ + src/test/test_keygen.sh

1 0