tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[tor/master] Merge branch 'bug9213_doc_024' into maint-0.2.4
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit 48578e1512f2d5fa95e4fdde0564d2db8ee7f995 Merge: 24e0b10 a68e6ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 20:59:13 2014 -0400 Merge branch 'bug9213_doc_024' into maint-0.2.4 changes/bug9213_doc | 5 +++++ doc/tor.1.txt | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

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

02 Apr '14

commit dfc32177d9ec3b8a639d6831ca4bc92c4f273dcb Merge: b4b9186 48578e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 21:00:30 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9213_doc | 5 +++++ doc/tor.1.txt | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --cc doc/tor.1.txt index a42d550,eb9ad67..1cc8f84 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -42,13 -37,9 +42,13 @@@ COMMAND-LINE OPTION [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: $HOME/.torrc, or @CONFDIR@/torrc if that file is not + options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) +[[opt-allow-missing-torrc]] **--allow-missing-torrc**:: + Do not require that configuration file specified by **-f** exist if + default torrc can be accessed. + [[opt-defaults-torrc]] **--defaults-torrc** __FILE__:: Specify a file in which to find default values for Tor options. The contents of this file are overridden by those in the regular

1 0

[tor/maint-0.2.4] Merge branch 'bug9213_doc_024' into maint-0.2.4
by nickm＠torproject.org 02 Apr '14

02 Apr '14

1 0

