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

[bridgedb/master] Merge branch 'defect/17548' into develop
by phw＠torproject.org 27 May '20

27 May '20

commit 4cdd6a61d01ae6d7c755e870acd8a7eb139d22e7 Merge: 208b49c b366bb4 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Apr 15 09:34:59 2020 -0700 Merge branch 'defect/17548' into develop .gnupg/TESTING.pub | Bin 4622 -> 0 bytes .gnupg/TESTING.subkeys.sec | Bin 7212 -> 0 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ---------- .gnupg/bridgedb-online-key.pub.asc | 100 --------- .gnupg/gpg.conf | 96 --------- .gnupg/pubring.gpg | Bin 4634 -> 0 bytes .gnupg/secring.gpg | Bin 7224 -> 0 bytes .travis.requirements.txt | 1 - CHANGELOG | 6 + README.rst | 29 +-- bridgedb.conf | 45 ---- bridgedb/configure.py | 3 +- bridgedb/crypto.py | 99 +-------- bridgedb/distributors/email/autoresponder.py | 41 +--- bridgedb/distributors/email/distributor.py | 6 +- bridgedb/distributors/email/request.py | 22 -- bridgedb/distributors/email/server.py | 10 - bridgedb/distributors/email/templates.py | 7 - bridgedb/distributors/https/server.py | 2 - bridgedb/distributors/https/templates/base.html | 2 - bridgedb/i18n/templates/bridgedb.pot | 84 ++++---- bridgedb/strings.py | 268 +----------------------- bridgedb/test/email_helpers.py | 23 +- bridgedb/test/test_crypto.py | 137 ------------ bridgedb/test/test_email_autoresponder.py | 15 -- bridgedb/test/test_email_request.py | 36 +--- bridgedb/test/test_email_templates.py | 11 - bridgedb/test/test_main.py | 5 - requirements.txt | 1 - scripts/setup-tests | 2 +- 30 files changed, 63 insertions(+), 1101 deletions(-)

1 0

[bridgedb/master] Add review feedback
by phw＠torproject.org 27 May '20

27 May '20

commit 85b4a9cfe41308458b29356b1d771b192b4a7681 Author: hiro <hiro(a)torproject.org> Date: Wed Dec 11 17:31:17 2019 +0100 Add review feedback --- scripts/check_status | 91 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/scripts/check_status b/scripts/check_status index 8f8f3e5..5032e33 100644 --- a/scripts/check_status +++ b/scripts/check_status @@ -82,7 +82,6 @@ def send_email_from_gmail(password): try: mail = smtplib.SMTP_SSL('smtp.gmail.com', 465) - mail.ehlo() mail.login(sent_from, password) mail.sendmail(sent_from, sent_to, email_text) mail.close() @@ -90,48 +89,48 @@ def send_email_from_gmail(password): except Exception as e: return UNKNOWN, str(e) - if __name__ == "__main__": - status, message = None, None - - if len(sys.argv) == 2: - password = sys.argv[1] - else: - password = "yourPassword" - - status_file = open(STATUS_FILE, 'r') - message = status_file.read() - status_file.close() - - try: - status, message = send_email_from_gmail(password) - except Exception as e: - status = UNKNOWN - message = repr(e) - status_file = open(STATUS_FILE,'w') - status_file.write("UNKNOWN\n3: %s" % message) - status_file.close() - - time.sleep(600) - - try: - status, message = test_email_from_gmail(password) - except KeyboardInterrupt: - status, message = CRITICAL, "Caught Control-C..." - except Exception as e: - status = CRITICAL - message = repr(e) - finally: - status_file = open(STATUS_FILE,'w') - if status == OK: - status_file.write("OK\n0: %s" % message) - elif status == WARNING: - status_file.write("WARNING\n1: %s" % message) - elif status == CRITICAL: - status_file.write("CRITICAL\n2: %s" % message) - else: - status_file.write("UNKNOWN\n3: %s" % message) - status = UNKNOWN - - status_file.close() - - sys.exit(status) +if __name__ == "__main__": + status, message = None, None + + if len(sys.argv) == 2: + password = sys.argv[1] + else: + password = "yourPassword" + + status_file = open(STATUS_FILE, 'r') + message = status_file.read() + status_file.close() + + try: + status, message = send_email_from_gmail(password) + except Exception as e: + status = UNKNOWN + message = repr(e) + status_file = open(STATUS_FILE,'w') + status_file.write("UNKNOWN\n3: %s" % message) + status_file.close() + + time.sleep(600) + + try: + status, message = test_email_from_gmail(password) + except KeyboardInterrupt: + status, message = CRITICAL, "Caught Control-C..." + except Exception as e: + status = CRITICAL + message = repr(e) + finally: + status_file = open(STATUS_FILE,'w') + if status == OK: + status_file.write("OK\n0: %s" % message) + elif status == WARNING: + status_file.write("WARNING\n1: %s" % message) + elif status == CRITICAL: + status_file.write("CRITICAL\n2: %s" % message) + else: + status_file.write("UNKNOWN\n3: %s" % message) + status = UNKNOWN + + status_file.close() + + sys.exit(status)

