January 2017 - tor-commits - lists.torproject.org

[tor/master] Simplify the VPORT() macro in config.c
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 3dd738d5f943a188eb91d6753e055cb44c9c3cdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:07:55 2017 -0500 Simplify the VPORT() macro in config.c It's always called with the same arguments, and there wouldn't be much point to calling it differently. --- src/or/config.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3693cdf..3b70b97 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -133,8 +133,8 @@ static config_abbrev_t option_abbrevs_[] = { /** An entry for config_vars: "The option <b>name</b> is obsolete." */ #define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL } -#define VPORT(member,conftype,initvalue) \ - VAR(#member, conftype, member ## _lines, initvalue) +#define VPORT(member) \ + VAR(#member, LINELIST, member ## _lines, NULL) /** Array of configuration options. Until we disallow nonstandard * abbreviations, order is significant, since the first matching option will @@ -203,7 +203,7 @@ static config_var_t option_vars_[] = { V(ConstrainedSockSize, MEMUNIT, "8192"), V(ContactInfo, STRING, NULL), V(ControlListenAddress, LINELIST, NULL), - VPORT(ControlPort, LINELIST, NULL), + VPORT(ControlPort), V(ControlPortFileGroupReadable,BOOL, "0"), V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), @@ -221,7 +221,7 @@ static config_var_t option_vars_[] = { V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"), V(DirListenAddress, LINELIST, NULL), V(DirPolicy, LINELIST, NULL), - VPORT(DirPort, LINELIST, NULL), + VPORT(DirPort), V(DirPortFrontPage, FILENAME, NULL), VAR("DirReqStatistics", BOOL, DirReqStatistics_option, "1"), VAR("DirAuthority", LINELIST, DirAuthorities, NULL), @@ -232,7 +232,7 @@ static config_var_t option_vars_[] = { OBSOLETE("DisableIOCP"), OBSOLETE("DisableV2DirectoryInfo_"), OBSOLETE("DynamicDHGroups"), - VPORT(DNSPort, LINELIST, NULL), + VPORT(DNSPort), V(DNSListenAddress, LINELIST, NULL), V(DownloadExtraInfo, BOOL, "0"), V(TestingEnableConnBwEvent, BOOL, "0"), @@ -252,7 +252,7 @@ static config_var_t option_vars_[] = { V(ExitPortStatistics, BOOL, "0"), V(ExtendAllowPrivateAddresses, BOOL, "0"), V(ExitRelay, AUTOBOOL, "auto"), - VPORT(ExtORPort, LINELIST, NULL), + VPORT(ExtORPort), V(ExtORPortCookieAuthFile, STRING, NULL), V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"), V(ExtraInfoStatistics, BOOL, "1"), @@ -338,7 +338,7 @@ static config_var_t option_vars_[] = { V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), V(NATDListenAddress, LINELIST, NULL), - VPORT(NATDPort, LINELIST, NULL), + VPORT(NATDPort), V(Nickname, STRING, NULL), V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"), V(WarnUnsafeSocks, BOOL, "1"), @@ -348,7 +348,7 @@ static config_var_t option_vars_[] = { V(NumEntryGuards, UINT, "0"), V(OfflineMasterKey, BOOL, "0"), V(ORListenAddress, LINELIST, NULL), - VPORT(ORPort, LINELIST, NULL), + VPORT(ORPort), V(OutboundBindAddress, LINELIST, NULL), OBSOLETE("PathBiasDisableRate"), @@ -420,7 +420,7 @@ static config_var_t option_vars_[] = { V(ShutdownWaitLength, INTERVAL, "30 seconds"), V(SocksListenAddress, LINELIST, NULL), V(SocksPolicy, LINELIST, NULL), - VPORT(SocksPort, LINELIST, NULL), + VPORT(SocksPort), V(SocksTimeout, INTERVAL, "2 minutes"), V(SSLKeyLifetime, INTERVAL, "0"), OBSOLETE("StrictEntryNodes"), @@ -435,7 +435,7 @@ static config_var_t option_vars_[] = { V(TrackHostExits, CSV, NULL), V(TrackHostExitsExpire, INTERVAL, "30 minutes"), V(TransListenAddress, LINELIST, NULL), - VPORT(TransPort, LINELIST, NULL), + VPORT(TransPort), V(TransProxyType, STRING, "default"), OBSOLETE("TunnelDirConns"), V(UpdateBridgesFromAuthority, BOOL, "0"),

1 0

[tor/master] Merge branch 'feature_20956_029'
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit d95d9889463fcab0eac742b1634d64f1e8b4328a Merge: c4cc11a 83307fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 23 16:07:15 2017 -0500 Merge branch 'feature_20956_029' changes/feature20956 | 6 ++++++ doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 29 +++++++++++++++++++---------- src/or/confparse.c | 5 +++++ 4 files changed, 43 insertions(+), 10 deletions(-)

1 0

[tor/master] Add __SocksPort etc variants for non-persistent use
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 83307fc267e7de5fd3a9ccc0c51d6d377f454495 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:21:33 2017 -0500 Add __SocksPort etc variants for non-persistent use Implements feature 20956. --- changes/feature20956 | 6 ++++++ doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 13 +++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/changes/feature20956 b/changes/feature20956 new file mode 100644 index 0000000..1ebddb1 --- /dev/null +++ b/changes/feature20956 @@ -0,0 +1,6 @@ + o Minor features (configuration, controller): + - Each of the *Port options, such as SocksPort, ORPort, ControlPort, + and so on, now comes with a __*Port variant that will not be + saved to the torrc file by the controller's SAVECONF command. + This change allows TorBrowser to set up a single-use domain socket + for each time it launches Tor. Closes ticket 20956. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f1068ce..330cdd4 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2668,6 +2668,19 @@ The following options are used for running a testing Tor network. we replace it and issue a new key? (Default: 3 hours for link and auth; 1 day for signing.) +NON-PERSISTENT OPTIONS +---------------------- + +These options are not saved to the torrc file by the "SAVECONF" controller +command. Other options of this type are documented in control-spec.txt, +section 5.4. End-users should mostly ignore them. + +[[UnderscorePorts]] **\_\_ControlPort**, **\_\_DirPort**, **\_\_DNSPort**, **\_\_ExtORPort**, **\_\_NATDPort**, **\_\_ORPort**, **\_\_SocksPort**, **\_\_TransPort**:: + These underscore-prefixed options are variants of the regular Port + options. They behave the same, except they are not saved to the + torrc file by the controller's SAVECONF command. + + SIGNALS ------- diff --git a/src/or/config.c b/src/or/config.c index 3b70b97..fe6aa78 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -133,8 +133,17 @@ static config_abbrev_t option_abbrevs_[] = { /** An entry for config_vars: "The option <b>name</b> is obsolete." */ #define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL } -#define VPORT(member) \ - VAR(#member, LINELIST, member ## _lines, NULL) +/** + * Macro to declare *Port options. Each one comes in three entries. + * For example, most users should use "SocksPort" to configure the + * socks port, but TorBrowser wants to use __SocksPort so that it + * isn't stored by SAVECONF. The SocksPortLines virtual option is + * used to query both options from the controller. + */ +#define VPORT(member) \ + VAR(#member "Lines", LINELIST_V, member ## _lines, NULL), \ + VAR(#member, LINELIST_S, member ## _lines, NULL), \ + VAR("__" #member, LINELIST_S, member ## _lines, NULL) /** Array of configuration options. Until we disallow nonstandard * abbreviations, order is significant, since the first matching option will

1 0

[tor/master] Handle __NonSavedOptions correctly inside LINELIST_V blocks.
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 9469aaaa82b353655c8e17f654954231ba3b09c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:24:37 2017 -0500 Handle __NonSavedOptions correctly inside LINELIST_V blocks. --- src/or/confparse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/confparse.c b/src/or/confparse.c index efcf4f9..2d6cc7a 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -1148,6 +1148,11 @@ config_dump(const config_format_t *fmt, const void *default_options, config_get_assigned_option(fmt, options, fmt->vars[i].name, 1); for (; line; line = line->next) { + if (!strcmpstart(line->key, "__")) { + /* This check detects "hidden" variables inside LINELIST_V structures. + */ + continue; + } smartlist_add_asprintf(elements, "%s%s %s\n", comment_option ? "# " : "", line->key, line->value);

1 0

[tor-browser-build/master] Update rbm submodule url
by boklm＠torproject.org 23 Jan '17

23 Jan '17

commit 0ff4bb1275c878d7650f2ffc0d872a1af216c73d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 23 21:39:01 2017 +0100 Update rbm submodule url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f85be07..2c1c6e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "rbm"] path = rbm - url = https://github.com/boklm/rbm + url = https://git.torproject.org/builders/rbm.git

1 0

[snowflake/master] Remove unused clientAddr from ProxyPair
by arlo＠torproject.org 23 Jan '17

23 Jan '17

commit d1ec51bfb9aee014b848ad722c1f3ba7aa69124e Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 23 12:33:55 2017 -0800 Remove unused clientAddr from ProxyPair --- proxy/proxypair.coffee | 2 +- proxy/snowflake.coffee | 2 +- proxy/spec/proxypair.spec.coffee | 3 +-- proxy/spec/util.spec.coffee | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index d8253da..b19df09 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -22,7 +22,7 @@ class ProxyPair onCleanup: null id: null - constructor: (@clientAddr, @relayAddr, @rateLimit) -> + constructor: (@relayAddr, @rateLimit) -> @active = false @id = genSnowflakeID() diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 629c776..0966053 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -143,7 +143,7 @@ class Snowflake .catch fail makeProxyPair: (relay) -> - pair = new ProxyPair null, relay, @rateLimit + pair = new ProxyPair relay, @rateLimit @proxyPairs.push pair pair.onCleanup = (event) => # Delete from the list of active proxy pairs. diff --git a/proxy/spec/proxypair.spec.coffee b/proxy/spec/proxypair.spec.coffee index 162c0b4..992b53f 100644 --- a/proxy/spec/proxypair.spec.coffee +++ b/proxy/spec/proxypair.spec.coffee @@ -7,8 +7,7 @@ describe 'ProxyPair', -> fakeRelay = Parse.address '0.0.0.0:12345' rateLimit = new DummyRateLimit() destination = [] - fakeClient = send: (d) -> destination.push d - pp = new ProxyPair(fakeClient, fakeRelay, rateLimit) + pp = new ProxyPair(fakeRelay, rateLimit) it 'begins webrtc connection', -> pp.begin() diff --git a/proxy/spec/util.spec.coffee b/proxy/spec/util.spec.coffee index 07b712b..4e5ab45 100644 --- a/proxy/spec/util.spec.coffee +++ b/proxy/spec/util.spec.coffee @@ -159,13 +159,12 @@ describe 'ProxyPair', -> fakeRelay = Parse.address '0.0.0.0:12345' rateLimit = new DummyRateLimit() destination = [] - fakeClient = send: (d) -> destination.push d # Fake snowflake to interact with snowflake = { broker: sendAnswer: -> } - pp = new ProxyPair(fakeClient, fakeRelay, rateLimit) + pp = new ProxyPair(fakeRelay, rateLimit) it 'begins webrtc connection', -> pp.begin()

1 0

[snowflake/master] Fix logging inactive to ui
by arlo＠torproject.org 23 Jan '17

23 Jan '17

commit 5212eda6b237eaf96dca4e0f370cc20785683244 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 23 12:01:23 2017 -0800 Fix logging inactive to ui --- proxy/snowflake.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1fff686..629c776 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -206,12 +206,6 @@ log = (msg) -> dbg = (msg) -> log msg if DEBUG or snowflake.ui?.debug init = (isNode) -> - cookies = Parse.cookie document.cookie - # Do nothing if snowflake has not been opted in. - if cookies[COOKIE_NAME] != "1" - log 'Not activate. Please click the badge to change options.' - return - # Hook up to the debug UI if available. ui = if isNode then null else new UI() silenceNotifications = Params.getBool(query, 'silent', false) @@ -219,6 +213,12 @@ init = (isNode) -> broker = new Broker brokerUrl snowflake = new Snowflake broker, ui + cookies = Parse.cookie document.cookie + # Do nothing if snowflake has not been opted in. + if cookies[COOKIE_NAME] != "1" + log 'Not activate. Please click the badge to change options.' + return + log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED dbg 'Contacting Broker at ' + broker.url if not COPY_PASTE_ENABLED

1 0

[tor/master] Bump version to 0.2.9.9-dev
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 0d4d9b6d889de6dc85ca8870ada123aaf41b0053 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 23 14:34:08 2017 -0500 Bump version to 0.2.9.9-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1506373..2134a41 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.9]) +AC_INIT([tor],[0.2.9.9-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9b86f72..91eb5f2 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.9" +!define VERSION "0.2.9.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 17e1e54..80d5cf0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.9" +#define VERSION "0.2.9.9-dev"

1 0

[tor/maint-0.2.9] Bump version to 0.2.9.9-dev
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit 0d4d9b6d889de6dc85ca8870ada123aaf41b0053 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 23 14:34:08 2017 -0500 Bump version to 0.2.9.9-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1506373..2134a41 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.9]) +AC_INIT([tor],[0.2.9.9-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9b86f72..91eb5f2 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.9" +!define VERSION "0.2.9.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 17e1e54..80d5cf0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.9" +#define VERSION "0.2.9.9-dev"

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 23 Jan '17

23 Jan '17

commit c1d23c65f63eb347052ce8fb59e29b4459ed32a2 Merge: 56788a2 0d4d9b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 23 14:34:14 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0