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

[bridgedb/master] Fix unhandled exception due to _reloadFn() not taking parameters.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit abaf8ac41a2256e265a767c39e76013d842ebf5f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:04:54 2014 +0000 Fix unhandled exception due to _reloadFn() not taking parameters. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index a46f22f..24a6919 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -325,7 +325,7 @@ def loadProxyList(cfg): f.close() return ipset -def _reloadFn(): +def _reloadFn(*args): """Placeholder callback function for :func:`_handleSIGHUP`.""" return True @@ -459,7 +459,7 @@ def startup(options): state.key = key state.save() - def reload(): + def reload(*args): """Reload settings, proxy lists, and bridges. State should be saved before calling this method, and will be saved

1 0

[bridgedb/master] Add a SIGUSR1 signal handler for dumping bridge assignments.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 1d223ce6cd18b6c4ac71f1803f224f0a84243021 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:05:38 2014 +0000 Add a SIGUSR1 signal handler for dumping bridge assignments. * FIXES #10811 --- lib/bridgedb/Main.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 24a6919..363b787 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -333,6 +333,19 @@ def _handleSIGHUP(*args): """Called when we receive a SIGHUP; invokes _reloadFn.""" reactor.callLater(0, _reloadFn, *args) +def _handleSIGUSR1(*args): + """Handler for SIGUSR1. Calls :func:`~bridgedb.runner.doDumpBridges`.""" + logging.debug("Caught SIGUSR1 signal") + + from bridgedb import runner + + logging.info("Loading saved state...") + state = persistent.load() + cfg = loadConfig(state.CONFIG_FILE, state.config) + + logging.info("Dumping bridge assignments to files...") + reactor.callLater(0, runner.doDumpBridges, cfg) + class ProxyCategory: def __init__(self): @@ -560,6 +573,7 @@ def startup(options): global _reloadFn _reloadFn = reload signal.signal(signal.SIGHUP, _handleSIGHUP) + signal.signal(signal.SIGUSR1, _handleSIGUSR1) # And actually load it to start parsing. reload()

1 0

[bridgedb/master] Update help text in commandline options menu for using signals.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 9b5c320f162be627720412f0881ffc35fb6f1bb0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:07:16 2014 +0000 Update help text in commandline options menu for using signals. --- lib/bridgedb/Main.py | 3 --- lib/bridgedb/parse/options.py | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 363b787..4ab4d02 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -616,9 +616,6 @@ def runSubcommand(options, config): statuscode = 0 - if options['dump-bridges']: - runner.doDumpBridges(config) - if options.subCommand is not None: logging.debug("Running BridgeDB command: '%s'" % options.subCommand) diff --git a/lib/bridgedb/parse/options.py b/lib/bridgedb/parse/options.py index 323de6d..0285184 100644 --- a/lib/bridgedb/parse/options.py +++ b/lib/bridgedb/parse/options.py @@ -258,6 +258,28 @@ class MockOptions(BaseOptions): (types: netstatus, extrainfo, server)''']] +class SIGHUPOptions(BaseOptions): + """Options menu to explain usage and handling of SIGHUP signals.""" + + longdesc = """If you send a SIGHUP to a running BridgeDB process, the + servers will parse and reload all bridge descriptor files into the + databases. + + Note that this command WILL NOT handle sending the signal for you; see + signal(7) and kill(1) for additional help.""" + + +class SIGUSR1Options(BaseOptions): + """Options menu to explain usage and handling of SIGUSR1 signals.""" + + longdesc = """If you send a SIGUSR1 to a running BridgeDB process, the + servers will dump all bridge assignments by distributor from the + databases to files. + + Note that this command WILL NOT handle sending the signal for you; see + signal(7) and kill(1) for additional help.""" + + class MainOptions(BaseOptions): """Main commandline options parser for BridgeDB.""" @@ -266,4 +288,8 @@ class MainOptions(BaseOptions): ['reload', 'R', 'Reload bridge descriptors into running servers']] subCommands = [ ['test', None, TestOptions, "Run twisted.trial tests or unittests"], - ['mock', None, MockOptions, "Generate a testing environment"]] + ['mock', None, MockOptions, "Generate a testing environment"], + ['SIGHUP', None, SIGHUPOptions, + "Reload bridge descriptors into running servers"], + ['SIGUSR1', None, SIGUSR1Options, + "Dump bridges by hashring assignment into files"]]

1 0

[bridgedb/master] Merge branch 'fix/10811-add-SIGUSR1-handler' into develop
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 5a371d2f242509909bc9c335ac357f84a9b249c1 Merge: 44be20d 9b5c320 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:36:46 2014 +0000 Merge branch 'fix/10811-add-SIGUSR1-handler' into develop lib/bridgedb/Bridges.py | 4 ++-- lib/bridgedb/Bucket.py | 1 + lib/bridgedb/Main.py | 21 ++++++++++++++++----- lib/bridgedb/parse/options.py | 28 +++++++++++++++++++++++++++- 4 files changed, 46 insertions(+), 8 deletions(-)

1 0

[bridgedb/master] Update CHANGELOG with details of 0.1.1 and 0.1.2.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 88569fbfc8797d0a1062ada051cfb61d103d3ec4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:46:08 2014 +0000 Update CHANGELOG with details of 0.1.1 and 0.1.2. --- CHANGELOG | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 27415f9..4ac962b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,24 @@ -Changes in version 0.1.0 - 2014-XXX +Changes in version 0.1.2 - 2014-02-05 +BridgeDB 0.1.2 includes fixes for the following bugs: + * FIXES #10811 BridgeDB's assignments.log files are not being updated + + +Changes in version 0.1.1 - 2014-02-03 BridgeDB 0.1.1 includes fixes for the following bugs: - * FIXES #9127 - * FIXES #10737 + * FIXES #9127 Users can't ask for ipv6 bridges with the new bridgedb + interface + * FIXES #9988 Refactor BridgeDB's use of `sha` module to use `hashlib` + * FIXES #10737 POST arguments to bridges.torproject.org are dropped if + entering a CAPTCHA fails Including the following general changes: * ADDS A general simple error page to display rather than webserver tracebacks. See #6127. + * MOVES The recently added BridgeDB specification file + ('doc/bridge-db-spec.txt') to the torspec repo: + https://gitweb.torproject.org/torspec.git + * FIXES template caching for the web interface. + Changes in version 0.1.0 - 2014-01-14 BridgeDB 0.1.0 includes fixes for the following bugs: @@ -36,6 +49,7 @@ Including the following general changes: * ADD Documentations builds (currently at https://para.noid.cat/bridgedb) + Changes in version 0.0.1 - 2013-08-20 BridgeDB 0.0.1 includes fixes for the following bugs: * FIXES #5332 Update BridgeDB documentation with deployment

1 0

[bridgedb/master] Merge branch 'release-0.1.2'
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 98716427f158158e55c30b78162b320ea27734bf Merge: 3ee91c1 88569fb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:48:31 2014 +0000 Merge branch 'release-0.1.2' CHANGELOG | 20 +++++++++++++++++--- lib/bridgedb/Bridges.py | 4 ++-- lib/bridgedb/Bucket.py | 1 + lib/bridgedb/Main.py | 21 ++++++++++++++++----- lib/bridgedb/parse/options.py | 28 +++++++++++++++++++++++++++- 5 files changed, 63 insertions(+), 11 deletions(-)

1 0

[bridgedb/develop] Fix unhandled exception due to _reloadFn() not taking parameters.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit abaf8ac41a2256e265a767c39e76013d842ebf5f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:04:54 2014 +0000 Fix unhandled exception due to _reloadFn() not taking parameters. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index a46f22f..24a6919 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -325,7 +325,7 @@ def loadProxyList(cfg): f.close() return ipset -def _reloadFn(): +def _reloadFn(*args): """Placeholder callback function for :func:`_handleSIGHUP`.""" return True @@ -459,7 +459,7 @@ def startup(options): state.key = key state.save() - def reload(): + def reload(*args): """Reload settings, proxy lists, and bridges. State should be saved before calling this method, and will be saved