1 0

[bridgedb/master] Add CHANGELOG entry.
by phw＠torproject.org 27 May '20

27 May '20

commit 6e191f82b1451525b547c28f439180c4b7d25a4a Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Mar 23 17:31:52 2020 -0700 Add CHANGELOG entry. --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7524344..7a7a524 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ + * FIXES https://bugs.torproject.org/12802 + Add a script that sends a bridge request over email, and then checks if + it received a response from BridgeDB. We use this script as part of + our nagios setup, so we notice when our autoresponder breaks. + * FIXES https://bugs.torproject.org/17548 This patch removes PGP support. BridgeDB's signing key expired on 2015-09-11. Nobody ever complained and maintaining the bits and pieces

1 0

[bridgedb/master] Add more review feedback
by phw＠torproject.org 27 May '20

27 May '20

commit 0e5f3fef90090aba33e73702598bf4c4793bb0b1 Author: hiro <hiro(a)torproject.org> Date: Wed Dec 11 18:17:12 2019 +0100 Add more review feedback --- scripts/check_status | 89 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/scripts/check_status b/scripts/check_status index 5032e33..1784e6b 100644 --- a/scripts/check_status +++ b/scripts/check_status @@ -25,7 +25,7 @@ SMTP_PORT = 993 MESSAGE_FROM = "bridges(a)torproject.org" MESSAGE_SUBJECT = "Bridges" -MESSAGE_BODY = ":443" +MESSAGE_BODY = "Here are your bridges:" STATUS_FILE = "/srv/bridgedb.torproject.org/check/status" @@ -36,41 +36,54 @@ STATUS_FILE = "/srv/bridgedb.torproject.org/check/status" # ------------------------------------------------ def test_email_from_gmail(password): + mail = imaplib.IMAP4_SSL(SMTP_SERVER) try: - mail = imaplib.IMAP4_SSL(SMTP_SERVER) mail.login(FROM_EMAIL, password) - mail.select('INBOX') + except Exception as e: + return WARNING, str(e) + + mail.select('INBOX') + + _, data = mail.search(None, 'ALL') + mail_ids = data[0] + + id_list = mail_ids.split() + + status, message = check_email(id_list) + + return status, message + + +def check_email(id_list): + first_email_id = int(str(id_list[0], 'utf-8')) + latest_email_id = int(str(id_list[-1], 'utf-8')) - type, data = mail.search(None, 'ALL') - mail_ids = data[0] + for i in range(int(latest_email_id), int(first_email_id), -1): + _, data = mail.fetch(str(i), '(RFC822)') - id_list = mail_ids.split() - first_email_id = int(str(id_list[0], 'utf-8')) - latest_email_id = int(str(id_list[-1], 'utf-8')) - for i in range(int(latest_email_id), int(first_email_id), -1): - typ, data = mail.fetch(str(i), '(RFC822)') + # The variable data contains the full email object fetched by imaplib + # https://docs.python.org/3/library/imaplib.html#imaplib.IMAP4.fetch + # We are only interested in the response part containing the email envelope. - for response_part in data: - if isinstance(response_part, tuple): - m = str(response_part[1], 'utf-8') - msg = email.message_from_string(m) - email_subject = "{}".format(msg['subject']) - email_from = "{}".format(msg['from']) - email_body = "{}".format(msg.as_string()) + for response_part in data: + if isinstance(response_part, tuple): + m = str(response_part[1], 'utf-8') + msg = email.message_from_string(m) + email_subject = "{}".format(msg['subject']) + email_from = "{}".format(msg['from']) + email_body = "{}".format(msg.as_string()) - if (MESSAGE_FROM == email_from) and (MESSAGE_SUBJECT == email_subject) and (MESSAGE_BODY in email_body): - mail.store(str(i), '+FLAGS', '\\Deleted') - mail.close() - return OK, "Bridgedb is good and sending emails with working bridges" - else: - mail.store(str(i), '+FLAGS', '\\Deleted') + if (MESSAGE_FROM == email_from) and (MESSAGE_SUBJECT == email_subject) and (MESSAGE_BODY in email_body): + mail.store(str(i), '+FLAGS', '\\Deleted') + mail.close() + return OK, "Bridgedb is good and sending emails with working bridges" + else: + mail.store(str(i), '+FLAGS', '\\Deleted') mail.close() return WARNING, "No emails from gettor found" - except Exception as e: - return CRITICAL, str(e) def send_email_from_gmail(password): sent_from = FROM_EMAIL @@ -95,11 +108,18 @@ if __name__ == "__main__": if len(sys.argv) == 2: password = sys.argv[1] else: - password = "yourPassword" + return UNKNOWN, "Empty email password" - status_file = open(STATUS_FILE, 'r') - message = status_file.read() - status_file.close() + try: + status_file = open(STATUS_FILE, 'r') + message = status_file.read() + status_file.close() + except OSError: + status = UNKNOWN + message = "Status file has been created {}".format(STATUS_FILE) + status_file = open(STATUS_FILE,'w') + status_file.write("UNKNOWN\n3: %s" % message) + status_file.close() try: status, message = send_email_from_gmail(password) @@ -120,16 +140,9 @@ if __name__ == "__main__": status = CRITICAL message = repr(e) finally: + d = {0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN"} status_file = open(STATUS_FILE,'w') - if status == OK: - status_file.write("OK\n0: %s" % message) - elif status == WARNING: - status_file.write("WARNING\n1: %s" % message) - elif status == CRITICAL: - status_file.write("CRITICAL\n2: %s" % message) - else: - status_file.write("UNKNOWN\n3: %s" % message) - status = UNKNOWN + status_file.write("{}\n{}: {}" % (d[status], status, message)) status_file.close()

