This is an automated email from the git hooks/post-receive script.
meskio pushed a change to branch main in repository bridgedb.
from d43d0ff Add changelog entry for version 0.15 new 1c5f0a9 Shim-token fixes new fee040a Send the captcha challenge on the https form new f3e9d85 Update dependencies
The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: .test.requirements.txt | 10 +++++----- .travis.requirements.txt | 26 +++++++++++++------------- bridgedb/distributors/moat/distributor.py | 18 +++++++++++------- frontend/templates/captcha.html | 3 ++- 4 files changed, 31 insertions(+), 26 deletions(-)
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit 1c5f0a9a82435f8c6ffb70abcb9cebdfc2985ed5 Author: meskio meskio@torproject.org AuthorDate: Wed Aug 24 12:34:56 2022 +0200
Shim-token fixes
Read all bridges from the dummy file, not only the first one. And use dummy bridges only for requests without valid shim-token. --- bridgedb/distributors/moat/distributor.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/bridgedb/distributors/moat/distributor.py b/bridgedb/distributors/moat/distributor.py index 82a6d3a..c4aeef4 100644 --- a/bridgedb/distributors/moat/distributor.py +++ b/bridgedb/distributors/moat/distributor.py @@ -80,13 +80,17 @@ class MoatDistributor(HTTPSDistributor): """Load dummy bridges from a file """ with open(dummyBridgesFile) as f: - bridge_line = f.readline() - bridge = Bridge() - try: - bridge.updateFromBridgeLine(bridge_line) - except MalformedBridgeInfo as e: - logging.warning("Got a malformed dummy bridge: %s" % e) - self.dummyHashring.insert(bridge) + for bridge_line in f: + bridge_line = bridge_line.strip() + if not bridge_line: + continue + + bridge = Bridge() + try: + bridge.updateFromBridgeLine(bridge_line) + except MalformedBridgeInfo as e: + logging.warning("Got a malformed dummy bridge: %s" % e) + self.dummyHashring.insert(bridge)
def getBridges(self, bridgeRequest, interval, dummyBridges=False): """Return a list of bridges to give to a user.
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit fee040af5acc58897d0dfe4e469223a2e128785c Author: meskio meskio@torproject.org AuthorDate: Wed Aug 24 16:06:28 2022 +0200
Send the captcha challenge on the https form --- frontend/templates/captcha.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontend/templates/captcha.html b/frontend/templates/captcha.html index 5b3b8b3..07a85fd 100644 --- a/frontend/templates/captcha.html +++ b/frontend/templates/captcha.html @@ -11,7 +11,8 @@ {% endif %} </div> <form action="" method="POST" class="d-flex"> - <input type="text" id="bridgedb-captcha-input" class="form-control" placeholder="Enter the characters from the image above..."> + {% raw %}<input type="hidden" name="captcha_challenge_field" value="${challenge_field}">{% endraw %} + <input type="text" id="bridgedb-captcha-input" name="captcha_response_field" class="form-control" placeholder="Enter the characters from the image above..."> <button type="submit" class="btn btn-primary" id="bridgedb-captcha-submit"><span class="fa fa-level-down fa-rotate-90"></span></button> </form> </div>
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit f3e9d854996035dd1d12e547b6e49bf4021a9d5a Author: meskio meskio@torproject.org AuthorDate: Fri Sep 9 12:34:27 2022 +0200
Update dependencies --- .test.requirements.txt | 10 +++++----- .travis.requirements.txt | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.test.requirements.txt b/.test.requirements.txt index a256d50..76b711f 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -5,8 +5,8 @@ # $ pip install -r .test.requirements.txt # $ make coverage # -coverage==5.5 -mechanize==0.4.5 -pycodestyle==2.7.0 -pylint==2.8.2 -sure==1.4.11 +coverage==6.4.4 +mechanize==0.4.8 +pycodestyle==2.9.1 +pylint==2.15.2 +sure==2.0.0 diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 17f8b48..2b71958 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -13,21 +13,21 @@ # $ make coverage # #------------------------------------------------------------------------------ -attrs==21.2.0 -Babel==2.9.1 -beautifulsoup4==4.9.3 -Mako==1.1.4 -pycryptodome==3.10.1 -Twisted==21.2.0 -coverage==5.5 -coveralls==3.0.1 +attrs==22.1.0 +Babel==2.10.3 +beautifulsoup4==4.11.1 +Mako==1.2.2 +pycryptodome==3.15.0 +Twisted==22.8.0 +coverage==6.4.4 +coveralls==3.3.1 ipaddr==2.2.0 -mechanize==0.4.5 -Pillow==8.2.0 -pyOpenSSL==20.0.1 +mechanize==0.4.8 +Pillow==9.2.0 +pyOpenSSL==22.0.0 pygeoip==0.3.2 -qrcode==6.1 +qrcode==7.3.1 service_identity==21.1.0 stem==1.8.0 -sure==1.4.11 +sure==2.0.0 zope.interface==5.4.0
tor-commits@lists.torproject.org
-
gitolite role