[tor/maint-0.2.4] Fix documentation of torrc search order
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit a68e6ea9c0288d82ea10076c551f48d63b3813fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 14:58:46 2014 -0400 Fix documentation of torrc search order We are searching @CONFDIR@ before $HOME, but the documentation implied otherwise. I screwed this up in f5e86bcd6c06d43ff3af5acd8135bd8b577bc3, when I first documented the $HOME/.torrc possibility. Fix for bug 9213; bugfix on 0.2.3.18-rc. --- changes/bug9213_doc | 5 +++++ doc/tor.1.txt | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug9213_doc b/changes/bug9213_doc new file mode 100644 index 0000000..2f959dd --- /dev/null +++ b/changes/bug9213_doc @@ -0,0 +1,5 @@ + o Documentation: + - Correctly document that we search for a system torrc file before + looking in ~/.torrc. Fixes documentation side of 9213; bugfix + on 0.2.3.18-rc. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3f8f6da..eb9ad67 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -37,7 +37,7 @@ COMMAND-LINE OPTIONS [[opt-f]] **-f** __FILE__:: Specify a new configuration file to contain further Tor configuration - options. (Default: $HOME/.torrc, or @CONFDIR@/torrc if that file is not + options. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) [[opt-defaults-torrc]] **--defaults-torrc** __FILE__:: @@ -2103,6 +2103,9 @@ FILES **@CONFDIR@/torrc**:: The configuration file, which contains "option value" pairs. +**$HOME/.torrc**:: + Fallback location for torrc, if @CONFDIR@/torrc is not found. + **@LOCALSTATEDIR@/lib/tor/**:: The tor process stores keys and other data here.

1 0

[tor/master] Merge remote-tracking branch 'public/bug9870'
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit b4b91864bb3879587edc7e8c430337f24835b28c Merge: 6bef082 c4bb3c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 1 20:48:15 2014 -0400 Merge remote-tracking branch 'public/bug9870' Conflicts: src/or/config.c changes/bug9870 | 5 +++++ src/or/config.c | 38 +++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --cc src/or/config.c index 909ac14,dcbe88d..c42ceb3 --- a/src/or/config.c +++ b/src/or/config.c @@@ -1342,26 -1360,6 +1361,19 @@@ options_act(const or_options_t *old_opt } #endif + /* If we are a bridge with a pluggable transport proxy but no + Extended ORPort, inform the user that she is missing out. */ + if (server_mode(options) && options->ServerTransportPlugin && + !options->ExtORPort_lines) { + log_notice(LD_CONFIG, "We use pluggable transports but the Extended " + "ORPort is disabled. Tor and your pluggable transports proxy " + "communicate with each other via the Extended ORPort so it " + "is suggested you enable it: it will also allow your Bridge " + "to collect statistics about its clients that use pluggable " + "transports. Please enable it using the ExtORPort torrc option " + "(e.g. set 'ExtORPort auto')."); + } + - if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && - (!old_options || old_options->SafeLogging_ != options->SafeLogging_)) { - log_warn(LD_GENERAL, "Your log may contain sensitive information - you " - "disabled SafeLogging. Please log safely. Don't log unless it " - "serves an important reason. Overwrite the log afterwards."); - } - if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) {

1 0

[tor/master] Log only one message for dangerous log settings.
by nickm＠torproject.org 02 Apr '14

02 Apr '14

commit c4bb3c8d447400573eb45f3e2076e6b80187f1b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 15:32:50 2014 -0500 Log only one message for dangerous log settings. We log only one message, containing a complete list of what's wrong. We log the complete list whenever any of the possible things that could have gotten wrong gets worse. Fix for #9870. Bugfix on 10480dff01bece13fab, which we merged in 0.2.5.1-alpha. --- changes/bug9870 | 5 +++++ src/or/config.c | 38 +++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/changes/bug9870 b/changes/bug9870 new file mode 100644 index 0000000..b4b2c2d --- /dev/null +++ b/changes/bug9870 @@ -0,0 +1,5 @@ + o Minor bugfixes: + + - Log only one message when we start logging in an unsafe + way. Previously, we would log as many messages as we had + problems. Fix for #9870; bugfix on 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index d298177..dcbe88d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1148,12 +1148,31 @@ options_act_reversible(const or_options_t *old_options, char **msg) tor_free(severity); tor_log_update_sigsafe_err_fds(); } - if (get_min_log_level() >= LOG_INFO && - get_min_log_level() != old_min_log_level) { - log_warn(LD_GENERAL, "Your log may contain sensitive information: you're " - "logging more than \"notice\". Please log safely. Don't log " - "unless it serves an important reason, and overwrite the log " - "afterwards."); + + { + const char *badness = NULL; + int bad_safelog = 0, bad_severity = 0, new_badness = 0; + if (options->SafeLogging_ != SAFELOG_SCRUB_ALL) { + bad_safelog = 1; + if (!old_options || old_options->SafeLogging_ != options->SafeLogging_) + new_badness = 1; + } + if (get_min_log_level() >= LOG_INFO) { + bad_severity = 1; + if (get_min_log_level() != old_min_log_level) + new_badness = 1; + } + if (bad_safelog && bad_severity) + badness = "you disabled SafeLogging, and " + "you're logging more than \"notice\""; + else if (bad_safelog) + badness = "you disabled SafeLogging"; + else + badness = "you're logging more than \"notice\""; + if (new_badness) + log_warn(LD_GENERAL, "Your log may contain sensitive information - %s. " + "Don't log unless it serves an important reason. " + "Overwrite the log afterwards.", badness); } SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn, @@ -1341,13 +1360,6 @@ options_act(const or_options_t *old_options) } #endif - if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && - (!old_options || old_options->SafeLogging_ != options->SafeLogging_)) { - log_warn(LD_GENERAL, "Your log may contain sensitive information - you " - "disabled SafeLogging. Please log safely. Don't log unless it " - "serves an important reason. Overwrite the log afterwards."); - } - if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) {

1 0

[bridgedb/develop] Add useful output during startup integration test
by isis＠torproject.org 01 Apr '14

01 Apr '14