1 0

[bridgedb/master] Fix typos in comment.
by phw＠torproject.org 27 May '20

27 May '20

commit b718662658589c4baaecef7c87aa5c589ed5fb3b Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Apr 21 11:11:15 2020 -0700 Fix typos in comment. --- bridgedb/distributors/https/request.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bridgedb/distributors/https/request.py b/bridgedb/distributors/https/request.py index 3236bee..0add358 100644 --- a/bridgedb/distributors/https/request.py +++ b/bridgedb/distributors/https/request.py @@ -92,9 +92,8 @@ class HTTPSBridgeRequest(bridgerequest.BridgeRequestBase): :api:`request <twisted.web.http.Request>` ``unblocked=`` HTTP GET parameter will be added to the :data:`notBlockedIn` list. - If :data:`addClientCountryCode` is ``True``, the the client's own - geolocated country code will be added to the to the - :data`notBlockedIn` list. + If :data:`addClientCountryCode` is ``True``, then the client's own + geolocated country code will be added to the :data`notBlockedIn` list. :type request: :api:`twisted.web.http.Request` :param request: A ``Request`` object containing the HTTP method, full

1 0

[bridgedb/master] Rename email check script and add information on how to run it
by phw＠torproject.org 27 May '20

27 May '20

commit ae07c0950be2ededc2c81b80137a63d85e68130d Author: hiro <hiro(a)torproject.org> Date: Wed Jan 22 17:44:36 2020 +0100 Rename email check script and add information on how to run it --- scripts/{check_status => nagios_email_check} | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/check_status b/scripts/nagios_email_check similarity index 91% rename from scripts/check_status rename to scripts/nagios_email_check index 1784e6b..767d055 100644 --- a/scripts/check_status +++ b/scripts/nagios_email_check @@ -3,10 +3,23 @@ # # This file is part of BridgeDB, a Tor bridge distribution system. # +# This scripts send an email to bridgedb requesting a bridge and check if the +# service reply with a valid bridge. A status file is written in path specified +# by STATUS_FILE. +# +# The STATUS_FILE is read by nagios that will send an alert whenever bridgedb +# will not send a valid email response. +# +# Run via crontab +# Ex: */10 * * * * <path_to_bridgedb>/scripts/nagios_email_check $(cat <path_to_email_key/gmail.key) +# # :authors: hiro <hiro(a)torproject.org> # see also AUTHORS file # # :license: This is Free Software. See LICENSE for license information. +# +# + import sys import smtplib