1 0

[bridgedb/develop] Add a SIGUSR1 signal handler for dumping bridge assignments.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 1d223ce6cd18b6c4ac71f1803f224f0a84243021 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:05:38 2014 +0000 Add a SIGUSR1 signal handler for dumping bridge assignments. * FIXES #10811 --- lib/bridgedb/Main.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 24a6919..363b787 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -333,6 +333,19 @@ def _handleSIGHUP(*args): """Called when we receive a SIGHUP; invokes _reloadFn.""" reactor.callLater(0, _reloadFn, *args) +def _handleSIGUSR1(*args): + """Handler for SIGUSR1. Calls :func:`~bridgedb.runner.doDumpBridges`.""" + logging.debug("Caught SIGUSR1 signal") + + from bridgedb import runner + + logging.info("Loading saved state...") + state = persistent.load() + cfg = loadConfig(state.CONFIG_FILE, state.config) + + logging.info("Dumping bridge assignments to files...") + reactor.callLater(0, runner.doDumpBridges, cfg) + class ProxyCategory: def __init__(self): @@ -560,6 +573,7 @@ def startup(options): global _reloadFn _reloadFn = reload signal.signal(signal.SIGHUP, _handleSIGHUP) + signal.signal(signal.SIGUSR1, _handleSIGUSR1) # And actually load it to start parsing. reload()