commit a3d59f0b2b9870ee8ee184bfb6617844891f8b57 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Mar 26 05:26:07 2014 +0000 Add useful output during startup integration test --- lib/bridgedb/test/test_bridgedb.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 1f4470b..e73e2bc 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -92,10 +92,12 @@ class BridgeDBCliTest(unittest.TestCase): # Sorry Windows users devnull = open('/dev/null', 'w') bridgedbProc = Popen([bridgedbScript, '-r', runDir], stdout=devnull) + print("Waiting 30 seconds while bridgedb loads...") time.sleep(30) assignments = pjoin(runDir, 'assignments.log') self.assertTrue(os.path.isfile(assignments)) os.unlink(assignments) + print("Sending SIGHUP, checking for assignments.log ...") bridgedbProc.send_signal(signal.SIGHUP) time.sleep(5) try: @@ -105,6 +107,7 @@ class BridgeDBCliTest(unittest.TestCase): bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode)) raise e + print("Sending SIGUSR1, checking for bucket files...") bridgedbProc.send_signal(signal.SIGUSR1) time.sleep(5) buckets = [['email', False], ['https', False], ['unallocated', False]] @@ -121,6 +124,7 @@ class BridgeDBCliTest(unittest.TestCase): bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode)) raise e + print("Done. Killing processes.") bridgedbProc.send_signal(signal.SIGINT) bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode))

1 0

[bridgedb/develop] Rewrite database lock acquisition function
by isis＠torproject.org 01 Apr '14

01 Apr '14

commit bd05227c5eefc528b72d57d53ac3f139fc2f0d5e Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 21 04:54:48 2014 +0000 Rewrite database lock acquisition function Restrict access to the database handle when multiple threads request the ability to query. thanks to yawning --- lib/bridgedb/Storage.py | 114 ++++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index d9d8b29..72c0af2 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -506,9 +506,20 @@ def openOrConvertDatabase(sqlite_file, db_file): return conn class DBGeneratorContextManager(GeneratorContextManager): - """Overload __exit__() so we can call the generator many times""" + """Helper for @contextmanager decorator. + + Overload __exit__() so we can call the generator many times + """ def __exit__(self, type, value, traceback): - """Significantly based on contextlib.py""" + """Handle exiting a with statement block + + Progress generator or throw exception + + Significantly based on contextlib.py + + :throws: `RuntimeError` if the generator doesn't stop after + exception is thrown + """ if type is None: try: self.gen.next() @@ -538,7 +549,12 @@ class DBGeneratorContextManager(GeneratorContextManager): # if sys.exc_info()[1] is not value: raise + def contextmanager(func): + """Decorator to for :func:`Storage.getDB()` + + Define getDB() for use by with statement content manager + """ @wraps(func) def helper(*args, **kwds): return DBGeneratorContextManager(func(*args, **kwds)) @@ -546,23 +562,36 @@ def contextmanager(func): _DB_FNAME = None _LOCK = None -_LOCKED = False +_LOCKED = 0 _OPENED_DB = None -_TOC = None +_REFCOUNT = 0 def clearGlobalDB(): - """Start from scratch""" + """Start from scratch + + This is currently only used in unit tests. + """ global _DB_FNAME global _LOCK global _LOCKED global _OPENED_DB - global _TOC _DB_FNAME = None _LOCK = None - _LOCKED = False + _LOCKED = 0 _OPENED_DB = None - _TOC = None + _REFCOUNT = 0 + +def initializeDBLock(): + """Create the lock + + This must be called before the first database query + """ + global _LOCK + + if not _LOCK: + _LOCK = threading.RLock() + assert _LOCK def checkAndConvertDB(sqlite_file, db_file): openOrConvertDatabase(sqlite_file, db_file).close() @@ -582,7 +611,8 @@ def getDB(block=True): create a new instance, blocking until the existing connection is closed, if applicable. - Note: This is a blocking call, be careful about deadlocks! + Note: This is a blocking call (by default), be careful about + deadlocks! :rtype: :class:`bridgedb.Storage.Database` :returns: An instance of :class:`bridgedb.Storage.Database` used to @@ -592,60 +622,32 @@ def getDB(block=True): global _LOCK global _LOCKED global _OPENED_DB - global _TOC + global _REFCOUNT - refcount = 0 - - if not _LOCK: - _LOCK = threading.RLock() - this_thread = threading.current_thread().ident + assert _LOCK + try: + own_lock = _LOCK.acquire(block) + if own_lock: + _LOCKED += 1 - #print "_DB_FNAME: %s, _LOCK: %s, _LOCKED: %s, _OPENED_DB: %s, _TOC: %s" % \ - # (_DB_FNAME, _LOCK, _LOCKED, _OPENED_DB, _TOC) + if not _OPENED_DB: + assert _REFCOUNT == 0 + _OPENED_DB = Database(_DB_FNAME) - try: - if _TOC == this_thread: - refcount += 1 - #print "yielding db from earlier" - logging.debug("Refcount: %d" % refcount) + _REFCOUNT += 1 yield _OPENED_DB - logging.debug("Checking lock status") - logging.debug("lock _LOCKED: %s" % _LOCKED) - locked = _LOCK.acquire(False) - logging.debug("lock aquired: %s" % locked) - if locked: _LOCK.release() - if _LOCK.acquire(block): - db = Database(_DB_FNAME) - assert not _LOCKED - _LOCKED = True - _OPENED_DB = db - _TOC = this_thread - refcount += 1 - #print "yielding db of type: %s" % type(db) - #print "_DB_FNAME: %s, _LOCK: %s, _LOCKED: %s, _OPENED_DB: %s, _TOC: %s" % \ - # (_DB_FNAME, _LOCK, _LOCKED, _OPENED_DB, _TOC) - logging.debug("yielding db") - yield db else: - #print "yielding False" yield False finally: - logging.debug("Refcount is %d in finally" % refcount) - if refcount == 1: - #assert _LOCKED - _LOCK.release() - assert _LOCK.acquire() + assert own_lock + try: + _REFCOUNT -= 1 + if _REFCOUNT == 0: + _OPENED_DB.close() + _OPENED_DB = None + finally: + _LOCKED -= 1 _LOCK.release() - _LOCKED = False - _OPENED_DB = None - _TOC = None - db.close() - logging.debug("Refcount resulted in closed") - else: - refcount -= 1 - -def closeDB(): - next(getDB(), None) def dbIsLocked(): - return _LOCKED + return _LOCKED != 0

