Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Make BridgeTest more robust by trying each bridge three times.

Browse Source
This commit is contained in:
akwizgran
2022-03-08 22:45:39 +00:00
parent 4198e1f22a
commit 6805040ac4
1 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java
View File

@@ -1,6 +1,7 @@
package org.briarproject.bramble.plugin.tor; package org.briarproject.bramble.plugin.tor;
import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons; import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
import org.briarproject.bramble.api.Multiset;
import org.briarproject.bramble.api.battery.BatteryManager; import org.briarproject.bramble.api.battery.BatteryManager;
import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventBus;
@@ -29,9 +30,9 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.concurrent.GuardedBy;
import javax.inject.Inject; import javax.inject.Inject;
import javax.net.SocketFactory; import javax.net.SocketFactory;
@@ -60,24 +61,28 @@ public class BridgeTest extends BrambleTestCase {
DaggerBrambleJavaIntegrationTestComponent.builder().build(); DaggerBrambleJavaIntegrationTestComponent.builder().build();
BrambleCoreIntegrationTestEagerSingletons.Helper BrambleCoreIntegrationTestEagerSingletons.Helper
.injectEagerSingletons(component); .injectEagerSingletons(component);
// Share a failure counter among all the test instances // Share stats among all the test instances
AtomicInteger failures = new AtomicInteger(0); Stats stats = new Stats();
CircumventionProvider provider = component.getCircumventionProvider(); CircumventionProvider provider = component.getCircumventionProvider();
List<Params> states = new ArrayList<>(); List<Params> states = new ArrayList<>();
for (String bridge : provider.getBridges(DEFAULT_OBFS4)) { for (int i = 0; i < ATTEMPTS_PER_BRIDGE; i++) {
states.add(new Params(bridge, DEFAULT_OBFS4, failures, false)); for (String bridge : provider.getBridges(DEFAULT_OBFS4)) {
} states.add(new Params(bridge, DEFAULT_OBFS4, stats, false));
for (String bridge : provider.getBridges(NON_DEFAULT_OBFS4)) { }
states.add(new Params(bridge, NON_DEFAULT_OBFS4, failures, false)); for (String bridge : provider.getBridges(NON_DEFAULT_OBFS4)) {
} states.add(new Params(bridge, NON_DEFAULT_OBFS4, stats, false));
for (String bridge : provider.getBridges(MEEK)) { }
states.add(new Params(bridge, MEEK, failures, true)); for (String bridge : provider.getBridges(MEEK)) {
states.add(new Params(bridge, MEEK, stats, true));
}
} }
return states; return states;
} }
private final static long TIMEOUT = MINUTES.toMillis(5); private final static long OBFS4_TIMEOUT = MINUTES.toMillis(2);
private final static int NUM_FAILURES_ALLOWED = 1; private final static long MEEK_TIMEOUT = MINUTES.toMillis(5);
private final static int UNREACHABLE_BRIDGES_ALLOWED = 1;
private final static int ATTEMPTS_PER_BRIDGE = 3;
private final static Logger LOG = getLogger(BridgeTest.class.getName()); private final static Logger LOG = getLogger(BridgeTest.class.getName());
@@ -175,18 +180,16 @@ public class BridgeTest extends BrambleTestCase {
try { try {
plugin.start(); plugin.start();
long start = clock.currentTimeMillis(); long start = clock.currentTimeMillis();
while (clock.currentTimeMillis() - start < TIMEOUT) { long timeout = params.bridgeType == MEEK
? MEEK_TIMEOUT : OBFS4_TIMEOUT;
while (clock.currentTimeMillis() - start < timeout) {
if (plugin.getState() == ACTIVE) return; if (plugin.getState() == ACTIVE) return;
clock.sleep(500); clock.sleep(500);
} }
if (plugin.getState() != ACTIVE) { if (plugin.getState() != ACTIVE) {
LOG.warning("Could not connect to Tor within timeout"); LOG.warning("Could not connect to Tor within timeout: "
if (params.failures.incrementAndGet() > NUM_FAILURES_ALLOWED) { + params.bridge);
fail(params.failures.get() + " bridges are unreachable"); params.stats.countFailure(params.bridge, params.essential);
}
if (params.mustSucceed) {
fail("essential bridge is unreachable");
}
} }
} finally { } finally {
plugin.stop(); plugin.stop();
@@ -197,15 +200,39 @@ public class BridgeTest extends BrambleTestCase {
private final String bridge; private final String bridge;
private final BridgeType bridgeType; private final BridgeType bridgeType;
private final AtomicInteger failures; private final Stats stats;
private final boolean mustSucceed; private final boolean essential;
private Params(String bridge, BridgeType bridgeType, private Params(String bridge, BridgeType bridgeType,
AtomicInteger failures, boolean mustSucceed) { Stats stats, boolean essential) {
this.bridge = bridge; this.bridge = bridge;
this.bridgeType = bridgeType; this.bridgeType = bridgeType;
this.failures = failures; this.stats = stats;
this.mustSucceed = mustSucceed; this.essential = essential;
}
}
private static class Stats {
@GuardedBy("this")
private final Multiset<String> failures = new Multiset<>();
@GuardedBy("this")
private final List<String> unreachable = new ArrayList<>();
private synchronized void countFailure(String bridge,
boolean essential) {
if (failures.add(bridge) == ATTEMPTS_PER_BRIDGE) {
LOG.warning("Bridge is unreachable after "
+ ATTEMPTS_PER_BRIDGE + " attempts: " + bridge);
unreachable.add(bridge);
if (unreachable.size() > UNREACHABLE_BRIDGES_ALLOWED) {
fail(unreachable.size() + " bridges are unreachable: "
+ unreachable);
}
if (essential) {
fail("essential bridge is unreachable");
}
}
} }
} }
} }