Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Add AMP cache broker for Snowflake.

Browse Source
This commit is contained in:
akwizgran
2022-10-15 17:56:46 +01:00
parent 718d95f3d5
commit 50538b6908
3 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java
View File

@@ -21,6 +21,9 @@ import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeTy
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4;
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.SNOWFLAKE;
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.VANILLA;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.AMP_CACHE;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.AZURE;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.FASTLY;
import static org.briarproject.nullsafety.NullSafety.requireNonNull; import static org.briarproject.nullsafety.NullSafety.requireNonNull;
@Immutable @Immutable
@@ -42,6 +45,20 @@ class CircumventionProviderImpl implements CircumventionProvider {
private static final Set<String> DPI_COUNTRIES = private static final Set<String> DPI_COUNTRIES =
new HashSet<>(asList(DPI_BRIDGES)); new HashSet<>(asList(DPI_BRIDGES));
// Package access for testing
enum SnowflakeBroker {
FASTLY('F'),
AZURE('A'),
AMP_CACHE('M');
private final char value;
SnowflakeBroker(char value) {
this.value = value;
}
}
@Inject @Inject
CircumventionProviderImpl() { CircumventionProviderImpl() {
} }
@@ -86,7 +103,17 @@ class CircumventionProviderImpl implements CircumventionProvider {
(type == MEEK && line.startsWith("m "))) { (type == MEEK && line.startsWith("m "))) {
bridges.add(line.substring(2)); bridges.add(line.substring(2));
} else if (type == SNOWFLAKE && line.startsWith("s ")) { } else if (type == SNOWFLAKE && line.startsWith("s ")) {
String params = getSnowflakeParams(countryCode, letsEncrypt); String params;
// If the client can verify Let's Encrypt certificates then
// use the Fastly broker, otherwise use Azure
if (letsEncrypt) {
params = getSnowflakeParams(countryCode, FASTLY);
} else {
params = getSnowflakeParams(countryCode, AZURE);
}
bridges.add(line.substring(2) + " " + params);
// Also use the AMP cache broker
params = getSnowflakeParams(countryCode, AMP_CACHE);
bridges.add(line.substring(2) + " " + params); bridges.add(line.substring(2) + " " + params);
} }
} }
@@ -95,15 +122,14 @@ class CircumventionProviderImpl implements CircumventionProvider {
} }
// Package access for testing // Package access for testing
@SuppressWarnings("WeakerAccess") String getSnowflakeParams(String countryCode, SnowflakeBroker broker) {
String getSnowflakeParams(String countryCode, boolean letsEncrypt) {
Map<String, String> params = loadSnowflakeParams(); Map<String, String> params = loadSnowflakeParams();
if (countryCode.isEmpty()) countryCode = DEFAULT_COUNTRY_CODE; if (countryCode.isEmpty()) countryCode = DEFAULT_COUNTRY_CODE;
// If we have parameters for this country code, return them // If we have parameters for this country code, return them
String value = params.get(makeKey(countryCode, letsEncrypt)); String value = params.get(makeKey(countryCode, broker));
if (value != null) return value; if (value != null) return value;
// Return the default parameters // Return the default parameters
value = params.get(makeKey(DEFAULT_COUNTRY_CODE, letsEncrypt)); value = params.get(makeKey(DEFAULT_COUNTRY_CODE, broker));
return requireNonNull(value); return requireNonNull(value);
} }
@@ -115,7 +141,7 @@ class CircumventionProviderImpl implements CircumventionProvider {
while (scanner.hasNextLine()) { while (scanner.hasNextLine()) {
String line = scanner.nextLine(); String line = scanner.nextLine();
if (line.length() < 5) continue; if (line.length() < 5) continue;
String key = line.substring(0, 4); // Country code, space, digit String key = line.substring(0, 4); // Country code, space, broker
String value = line.substring(5); String value = line.substring(5);
params.put(key, value); params.put(key, value);
} }
@@ -123,7 +149,7 @@ class CircumventionProviderImpl implements CircumventionProvider {
return params; return params;
} }
private String makeKey(String countryCode, boolean letsEncrypt) { private String makeKey(String countryCode, SnowflakeBroker broker) {
return countryCode + " " + (letsEncrypt ? "1" : "0"); return countryCode + " " + broker.value;
} }
} }

10
bramble-core/src/main/resources/snowflake-params
View File