1 0

[bridgedb/master] Refactor script.
by phw＠torproject.org 27 May '20

27 May '20

commit 91af6c1bbad6a71663372642c5b6531cd197e806 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 10:59:14 2020 -0800 Refactor script. --- scripts/nagios-email-check | 191 +++++++++++++++++++++++++++++++++++++++++++++ scripts/nagios_email_check | 162 -------------------------------------- 2 files changed, 191 insertions(+), 162 deletions(-) diff --git a/scripts/nagios-email-check b/scripts/nagios-email-check new file mode 100755 index 0000000..7287646 --- /dev/null +++ b/scripts/nagios-email-check @@ -0,0 +1,191 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# This script sends an email request for bridges to BridgeDB and then checks if +# it got a response. The result is written to STATUS_FILE, which is consumed +# by Nagios. Whenever BridgeDB fails to respond with bridges, we will get a +# Nagios alert. +# +# Run this script via crontab every three hours as follows: +# 0 */3 * * * path/to/nagios-email-check $(cat path/to/gmail.key) + + +import sys +import smtplib +import time +import imaplib +import email +import email.utils + +# Standard Nagios return codes +OK, WARNING, CRITICAL, UNKNOWN = range(4) + +FROM_EMAIL = "testbridgestorbrowser(a)gmail.com" +TO_EMAIL = "bridges(a)torproject.org" +SMTP_SERVER = "imap.gmail.com" +SMTP_PORT = 993 + +MESSAGE_FROM = TO_EMAIL +MESSAGE_BODY = "Here are your bridges:" + +STATUS_FILE = "/srv/bridges.torproject.org/check/status" + +# This will contain our test email's message ID. We later make sure that this +# message ID is referenced in the In-Reply-To header of BridgeDB's response. +MESSAGE_ID = None + + +def log(*args, **kwargs): + """ + Generic log function. + """ + + print("[+]", *args, file=sys.stderr, **kwargs) + + +def get_email_response(password): + """ + Open our Gmail inbox and see if we got a response. + """ + + log("Checking for email response.") + mail = imaplib.IMAP4_SSL(SMTP_SERVER) + try: + mail.login(FROM_EMAIL, password) + except Exception as e: + return WARNING, str(e) + + mail.select("INBOX") + + _, data = mail.search(None, "ALL") + email_ids = data[0].split() + if len(email_ids) == 0: + log("Found no response.") + return CRITICAL, "No emails from BridgeDB found" + + return check_email(mail, email_ids) + + +def check_email(mail, email_ids): + """ + Check if we got our expected email response. + """ + + log("Checking {:,} emails.".format(len(email_ids))) + for email_id in email_ids: + _, data = mail.fetch(email_id, "(RFC822)") + + # The variable `data` contains the full email object fetched by imaplib + # <https://docs.python.org/3/library/imaplib.html#imaplib.IMAP4.fetch> + # We are only interested in the response part containing the email + # envelope. + for response_part in data: + if isinstance(response_part, tuple): + m = str(response_part[1], "utf-8") + msg = email.message_from_string(m) + email_from = "{}".format(msg["From"]) + email_body = "{}".format(msg.as_string()) + email_reply_to = "{}".format(msg["In-Reply-To"]) + + if (MESSAGE_FROM == email_from) and \ + (MESSAGE_BODY in email_body) and \ + (MESSAGE_ID == email_reply_to): + mail.store(email_id, '+X-GM-LABELS', '\\Trash') + mail.expunge() + mail.close() + mail.logout() + log("Found correct response (referencing {})." + .format(MESSAGE_ID)) + return OK, "BridgeDB's email responder works" + else: + mail.store(email_id, '+X-GM-LABELS', '\\Trash') + mail.expunge() + mail.close() + mail.logout() + log("Found no response.") + return WARNING, "No emails from BridgeDB found" + + +def send_email_request(password): + """ + Attempt to send a bridge request over Gmail. + """ + + subject = "Bridges" + body = "get bridges" + + log("Sending email.") + global MESSAGE_ID + MESSAGE_ID = email.utils.make_msgid(idstring="test-bridgedb", + domain="gmail.com") + email_text = "From: %s\r\nTo: %s\r\nMessage-ID: %s\r\nSubject: %s\r\n" \ + "\r\n%s" % (FROM_EMAIL, TO_EMAIL, MESSAGE_ID, subject, body) + + try: + mail = smtplib.SMTP_SSL("smtp.gmail.com", 465) + mail.login(FROM_EMAIL, password) + mail.sendmail(FROM_EMAIL, TO_EMAIL, email_text) + mail.close() + log("Email successfully sent (message ID: %s)." % MESSAGE_ID) + return OK, "Sent email bridge request" + except Exception as e: + log("Error while sending email: %s" % err) + return UNKNOWN, str(e) + + +def write_status_file(status, message): + """ + Write the given `status` and `message` to our Nagios status file. + """ + + codes = { + 0: "OK", + 1: "WARNING", + 2: "CRITICAL", + 3: "UNKNOWN" + } + code = codes.get(status, UNKNOWN) + + with open(STATUS_FILE, "w") as fd: + fd.write("{}\n{}: {}".format(code, status, message)) + log("Wrote status='%s', message='%s' to status file." % (status, message)) + + +if __name__ == "__main__": + status, message = None, None + + # Our Gmail password should be in sys.argv[1]. + + if len(sys.argv) == 2: + password = sys.argv[1] + else: + log("No email password provided.") + write_status_file(UNKNOWN, "No email password provided") + sys.exit(1) + + # Send an email request to BridgeDB. + + try: + status, message = send_email_request(password) + except Exception as e: + write_status_file(UNKNOWN, repr(e)) + sys.exit(1) + + wait_time = 60 + log("Waiting %d seconds for a response." % wait_time) + time.sleep(wait_time) + + # Check if we've received an email response. + + try: + status, message = get_email_response(password) + except KeyboardInterrupt: + status, message = CRITICAL, "Caught Control-C..." + except Exception as e: + status = CRITICAL + message = repr(e) + finally: + write_status_file(status, message) + sys.exit(status) diff --git a/scripts/nagios_email_check b/scripts/nagios_email_check deleted file mode 100644 index 767d055..0000000 --- a/scripts/nagios_email_check +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# This scripts send an email to bridgedb requesting a bridge and check if the -# service reply with a valid bridge. A status file is written in path specified -# by STATUS_FILE. -# -# The STATUS_FILE is read by nagios that will send an alert whenever bridgedb -# will not send a valid email response. -# -# Run via crontab -# Ex: */10 * * * * <path_to_bridgedb>/scripts/nagios_email_check $(cat <path_to_email_key/gmail.key) -# -# :authors: hiro <hiro(a)torproject.org> -# see also AUTHORS file -# -# :license: This is Free Software. See LICENSE for license information. -# -# - - -import sys -import smtplib -import time -import imaplib -import email -import time - -# Standard Nagios return codes -OK, WARNING, CRITICAL, UNKNOWN = range(4) - -ORG_EMAIL = "@gmail.com" -FROM_EMAIL = "test.bridges.browser" + ORG_EMAIL -SMTP_SERVER = "imap.gmail.com" -SMTP_PORT = 993 - -MESSAGE_FROM = "bridges(a)torproject.org" -MESSAGE_SUBJECT = "Bridges" -MESSAGE_BODY = "Here are your bridges:" - -STATUS_FILE = "/srv/bridgedb.torproject.org/check/status" - -# ------------------------------------------------- -# -# Utility to read email from Gmail Using Python -# -# ------------------------------------------------ - -def test_email_from_gmail(password): - mail = imaplib.IMAP4_SSL(SMTP_SERVER) - try: - mail.login(FROM_EMAIL, password) - except Exception as e: - return WARNING, str(e) - - mail.select('INBOX') - - _, data = mail.search(None, 'ALL') - mail_ids = data[0] - - id_list = mail_ids.split() - - status, message = check_email(id_list) - - return status, message - - -def check_email(id_list): - first_email_id = int(str(id_list[0], 'utf-8')) - latest_email_id = int(str(id_list[-1], 'utf-8')) - - for i in range(int(latest_email_id), int(first_email_id), -1): - _, data = mail.fetch(str(i), '(RFC822)') - - - # The variable data contains the full email object fetched by imaplib - # https://docs.python.org/3/library/imaplib.html#imaplib.IMAP4.fetch - # We are only interested in the response part containing the email envelope. - - for response_part in data: - if isinstance(response_part, tuple): - m = str(response_part[1], 'utf-8') - msg = email.message_from_string(m) - email_subject = "{}".format(msg['subject']) - email_from = "{}".format(msg['from']) - email_body = "{}".format(msg.as_string()) - - if (MESSAGE_FROM == email_from) and (MESSAGE_SUBJECT == email_subject) and (MESSAGE_BODY in email_body): - mail.store(str(i), '+FLAGS', '\\Deleted') - mail.close() - return OK, "Bridgedb is good and sending emails with working bridges" - else: - mail.store(str(i), '+FLAGS', '\\Deleted') - - mail.close() - return WARNING, "No emails from gettor found" - - -def send_email_from_gmail(password): - sent_from = FROM_EMAIL - sent_to = ["{}".format(MESSAGE_FROM)] - subject = 'Bridges' - body = 'get bridges' - - email_text = """From: %s\nTo: %s\nSubject: %s\n\n%s""" % (sent_from, ", ".join(sent_to), subject, body) - - try: - mail = smtplib.SMTP_SSL('smtp.gmail.com', 465) - mail.login(sent_from, password) - mail.sendmail(sent_from, sent_to, email_text) - mail.close() - return OK, "Test email sent" - except Exception as e: - return UNKNOWN, str(e) - -if __name__ == "__main__": - status, message = None, None - - if len(sys.argv) == 2: - password = sys.argv[1] - else: - return UNKNOWN, "Empty email password" - - try: - status_file = open(STATUS_FILE, 'r') - message = status_file.read() - status_file.close() - except OSError: - status = UNKNOWN - message = "Status file has been created {}".format(STATUS_FILE) - status_file = open(STATUS_FILE,'w') - status_file.write("UNKNOWN\n3: %s" % message) - status_file.close() - - try: - status, message = send_email_from_gmail(password) - except Exception as e: - status = UNKNOWN - message = repr(e) - status_file = open(STATUS_FILE,'w') - status_file.write("UNKNOWN\n3: %s" % message) - status_file.close() - - time.sleep(600) - - try: - status, message = test_email_from_gmail(password) - except KeyboardInterrupt: - status, message = CRITICAL, "Caught Control-C..." - except Exception as e: - status = CRITICAL - message = repr(e) - finally: - d = {0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN"} - status_file = open(STATUS_FILE,'w') - status_file.write("{}\n{}: {}" % (d[status], status, message)) - - status_file.close() - - sys.exit(status)

