Unverified Commit 2d86ae0c authored by Philipp Winter's avatar Philipp Winter
Browse files

Merge branch 'release-0.7.1'

parents a0644df6 6e7523ba

CHANGELOG

+12 −1
Original line number Diff line number Diff line 
Changes in version 0.6.X - YYYY-MM-DD

Changes in version 0.7.1 - 2019-06-07



        * FIXES #28496 https://bugs.torproject.org/28496

        Remove Yahoo from the list of allowed email domains.  Yahoo allows you

        to create up to 500 disposable email addresses, which BridgeDB

        interprets as unique:

        https://bugs.torproject.org/28496#comment:8

        We could address this issue in BridgeDB but at this point we seem better

        off dropping support for Yahoo because the provider likely also fell

        behind in Sybil protection.



Changes in version 0.7.0 - 2019-06-07



        * FIXES #28655 https://bugs.torproject.org/28655

        When a bridge supports an active probing-resistant transport, it should

README.rst

+3 −4
Original line number Diff line number Diff line
@@ -401,10 +401,9 @@ Accessing the Email User Interface 
----------------------------------



Any mail sent to the ``EMAIL_PORT`` with a destination username as defined by

the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``,

e.g. bridges@...) and sent from an ``@riseup.net``, ``@gmail.com``, or

``@yahoo.com`` address (by default, but configurable with the

``EMAIL_DOMAINS`` option).

the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``, e.g.

bridges@...) and sent from an ``@riseup.net`` or ``@gmail.com`` address (by

default, but configurable with the ``EMAIL_DOMAINS`` option).



You can email our BridgeDB instance `here <mailto:bridges@torproject.org>`__.

bridgedb.conf

+1 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ EMAIL_SMTP_PORT = 25 
EMAIL_USERNAME = "bridges"



# Canonical versions of domains that we will reply to.

EMAIL_DOMAINS = ["gmail.com", "yahoo.com", "riseup.net"]

EMAIL_DOMAINS = ["gmail.com", "riseup.net"]



# Map from unofficial domain to canonical domain.

EMAIL_DOMAIN_MAP = {
@@ -582,7 +582,6 @@ EMAIL_DOMAIN_MAP = { 
# Note that unrecognized options are ignored; be sure to spell them right!

EMAIL_DOMAIN_RULES = {

    'gmail.com': ["ignore_dots", "dkim"],

    'yahoo.com': ["dkim"],

    'riseup.net': ["ignore_dots", "dkim"],

}

bridgedb/distributors/https/templates/base.html

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)} 
              ${_(strings.OTHER_DISTRIBUTORS[1]) % \

                 ("""<a href="mailto:bridges@torproject.org">bridges@torproject.org</a>""",

                  """<a href="https://riseup.net/">Riseup</a>""",

                  """<a href="https://mail.google.com/">Gmail</a>""",

                  """<a href="https://mail.yahoo.com/">Yahoo</a>""")}

                  """<a href="https://mail.google.com/">Gmail</a>""")}

            </p>



            <h4>${_(strings.HELP[0])}</h4>

bridgedb/strings.py

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ OTHER_DISTRIBUTORS = { 
    1: _("""\

Another way to get bridges is to send an email to %s. Please note that you must

send the email using an address from one of the following email providers:

%s, %s or %s."""),

%s or %s."""),

}



HELP = {