[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [bridgedb] branch main updated: Distribute webtunnel bridges over HTTPS
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main
in repository bridgedb.
The following commit(s) were added to refs/heads/main by this push:
new 92093e5 Distribute webtunnel bridges over HTTPS
92093e5 is described below
commit 92093e51fa94f402b48eef26660c10259570d2e4
Author: meskio <meskio@xxxxxxxxxxxxxx>
AuthorDate: Thu Mar 30 17:58:37 2023 +0200
Distribute webtunnel bridges over HTTPS
---
bridgedb.conf | 3 ++-
bridgedb/filters.py | 2 +-
bridgedb/rdsys.py | 2 +-
frontend/templates/advanced-options.html | 1 +
frontend/templates/options.html | 1 +
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bridgedb.conf b/bridgedb.conf
index 829ff76..d83e267 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -290,6 +290,7 @@ SUPPORTED_TRANSPORTS = {
'obfs2': False,
'obfs3': False,
'obfs4': True,
+ 'webtunnel': True,
'scramblesuit': False,
'fte': False,
}
@@ -300,7 +301,7 @@ SUPPORTED_TRANSPORTS = {
# others. Here's why: If we have a bridge that supports both obfs3 and obfs4,
# we don't want to hand out its obfs3 line to users because this may get the
# bridge probed and its IP address blocked, which also blocks the obfs4 PT.
-PROBING_RESISTANT_TRANSPORTS = ['scramblesuit', 'obfs4']
+PROBING_RESISTANT_TRANSPORTS = ['scramblesuit', 'obfs4', 'webtunnel']
# DEFAULT_TRANSPORT is a string. It should be the PT methodname of the
# transport which is selected by default (e.g. in the webserver dropdown
diff --git a/bridgedb/filters.py b/bridgedb/filters.py
index 3ea0723..1c98115 100644
--- a/bridgedb/filters.py
+++ b/bridgedb/filters.py
@@ -160,7 +160,7 @@ def byProbingResistance(methodname=None, ipVersion=None):
return False
if bridge.hasProbingResistantPT():
- return methodname in ('scramblesuit', 'obfs4')
+ return methodname in ('scramblesuit', 'obfs4', 'webtunnel')
return True
setattr(_byProbingResistance, "description", "probing_resistance")
diff --git a/bridgedb/rdsys.py b/bridgedb/rdsys.py
index 58c0c8d..9834efb 100644
--- a/bridgedb/rdsys.py
+++ b/bridgedb/rdsys.py
@@ -95,7 +95,7 @@ def start_stream(distributor, token, rdsys_address, hashring):
)
body = {
"request_origin": distributor,
- "resource_types": ["obfs4", "vanilla"],
+ "resource_types": ["obfs4", "webtunnel", "vanilla"],
}
agent = Agent(reactor)
diff --git a/frontend/templates/advanced-options.html b/frontend/templates/advanced-options.html
index 23e84af..050181d 100644
--- a/frontend/templates/advanced-options.html
+++ b/frontend/templates/advanced-options.html
@@ -16,6 +16,7 @@
<select id="advanced-options-transport" name="transport" accesskey="t" data-toggle="dropdown" class="form-control">
<option value="0">none</option>
<option value="obfs4" selected>obfs4</option>
+ <option value="webtunnel">webtunnel</option>
</select>
</div>
<div>
diff --git a/frontend/templates/options.html b/frontend/templates/options.html
index 5f0b0d9..e1f53f6 100644
--- a/frontend/templates/options.html
+++ b/frontend/templates/options.html
@@ -9,6 +9,7 @@
<select id="bridgedb-advanced-options-transport" name="transport" accesskey="t" data-toggle="dropdown" class="form-control">
<option value="0">none</option>
<option value="obfs4" selected>obfs4</option>
+ <option value="webtunnel">webtunnel</option>
</select>
</div>
<div>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits