July 2020 - tor-commits - lists.torproject.org

[bridgedb/develop] Remove the --reload command line switch.
by phw＠torproject.org 07 Jul '20

07 Jul '20

commit 2351f8652bb99b908c36957edee1585319ff6fcb Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Jul 2 10:53:28 2020 -0700 Remove the --reload command line switch. This fixes tpo/anti-censorship/bridgedb#40001. --- CHANGELOG | 3 +++ README.rst | 4 ---- bridgedb/parse/options.py | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c712436..0351de7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ + * FIXES https://gitlab.torproject.org/tpo/anti-censorship/bridgedb/-/issues/40001 + Remove the --reload command line switch. It doesn't actually do anything. + * FIXES https://bugs.torproject.org/29184 Add a new configuration option, BLACKLISTED_TOR_VERSIONS, which contains a list of Tor versions. BridgeDB won't hand out bridges whose Tor version diff --git a/README.rst b/README.rst index 1b0a840..51eff40 100644 --- a/README.rst +++ b/README.rst @@ -318,10 +318,6 @@ Reloading Bridges From Their Descriptor Files: When you have new lists of bridges from the Bridge Authority, replace the old files and do:: - bridgedb --reload - -Or just give it a SIGHUP:: - kill -s SIGHUP `cat .../run/bridgedb.pid` diff --git a/bridgedb/parse/options.py b/bridgedb/parse/options.py index c32ada3..83c0984 100644 --- a/bridgedb/parse/options.py +++ b/bridgedb/parse/options.py @@ -290,8 +290,6 @@ class SIGUSR1Options(BaseOptions): class MainOptions(BaseOptions): """Main commandline options parser for BridgeDB.""" - optFlags = [ - ['reload', 'R', 'Reload bridge descriptors into running servers']] subCommands = [ ['mock', None, MockOptions, "Generate a testing environment"], ['SIGHUP', None, SIGHUPOptions,

1 0

[chutney/master] TorNet: Also check oniondesc in isBootstrapped()
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 2b3cee08768b233029ce4db20014f258a5d1e27d Author: c <c(a)chroniko.jp> Date: Sun Apr 5 11:16:04 2020 +0000 TorNet: Also check oniondesc in isBootstrapped() Make isBootstrapped() check return both for getLastBootstrapStatus() and getLastOnionServiceDescStatus() and return true iff both succeed. --- lib/chutney/TorNet.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index db7845e..7838a78 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1214,7 +1214,12 @@ class LocalNodeController(NodeController): """Return true iff the logfile says that this instance is bootstrapped.""" pct, _, _ = self.getLastBootstrapStatus() - return pct == LocalNodeController.SUCCESS_CODE + if pct != LocalNodeController.SUCCESS_CODE: + return False + pct, _, _ = self.getLastOnionServiceDescStatus() + if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE: + return False + return True # There are 7 v3 directory document types, but some networks only use 6, # because they don't have a bridge authority

1 0

[chutney/master] TorNet: clarify getLastOnionServiceDescStatus comment
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 33ca755b757409a3d0caab3489d2492da655fb37 Author: c <c(a)chroniko.jp> Date: Sun May 17 04:05:52 2020 +0000 TorNet: clarify getLastOnionServiceDescStatus comment --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b5eb186..16607c0 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1179,7 +1179,7 @@ class LocalNodeController(NodeController): keyword = LocalNodeController.HSV2_KEYWORD message = m_v2.groups()[0] break - # else + # else check for HSv3 m_v3 = re.search(r'Service ([^\s]+ [^\s]+ descriptor of revision .*)', line) if m_v3:

1 0

[chutney/master] TorNet: Check oniondesc status iff node has onion
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit a0367ccc66d4a47758f7e9fb9463b3a597a24777 Author: c <c(a)chroniko.jp> Date: Thu Apr 9 13:17:18 2020 +0000 TorNet: Check oniondesc status iff node has onion Modify isBootstrapped() only to check onion descriptor status for Tor nodes that declared onion services. This builds off last commit (2b3cee08) which erroneously checked *all* nodes for onion bootstrap status. --- lib/chutney/TorNet.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7838a78..b5eb186 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1214,12 +1214,11 @@ class LocalNodeController(NodeController): """Return true iff the logfile says that this instance is bootstrapped.""" pct, _, _ = self.getLastBootstrapStatus() - if pct != LocalNodeController.SUCCESS_CODE: - return False - pct, _, _ = self.getLastOnionServiceDescStatus() - if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE: - return False - return True + if self.getOnionService(): + return pct == LocalNodeController.SUCCESS_CODE + else: + pct, _, _ = self.getLastOnionServiceDescStatus() + return pct == LocalNodeController.ONIONDESC_PUBLISHED_CODE # There are 7 v3 directory document types, but some networks only use 6, # because they don't have a bridge authority

1 0