1 0

[bridgedb/develop] Fix encoding and safety catches for two logs of bridge IDs in Bridges.py.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 2dcdd44e2e7bb8c382290fef861cbcfbd0a8bcb9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:02:27 2014 +0000 Fix encoding and safety catches for two logs of bridge IDs in Bridges.py. --- lib/bridgedb/Bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 2bfa288..6bf4b2e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1134,7 +1134,7 @@ class FilteredBridgeSplitter(BridgeHolder): if not bridge.running: logging.warn( "Skipping hashring insertion for non-running bridge: '%s'" - % bridge.getID()) + % Util.logSafely(bridge.fingerprint)) return self.bridges.append(bridge) @@ -1142,7 +1142,7 @@ class FilteredBridgeSplitter(BridgeHolder): if filterFn(bridge): subring.insert(bridge) logging.debug("Inserted bridge '%s' into '%s' sub hashring" - % (bridge.getID(), ringname)) + % (Util.logSafely(bridge.fingerprint), ringname)) def extractFilterNames(self, ringname): """Get the names of the filters applied to a particular sub hashring.

1 0

[bridgedb/develop] Update help text in commandline options menu for using signals.
by isis＠torproject.org 05 Feb '14

05 Feb '14

commit 9b5c320f162be627720412f0881ffc35fb6f1bb0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 5 22:07:16 2014 +0000 Update help text in commandline options menu for using signals. --- lib/bridgedb/Main.py | 3 --- lib/bridgedb/parse/options.py | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 363b787..4ab4d02 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -616,9 +616,6 @@ def runSubcommand(options, config): statuscode = 0 - if options['dump-bridges']: - runner.doDumpBridges(config) - if options.subCommand is not None: logging.debug("Running BridgeDB command: '%s'" % options.subCommand) diff --git a/lib/bridgedb/parse/options.py b/lib/bridgedb/parse/options.py index 323de6d..0285184 100644 --- a/lib/bridgedb/parse/options.py +++ b/lib/bridgedb/parse/options.py @@ -258,6 +258,28 @@ class MockOptions(BaseOptions): (types: netstatus, extrainfo, server)''']] +class SIGHUPOptions(BaseOptions): + """Options menu to explain usage and handling of SIGHUP signals.""" + + longdesc = """If you send a SIGHUP to a running BridgeDB process, the + servers will parse and reload all bridge descriptor files into the + databases. + + Note that this command WILL NOT handle sending the signal for you; see + signal(7) and kill(1) for additional help.""" + + +class SIGUSR1Options(BaseOptions): + """Options menu to explain usage and handling of SIGUSR1 signals.""" + + longdesc = """If you send a SIGUSR1 to a running BridgeDB process, the + servers will dump all bridge assignments by distributor from the + databases to files. + + Note that this command WILL NOT handle sending the signal for you; see + signal(7) and kill(1) for additional help.""" + + class MainOptions(BaseOptions): """Main commandline options parser for BridgeDB.""" @@ -266,4 +288,8 @@ class MainOptions(BaseOptions): ['reload', 'R', 'Reload bridge descriptors into running servers']] subCommands = [ ['test', None, TestOptions, "Run twisted.trial tests or unittests"], - ['mock', None, MockOptions, "Generate a testing environment"]] + ['mock', None, MockOptions, "Generate a testing environment"], + ['SIGHUP', None, SIGHUPOptions, + "Reload bridge descriptors into running servers"], + ['SIGUSR1', None, SIGUSR1Options, + "Dump bridges by hashring assignment into files"]]

1 0