@@ -1,4 +1,6 @@
ZZ 1 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 ZZ F url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478
ZZ 0 url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 ZZ A url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478
TM 1 url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:206.53.159.130:3479,stun:176.119.42.11:3479,stun:94.23.17.185:3479,stun:217.74.179.29:3479,stun:83.125.8.47:3479,stun:23.253.102.137:3479,stun:52.26.251.34:3479,stun:52.26.251.34:3479,stun:18.191.223.12:3479,stun:154.73.34.8:3479,stun:185.125.180.70:3479,stun:195.35.115.37:3479 ZZ M url=https://snowflake-broker.torproject.net/ ampcache=https://cdn.ampproject.org/ front=cdn.ampproject.org ice=stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478
TM 0 url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:206.53.159.130:3479,stun:176.119.42.11:3479,stun:94.23.17.185:3479,stun:217.74.179.29:3479,stun:83.125.8.47:3479,stun:23.253.102.137:3479,stun:52.26.251.34:3479,stun:52.26.251.34:3479,stun:18.191.223.12:3479,stun:154.73.34.8:3479,stun:185.125.180.70:3479,stun:195.35.115.37:3479 TM F url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:206.53.159.130:3479,stun:176.119.42.11:3479,stun:94.23.17.185:3479,stun:217.74.179.29:3479,stun:83.125.8.47:3479,stun:23.253.102.137:3479,stun:52.26.251.34:3479,stun:52.26.251.34:3479,stun:18.191.223.12:3479,stun:154.73.34.8:3479,stun:185.125.180.70:3479,stun:195.35.115.37:3479
TM A url=https://snowflake-broker.azureedge.net/ front=ajax.aspnetcdn.com ice=stun:206.53.159.130:3479,stun:176.119.42.11:3479,stun:94.23.17.185:3479,stun:217.74.179.29:3479,stun:83.125.8.47:3479,stun:23.253.102.137:3479,stun:52.26.251.34:3479,stun:52.26.251.34:3479,stun:18.191.223.12:3479,stun:154.73.34.8:3479,stun:185.125.180.70:3479,stun:195.35.115.37:3479
TM M url=https://snowflake-broker.torproject.net/ ampcache=https://cdn.ampproject.org/ front=cdn.ampproject.org ice=stun:206.53.159.130:3479,stun:176.119.42.11:3479,stun:94.23.17.185:3479,stun:217.74.179.29:3479,stun:83.125.8.47:3479,stun:23.253.102.137:3479,stun:52.26.251.34:3479,stun:52.26.251.34:3479,stun:18.191.223.12:3479,stun:154.73.34.8:3479,stun:185.125.180.70:3479,stun:195.35.115.37:3479

23
bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImplTest.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.bramble.plugin.tor; package org.briarproject.bramble.plugin.tor;
import org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker;
import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.BrambleTestCase;
import org.junit.Test; import org.junit.Test;
@@ -17,6 +18,9 @@ import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeTy
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DEFAULT_BRIDGES; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DEFAULT_BRIDGES;
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DPI_BRIDGES; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.DPI_BRIDGES;
import static org.briarproject.bramble.plugin.tor.CircumventionProvider.NON_DEFAULT_BRIDGES; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.NON_DEFAULT_BRIDGES;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.AMP_CACHE;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.AZURE;
import static org.briarproject.bramble.plugin.tor.CircumventionProviderImpl.SnowflakeBroker.FASTLY;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
@@ -67,18 +71,23 @@ public class CircumventionProviderImplTest extends BrambleTestCase {
} }
@Test @Test
public void testHasSnowflakeParamsWithLetsEncrypt() { public void testHasSnowflakeParamsForFastly() {
testHasSnowflakeParams(true); testHasSnowflakeParams(FASTLY);
} }
@Test @Test
public void testHasSnowflakeParamsWithoutLetsEncrypt() { public void testHasSnowflakeParamsForAzure() {
testHasSnowflakeParams(false); testHasSnowflakeParams(AZURE);
} }
private void testHasSnowflakeParams(boolean letsEncrypt) { @Test
String tmParams = provider.getSnowflakeParams("TM", letsEncrypt); public void testHasSnowflakeParamsForAmpCache() {
String defaultParams = provider.getSnowflakeParams("ZZ", letsEncrypt); testHasSnowflakeParams(AMP_CACHE);
}
private void testHasSnowflakeParams(SnowflakeBroker broker) {
String tmParams = provider.getSnowflakeParams("TM", broker);
String defaultParams = provider.getSnowflakeParams("ZZ", broker);
assertFalse(tmParams.isEmpty()); assertFalse(tmParams.isEmpty());
assertFalse(defaultParams.isEmpty()); assertFalse(defaultParams.isEmpty());
assertNotEquals(defaultParams, tmParams); assertNotEquals(defaultParams, tmParams);