[chutney/master] TorNet: get rid of useless assignments
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 7ab564b5c99cdc2e64e696ab1af231bbc05a11ca Author: c <c(a)chroniko.jp> Date: Sun May 17 04:10:26 2020 +0000 TorNet: get rid of useless assignments most_recent_bootstrap_status and most_recent_desc_status are set first thing within the while loop --- lib/chutney/TorNet.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 16607c0..d9b1254 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2266,8 +2266,6 @@ class Network(object): checks_since_last_print = 0 - most_recent_bootstrap_status = [ None ] * len(controllers) - most_recent_desc_status = dict() while True: all_bootstrapped = True most_recent_bootstrap_status = [ ]

1 0

[chutney/master] TorNet: rename getOnionService to isOnionService
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 1111be0e53aeb0ad63a41644cf5690472f4a5838 Author: c <c(a)chroniko.jp> Date: Sun May 17 04:34:13 2020 +0000 TorNet: rename getOnionService to isOnionService Function returns boolean so make its name clearer --- lib/chutney/TorNet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 953d7f5..4bd926f 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -908,7 +908,7 @@ class LocalNodeController(NodeController): """ return self.getDirServer() and not self.getBridge() - def getOnionService(self): + def isOnionService(self): """Is this node an onion service?""" if self._env['tag'].startswith('h'): return 1 @@ -959,7 +959,7 @@ class LocalNodeController(NodeController): Based on whether this node is an onion service. """ - if self.getOnionService(): + if self.isOnionService(): return LocalNodeController.HS_WAIT_FOR_UNCHECKED_DIR_INFO else: return LocalNodeController.NODE_WAIT_FOR_UNCHECKED_DIR_INFO @@ -1221,9 +1221,9 @@ class LocalNodeController(NodeController): """Return true iff the logfile says that this instance is bootstrapped.""" pct, _, _ = self.getLastBootstrapStatus() - if self.getOnionService(): if pct != LocalNodeController.SUCCESS_CODE: return False + if self.isOnionService(): pct, _, _ = self.getLastOnionServiceDescStatus() if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE: return False

1 0