1 0

[bridgedb/develop] Bump leekspin to v0.1.3
by isis＠torproject.org 01 Apr '14

01 Apr '14

commit 6ce6bcc999882535169aaaa68797d31f3be2c0d7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 27 03:10:05 2014 +0000 Bump leekspin to v0.1.3 --- .travis.yml | 2 +- CHANGELOG | 3 +++ setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5553a81..7aef0ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ python: install: - pip install -r requirements.txt - - pip install --no-use-wheel leekspin==0.1.1 coverage==3.7 coveralls==0.3 sure==1.2.2 + - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7 coveralls==0.3 sure==1.2.2 - make install script: diff --git a/CHANGELOG b/CHANGELOG index 0498e4f..4f36267 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,9 @@ Changes in version 0.1.7 - significantly increased the availability of bridgedb, as a result. +And includes the following general changes: + * BUMPS leekspin version to 0.1.3 + Changes in version 0.1.6 - 2014-03-26 BridgeDB 0.1.6 includes fixes for the following bugs: * FIXES #11196 BridgeDB should use leekspin diff --git a/setup.py b/setup.py index d859f87..d77bc1d 100644 --- a/setup.py +++ b/setup.py @@ -277,7 +277,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7", - "leekspin==0.1.1"]}, + "leekspin==0.1.3"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/develop] Only update distributor's hashring if it's still active
by isis＠torproject.org 01 Apr '14

01 Apr '14

commit a79d154de5db6293321f6c68835e8f4ff25032d8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 28 00:15:16 2014 +0000 Only update distributor's hashring if it's still active TODO: shutdown the distributor in this situation --- lib/bridgedb/Main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index a28b75f..1f7e52d 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -609,8 +609,10 @@ def startup(options): state.save() if inThread: - reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) - reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) + if ipDistributorTmp: + reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) + if emailDistributorTmp: + reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) else: # We're still starting up. Return these distributors so # they are configured in the outer-namespace

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014