1 0

[bridgedb/master] Allow passing the Gmail key as env variable.
by phw＠torproject.org 27 May '20

27 May '20

commit 74b159e9c2c473f02b629cd4bf7152a363770666 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon May 11 12:13:32 2020 -0700 Allow passing the Gmail key as env variable. --- scripts/nagios-email-check | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/nagios-email-check b/scripts/nagios-email-check index b9fc831..51c63a1 100755 --- a/scripts/nagios-email-check +++ b/scripts/nagios-email-check @@ -10,8 +10,12 @@ # # Run this script via crontab every three hours as follows: # 0 */3 * * * path/to/nagios-email-check $(cat path/to/gmail.key) +# +# You can provide the Gmail key as an argument (as exemplified above) or by +# using the environment variable BRIDGEDB_GMAIL_KEY, e.g.: +# BRIDGEDB_GMAIL_KEY=foo path/to/nagios-email-check $(cat path/to/gmail.key) - +import os import sys import smtplib import time @@ -161,9 +165,15 @@ if __name__ == "__main__": if len(sys.argv) == 2: password = sys.argv[1] else: - log("No email password provided.") - write_status_file(UNKNOWN, "No email password provided") - sys.exit(1) + + # Try to find our password in an environment variable. + + try: + password = os.environ["BRIDGEDB_GMAIL_KEY"] + except KeyError: + log("No email password provided.") + write_status_file(UNKNOWN, "No email password provided") + sys.exit(1) # Send an email request to BridgeDB.

