Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WgQuickBackend: Always pass the full path to wg-quick

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-18 04:10:13 -06:00
parent 8dde6c3c0f
commit 23535c0577
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
View File

@ -43,29 +43,18 @@ public final class WgQuickBackend implements Backend {
public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception { public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
if (tunnel.getState() == State.UP) { if (tunnel.getState() == State.UP) {
// Restart the tunnel to apply the new config. // Restart the tunnel to apply the new config.
setState(tunnel, State.DOWN); setStateInternal(tunnel, tunnel.getConfig(), State.DOWN);
try { try {
bringUpTunnel(tunnel, config); setStateInternal(tunnel, config, State.UP);
} catch (final Exception e) { } catch (final Exception e) {
// The new configuration didn't work, so try to go back to the old one. // The new configuration didn't work, so try to go back to the old one.
bringUpTunnel(tunnel, tunnel.getConfig()); setStateInternal(tunnel, tunnel.getConfig(), State.UP);
throw e; throw e;
} }
} }
return config; return config;
} }
private int bringUpTunnel(final Tunnel tunnel, final Config config) throws Exception {
final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
try (FileOutputStream stream = new FileOutputStream(tempFile, false)) {
stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
}
final int result = rootShell.run(null, "wg-quick up '" + tempFile.getAbsolutePath() + '\'');
if (!tempFile.delete())
Log.w(TAG, "Couldn't delete temporary file after bringing up " + tunnel.getName());
return result;
}
@Override @Override
public Set<String> enumerate() { public Set<String> enumerate() {
final List<String> output = new ArrayList<>(); final List<String> output = new ArrayList<>();
@ -103,16 +92,28 @@ public final class WgQuickBackend implements Backend {
throw new ModuleNotLoadedException("WireGuard module not loaded"); throw new ModuleNotLoadedException("WireGuard module not loaded");
Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state); Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
toolsInstaller.ensureToolsAvailable(); toolsInstaller.ensureToolsAvailable();
final int result; setStateInternal(tunnel, tunnel.getConfig(), state);
if (state == State.UP)
result = bringUpTunnel(tunnel, tunnel.getConfig());
else
result = rootShell.run(null, "wg-quick down '" + tunnel.getName() + '\'');
if (result != 0)
throw new Exception("Unable to configure tunnel");
return getState(tunnel); return getState(tunnel);
} }
private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
throws Exception {
final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
final int result;
if (state == State.UP) {
try (FileOutputStream stream = new FileOutputStream(tempFile, false)) {
stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
}
result = rootShell.run(null, "wg-quick up '" + tempFile.getAbsolutePath() + '\'');
} else {
result = rootShell.run(null, "wg-quick down '" + tempFile.getAbsolutePath() + '\'');
if (result == 0 && !tempFile.delete())
Log.w(TAG, "Couldn't delete temp config after bringing down " + tunnel.getName());
}
if (result != 0)
throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')');
}
public static class ModuleNotLoadedException extends Exception { public static class ModuleNotLoadedException extends Exception {
public ModuleNotLoadedException(final String message, final Throwable cause) { public ModuleNotLoadedException(final String message, final Throwable cause) {
super(message, cause); super(message, cause);