diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 68f9b7102..039bbe471 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -43,7 +43,7 @@ configurations { dependencies { implementation project(path: ':bramble-core', configuration: 'default') tor "org.briarproject:tor-android:$tor_version" - tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version@zip" + tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" @@ -70,11 +70,6 @@ clean.dependsOn cleanTorBinaries task unpackTorBinaries { doLast { - copy { - from configurations.tor.collect { zipTree(it) } - into torBinariesDir - include 'geoip.zip' - } configurations.tor.each { outer -> zipTree(outer).each { inner -> if (inner.name.endsWith('_arm_pie.zip')) { diff --git a/bramble-android/src/main/res/raw/.gitkeep b/bramble-android/src/main/res/raw/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 4e15da160..03f6946d1 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -87,8 +87,8 @@ dependencyVerification { 'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e', 'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca', 'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349', - 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82', - 'org.briarproject:tor-android:0.3.5.17:tor-android-0.3.5.17.jar:1888afc10a26b93d00a010ea27bf0b1b162a6d524688b08b98d70d14dc363b54', + 'org.briarproject:obfs4proxy-android:0.0.12:obfs4proxy-android-0.0.12.jar:84159d2a4668abc40e3fccaa1f6fa0c04892863f9eb80a866ac8928d9f9a7e89', + 'org.briarproject:tor-android:0.4.5.12-2:tor-android-0.4.5.12-2.jar:8545dbcef2bb6aa89c32bb6f8ac51f7a64bce3ae85845b3578ffdeb9b206feb9', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.checkerframework:checker-qual:3.5.0:checker-qual-3.5.0.jar:729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4', diff --git a/bramble-api/witness.gradle b/bramble-api/witness.gradle index d901091e4..2b9110cf0 100644 --- a/bramble-api/witness.gradle +++ b/bramble-api/witness.gradle @@ -1,6 +1,7 @@ dependencyVerification { verify = [ 'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db', + 'com.fasterxml.jackson.core:jackson-annotations:2.13.0:jackson-annotations-2.13.0.jar:81f9724d8843e8b08f8f6c0609e7a2b030d00c34861c4ac7e2099a7235047d6f', 'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79', 'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7', 'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb', diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index 6f22e3f4b..6e0cf3155 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -85,7 +85,6 @@ import static org.briarproject.bramble.api.plugin.TorConstants.ID; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_MOBILE; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC; -import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHEN_CHARGING; import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT; @@ -235,7 +234,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { } } // Load the settings - settings = migrateSettings(callback.getSettings()); + settings = callback.getSettings(); // Install or update the assets if necessary if (!assetsAreUpToDate()) installAssets(); if (cookieFile.exists() && !cookieFile.delete()) @@ -331,18 +330,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { bind(); } - // TODO: Remove after a reasonable migration period (added 2020-06-25) - private Settings migrateSettings(Settings settings) { - int network = settings.getInt(PREF_TOR_NETWORK, - DEFAULT_PREF_TOR_NETWORK); - if (network == PREF_TOR_NETWORK_NEVER) { - settings.putInt(PREF_TOR_NETWORK, DEFAULT_PREF_TOR_NETWORK); - settings.putBoolean(PREF_PLUGIN_ENABLE, false); - callback.mergeSettings(settings); - } - return settings; - } - private boolean assetsAreUpToDate() { return doneFile.lastModified() > getLastUpdateTime(); } @@ -352,9 +339,14 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { // The done file may already exist from a previous installation //noinspection ResultOfMethodCallIgnored doneFile.delete(); + // The GeoIP file may exist from a previous installation - we can + // save some space by deleting it. + // TODO: Remove after a reasonable migration period + // (added 2022-03-29) + //noinspection ResultOfMethodCallIgnored + geoIpFile.delete(); installTorExecutable(); installObfs4Executable(); - extract(getGeoIpInputStream(), geoIpFile); extract(getConfigInputStream(), configFile); if (!doneFile.createNewFile()) LOG.warning("Failed to create done file"); @@ -392,14 +384,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { return zin; } - private InputStream getGeoIpInputStream() throws IOException { - InputStream in = resourceProvider.getResourceInputStream("geoip", - ".zip"); - ZipInputStream zin = new ZipInputStream(in); - if (zin.getNextEntry() == null) throw new IOException(); - return zin; - } - private InputStream getObfs4InputStream() throws IOException { InputStream in = resourceProvider .getResourceInputStream("obfs4proxy_" + architecture, ".zip"); diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index 0f27a3e3e..65682ac50 100644 --- a/bramble-java/build.gradle +++ b/bramble-java/build.gradle @@ -17,8 +17,8 @@ dependencies { def jna_version = '4.5.2' implementation "net.java.dev.jna:jna:$jna_version" implementation "net.java.dev.jna:jna-platform:$jna_version" - tor "org.briarproject:tor:$tor_version" - tor "org.briarproject:obfs4proxy:$obfs4proxy_version@zip" + tor "org.briarproject:tor-linux:$tor_version" + tor "org.briarproject:obfs4proxy-linux:$obfs4proxy_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index 55f5a3cc1..b5a29d22b 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -24,8 +24,8 @@ dependencyVerification { 'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0', 'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd', 'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047', - 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766', - 'org.briarproject:tor:0.3.5.17:tor-0.3.5.17.jar:ce0e1f4d8f14878e61b23a35a452bc0f2a8e3117ced5a74773cd78475fa7af39', + 'org.briarproject:obfs4proxy-linux:0.0.12:obfs4proxy-linux-0.0.12.jar:3dd83aff25fe1cb3e4eab78a02c76ac921f552be6877b3af83a472438525df2a', + 'org.briarproject:tor-linux:0.4.5.12-2:tor-linux-0.4.5.12-2.jar:d275f323faf5e70b33d2c8a1bdab1bb3ab5a0d8f4e23c4a6dda03d86f4e95838', 'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d', 'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a', 'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53', diff --git a/build.gradle b/build.gradle index dfb46b7c5..fbb8e8021 100644 --- a/build.gradle +++ b/build.gradle @@ -38,8 +38,8 @@ buildscript { // okhttp 3.12.x is supported until end of 2021, newer versions need minSdk 21 okhttp_version = "3.12.13" jackson_version = "2.13.0" - tor_version = "0.3.5.17" - obfs4proxy_version = "0.0.12-dev-40245c4a" + tor_version = "0.4.5.12-2" + obfs4proxy_version = "0.0.12" junit_version = "4.13.2" jmock_version = '2.12.0' }