1 0

[bridgedb/master] Add CHANGELOG entry for #31528.
by phw＠torproject.org 27 May '20

27 May '20

commit 77870a9d64d95facd5c3f79e223451640811871b Author: Philipp Winter <phw(a)nymity.ch> Date: Thu May 14 14:20:31 2020 -0700 Add CHANGELOG entry for #31528. --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7a7a524..cfee3f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ + * FIXES https://bugs.torproject.org/31528 + BridgeDB's UI uses a bunch of obscure "chatspeak" references in its UI. + One example is that it responds with "Uh oh, spaghettios!" if there are + currently no bridges available. While funny to some, this is difficult + to translate and shouldn't be part of software that's used by an + international audience. This patch removes such references. + * FIXES https://bugs.torproject.org/12802 Add a script that sends a bridge request over email, and then checks if it received a response from BridgeDB. We use this script as part of

1 0

[bridgedb/master] Merge branch 'enhancement/12802' into develop
by phw＠torproject.org 27 May '20

27 May '20

commit cc3277b7449fc4125c179b99962ef86e1b39b22c Merge: 4cdd6a6 74b159e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon May 11 12:26:49 2020 -0700 Merge branch 'enhancement/12802' into develop CHANGELOG | 5 + bridgedb/distributors/email/server.py | 2 +- bridgedb/distributors/https/request.py | 5 +- scripts/nagios-email-check | 201 +++++++++++++++++++++++++++++++++ 4 files changed, 209 insertions(+), 4 deletions(-)

1 0