[chutney/master] TorNet: document updateLastOnionServiceDescStatus
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 3635be7b0186cd7ca340a965bae7098237a07e01 Author: c <c(a)chroniko.jp> Date: Thu May 21 07:52:24 2020 +0000 TorNet: document updateLastOnionServiceDescStatus Update updateLastOnionServiceDescStatus and getLastOnionServiceDescStatus docstrings --- lib/chutney/TorNet.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b211fc2..76512ab 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1161,6 +1161,9 @@ class LocalNodeController(NodeController): HSV3_KEYWORD = "hidden service v3" def updateLastOnionServiceDescStatus(self): + """Look through the logs and cache the last onion service + descriptor status received. + """ logfname = self.getLogfile(info=True) if not os.path.exists(logfname): return (LocalNodeController.MISSING_FILE_CODE, @@ -1188,9 +1191,9 @@ class LocalNodeController(NodeController): self.most_recent_oniondesc_status = (percent, keyword, message) def getLastOnionServiceDescStatus(self): - """Look through info-level logs for onion service descriptor uploads - and return a 3-tuple of percentage complete, the hidden service - version, and message. + """Return the last onion descriptor message fetched by + updateLastOnionServiceDescStatus as a 3-tuple of percentage + complete, the hidden service version, and message. """ return self.most_recent_oniondesc_status

1 0

[chutney/master] TorNet: simplify print_bootstrap_status
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 6dd12614944770c11f6a17c00c4abb5e0177d362 Author: c <c(a)chroniko.jp> Date: Sun May 17 04:20:15 2020 +0000 TorNet: simplify print_bootstrap_status In order to simplify code while preserving atomicity of bootstrap status between calls of getBootstrapStatus, introduce a new function, updateBootstrapStatus, which stores last status in the LocalNodeController object. That way, subsequent calls to getBootstrapStatus are guaranteed to be same until next update, and we have fewer lists to create and zip, fewer arguments to pass to print_bootstrap_status, and hopefully easier code to reason about. --- lib/chutney/TorNet.py | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index d9b1254..7d69eed 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -851,6 +851,7 @@ class LocalNodeController(NodeController): def __init__(self, env): NodeController.__init__(self, env) self._env = env + self.most_recent_bootstrap_status = None def getNick(self): """Return the nickname for this node.""" @@ -1189,10 +1190,9 @@ class LocalNodeController(NodeController): break return (percent, keyword, message) - def getLastBootstrapStatus(self): - """Look through the logs and return the last bootstrap message - received as a 3-tuple of percentage complete, keyword - (optional), and message. + def updateLastBootstrapStatus(self): + """Look through the logs and cache the last bootstrap message + received. """ logfname = self.getLogfile() if not os.path.exists(logfname): @@ -1208,7 +1208,14 @@ class LocalNodeController(NodeController): if m: percent, keyword, message = m.groups() percent = int(percent) - return (percent, keyword, message) + self.most_recent_bootstrap_status = (percent, keyword, message) + + def getLastBootstrapStatus(self): + """Return the last bootstrap message fetched by + updateLastBootstrapStatus as a 3-tuple of percentage + complete, keyword (optional), and message. + """ + return self.most_recent_bootstrap_status def isBootstrapped(self): """Return true iff the logfile says that this instance is @@ -2185,7 +2192,6 @@ class Network(object): def print_bootstrap_status(self, controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=None, msg="Bootstrap in progress"): @@ -2198,13 +2204,13 @@ class Network(object): header = "{}{}".format(msg, elapsed_msg) print(header) print("Node status:") - for c, boot_status in zip(controllers, most_recent_bootstrap_status): + for c in controllers: c.check(listRunning=False, listNonRunning=True) nick = c.getNick() nick_set.add(nick) if c.getConsensusAuthority(): cons_auth_nick_set.add(nick) - pct, kwd, bmsg = boot_status + pct, kwd, bmsg = c.getLastBootstrapStatus() # Support older tor versions without bootstrap keywords if not kwd: kwd = "None" @@ -2268,14 +2274,12 @@ class Network(object): while True: all_bootstrapped = True - most_recent_bootstrap_status = [ ] most_recent_desc_status = dict() for c in controllers: nick = c.getNick() - pct, kwd, bmsg = c.getLastBootstrapStatus() - most_recent_bootstrap_status.append((pct, kwd, bmsg)) + c.updateLastBootstrapStatus() - if pct != LocalNodeController.SUCCESS_CODE: + if not c.isBootstrapped(): all_bootstrapped = False desc_status = c.getNodeDirInfoStatus() @@ -2294,7 +2298,6 @@ class Network(object): print("Everything bootstrapped after {} sec" .format(int(elapsed))) self.print_bootstrap_status(controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=elapsed, msg="Bootstrap finished") @@ -2332,7 +2335,6 @@ class Network(object): if now >= next_print_status: if checks_since_last_print <= Network.CHECKS_PER_PRINT/2: self.print_bootstrap_status(controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=elapsed, msg="Internal timing error") @@ -2345,7 +2347,6 @@ class Network(object): return False else: self.print_bootstrap_status(controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=elapsed) next_print_status = (now + @@ -2359,7 +2360,6 @@ class Network(object): checks_since_last_print += 1 if checks_since_last_print >= Network.CHECKS_PER_PRINT*2: self.print_bootstrap_status(controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=elapsed, msg="Internal timing error") @@ -2372,7 +2372,6 @@ class Network(object): return False self.print_bootstrap_status(controllers, - most_recent_bootstrap_status, most_recent_desc_status, elapsed=elapsed, msg="Bootstrap failed")

1 0

[chutney/master] TorNet: add updateLastOnionServiceDescStatus
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit 0216ace00a12125896e0a77fec19adf75416d2f5 Author: c <c(a)chroniko.jp> Date: Sun May 17 04:42:16 2020 +0000 TorNet: add updateLastOnionServiceDescStatus Like updateLastBootstrapStatus this should make the code cleaner --- lib/chutney/TorNet.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 4bd926f..fa268d3 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -851,6 +851,7 @@ class LocalNodeController(NodeController): def __init__(self, env): NodeController.__init__(self, env) self._env = env + self.most_recent_oniondesc_status = None self.most_recent_bootstrap_status = None def getNick(self): @@ -1159,11 +1160,7 @@ class LocalNodeController(NodeController): HSV2_KEYWORD = "hidden service v2" HSV3_KEYWORD = "hidden service v3" - def getLastOnionServiceDescStatus(self): - """Look through info-level logs for onion service descriptor uploads - and return a 3-tuple of percentage complete, the hidden service - version, and message. - """ + def updateLastOnionServiceDescStatus(self): logfname = self.getLogfile(info=True) if not os.path.exists(logfname): return (LocalNodeController.MISSING_FILE_CODE, @@ -1188,7 +1185,14 @@ class LocalNodeController(NodeController): keyword = LocalNodeController.HSV3_KEYWORD message = m_v3.groups()[0] break - return (percent, keyword, message) + self.most_recent_oniondesc_status = (percent, keyword, message) + + def getLastOnionServiceDescStatus(self): + """Look through info-level logs for onion service descriptor uploads + and return a 3-tuple of percentage complete, the hidden service + version, and message. + """ + return self.most_recent_oniondesc_status def updateLastBootstrapStatus(self): """Look through the logs and cache the last bootstrap message

1 0

[chutney/master] TorNet: correct getOnionService logic
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit f0055aa5baae865072ae9e06c8b92460c0ad43f3 Author: c <c(a)chroniko.jp> Date: Sun May 17 04:33:28 2020 +0000 TorNet: correct getOnionService logic Pretty sure I messed up the logic for this function; in any case let's be safe and write it more clearly --- lib/chutney/TorNet.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7d69eed..953d7f5 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1222,10 +1222,12 @@ class LocalNodeController(NodeController): bootstrapped.""" pct, _, _ = self.getLastBootstrapStatus() if self.getOnionService(): - return pct == LocalNodeController.SUCCESS_CODE - else: + if pct != LocalNodeController.SUCCESS_CODE: + return False pct, _, _ = self.getLastOnionServiceDescStatus() - return pct == LocalNodeController.ONIONDESC_PUBLISHED_CODE + if pct != LocalNodeController.ONIONDESC_PUBLISHED_CODE: + return False + return True # There are 7 v3 directory document types, but some networks only use 6, # because they don't have a bridge authority

1 0