May 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Add weird except handler for missing os.ST_WRITE in Travis.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 4c81926ba1f6da1642c5b5d29ce303293bfec0a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:27:24 2014 +0000 Add weird except handler for missing os.ST_WRITE in Travis. --- lib/bridgedb/util.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 00e4ce5..66b228b 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -59,7 +59,14 @@ def _getRotatingFileHandler(filename, mode='a', maxBytes=1000000, backupCount=0, if not os.path.exists(filename): open(filename, 'a').close() os.chown(filename, uid, gid) - os.chmod(filename, os.ST_WRITE | os.ST_APPEND) + try: + os.chmod(filename, os.ST_WRITE | os.ST_APPEND) + except AttributeError: + logging.error(""" + XXX FIXME: Travis chokes on `os.ST_WRITE` saying that the module doesn't + have that attribute, for some reason: + https://travis-ci.org/isislovecruft/bridgedb/builds/24145963#L1601""") + os.chmod(filename, 384) fileHandler = partial(logging.handlers.RotatingFileHandler, filename,

1 0

[bridgedb/master] Fix problems with rotating logfile handler in newest python2.7.6.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 09b2db614e6ed2916ca10b04848e9e3904e7f358 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 23:20:35 2014 +0000 Fix problems with rotating logfile handler in newest python2.7.6. --- lib/bridgedb/util.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 5b0cd48..cc9c65d 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -11,6 +11,8 @@ """Common utilities for BridgeDB.""" +from functools import partial + import logging import logging.config import logging.handlers @@ -33,16 +35,16 @@ def _getLogHandlers(logToFile=True, logToStderr=True): logHandlers.append('console') return logHandlers -def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, +def _getRotatingFileHandler(filename, mode='a', maxBytes=1000000, backupCount=0, encoding='utf-8', uid=None, gid=None): """Get a :class:`logging.RotatingFileHandler` with a logfile which is readable+writable only by the given **uid** and **gid**. :param str filename: The full path to the log file. :param str mode: The mode to open **filename** with. (default: ``'a'``) - :param int filesize: Rotate logfiles after they have grown to this size in + :param int maxBytes: Rotate logfiles after they have grown to this size in bytes. - :param int filecount: The number of logfiles to keep in rotation. + :param int backupCount: The number of logfiles to keep in rotation. :param str encoding: The encoding for the logfile. :param int uid: The owner UID to set on the logfile. :param int gid: The GID to set on the logfile. @@ -59,10 +61,12 @@ def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, os.chown(filename, uid, gid) os.chmod(filename, os.ST_WRITE | os.ST_APPEND) - fileHandler = logging.handlers.RotatingFileHandler(filename, mode, - maxBytes=filesize, - backupCount=filecount, - encoding=encoding) + fileHandler = partial(logging.handlers.RotatingFileHandler, + filename, + mode, + maxBytes=maxBytes, + backupCount=backupCount, + encoding=encoding) return fileHandler def configureLogging(cfg): @@ -111,15 +115,12 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler(), + 'rotating': {'()': _getRotatingFileHandler(logfileName, 'a', + logfileRotateSize, + logfileCount), 'level': logLevel, 'formatter': 'default', - 'filters': logFilters, - # The values below are passed to the handler creator, - # :func:`getChownedFileHandler`, as kwargs: - 'filename': logfileName, - 'filesize': logfileRotateSize, - 'filecount': logfileCount}, + 'filters': logFilters}, }, 'root': { 'handlers': _getLogHandlers(logfileName, logStderr),

1 0

[bridgedb/master] Add missing parens after call to _getRotatingFileHandler in util.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 0c1e12efb4ea61f2ba88c16a71fc627f5fb06de2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:54:33 2014 +0000 Add missing parens after call to _getRotatingFileHandler in util. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 691b9bc..5b0cd48 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -111,7 +111,7 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler, + 'rotating': {'()': _getRotatingFileHandler(), 'level': logLevel, 'formatter': 'default', 'filters': logFilters,

1 0

[tor/master] Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit f8248abbd6c5e04037cedee29a8867700617acde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 14:24:41 2014 -0400 Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe) --- changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug10849_023 b/changes/bug10849_023 new file mode 100644 index 0000000..480dea3 --- /dev/null +++ b/changes/bug10849_023 @@ -0,0 +1,6 @@ + o Major bugfixes: + - When running a hidden service, do not allow TunneledDirConns 0; + this will keep the hidden service from running, and also + make it publish its descriptors directly over HTTP. Fixes bug 10849; + bugfix on 0.2.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d5c5689..f6db98e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4049,6 +4049,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) REJECT("If you set UseBridges, you must set TunnelDirConns."); + if (options->RendConfigLines && + (!options->TunnelDirConns || !options->PreferTunneledDirConns)) + REJECT("If you are running a hidden service, you must set TunnelDirConns " + "and PreferTunneledDirConns"); for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0)

1 0

[tor/master] Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 8828794dc295e3d40dbc35cd58f4c449c632085b Merge: 65575b0 f8248ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:23:22 2014 -0400 Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit efab3484e6ea3a799ccf61061450cfc35791ad41 Merge: 35699ef 8828794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:25:15 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 9511522bd4c072a1d1b03b4d8e866baea3161e35 Merge: f43fee8 efab348 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:26:55 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+) diff --cc src/or/config.c index 7850e52,09fdc0c..02668e3 --- a/src/or/config.c +++ b/src/or/config.c @@@ -3277,12 -3062,14 +3277,16 @@@ options_validate(or_options_t *old_opti REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) REJECT("If you set UseBridges, you must set TunnelDirConns."); + if (options->RendConfigLines && + (!options->TunnelDirConns || !options->PreferTunneledDirConns)) + REJECT("If you are running a hidden service, you must set TunnelDirConns " + "and PreferTunneledDirConns"); for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 1)<0) - REJECT("Bridge line did not parse. See logs for details."); + bridge_line_t *bridge_line = parse_bridge_line(cl->value); + if (!bridge_line) + REJECT("Bridge line did not parse. See logs for details."); + bridge_line_free(bridge_line); } for (cl = options->ClientTransportPlugin; cl; cl = cl->next) {

1 0

[tor/maint-0.2.4] Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit f8248abbd6c5e04037cedee29a8867700617acde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 14:24:41 2014 -0400 Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe) --- changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug10849_023 b/changes/bug10849_023 new file mode 100644 index 0000000..480dea3 --- /dev/null +++ b/changes/bug10849_023 @@ -0,0 +1,6 @@ + o Major bugfixes: + - When running a hidden service, do not allow TunneledDirConns 0; + this will keep the hidden service from running, and also + make it publish its descriptors directly over HTTP. Fixes bug 10849; + bugfix on 0.2.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d5c5689..f6db98e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4049,6 +4049,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) REJECT("If you set UseBridges, you must set TunnelDirConns."); + if (options->RendConfigLines && + (!options->TunnelDirConns || !options->PreferTunneledDirConns)) + REJECT("If you are running a hidden service, you must set TunnelDirConns " + "and PreferTunneledDirConns"); for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit 8828794dc295e3d40dbc35cd58f4c449c632085b Merge: 65575b0 f8248ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:23:22 2014 -0400 Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 30 Apr '14

30 Apr '14

commit efab3484e6ea3a799ccf61061450cfc35791ad41 Merge: 35699ef 8828794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:25:15 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0