diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 811206851cbd987d0d0a0646707b0ea06a74d51a..8fb4693ff2585193b0953aa239dcc5dab989193c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,8 @@ default: image: openjdk:8-jdk before_script: + - set -e + # Prepare our Debian environment. - apt-get update -qq - apt-get upgrade -qy @@ -45,6 +47,33 @@ default: # Create local.properties file. - echo "sdk.dir=$PWD" > local.properties + # Fetch tor library build dependencies + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor-onion-proxy-library/0.0.3/android-release.aar + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor-onion-proxy-library/0.0.3/universal-0.0.3.jar + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor-android-service/1.0/jsocksAndroid-release.aar + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor-android-service/1.0/service-release.aar + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor/0.4.4.4-rc/tor_x86.tar.gz + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor/0.4.4.4-rc/tor_x86_64.tar.gz + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor/0.4.4.4-rc/tor_armv7.tar.gz + - wget --quiet https://people.torproject.org/~sysrqb/mirrors/tor/0.4.4.4-rc/tor_aarch64.tar.gz + + - echo "4e2bd087df6128a31c598d297367c106762f539c25d71cc343aae25386e4bee9 android-release.aar" | sha256sum -c + - echo "0082d1d035a0808d03d7e1009398ed2c3e3ea4c51811198f6ff83ccda456036f universal-0.0.3.jar" | sha256sum -c + - echo "3dca44a48fdbd3f6c44f7ea335ae85fe542676d8e48c6438f84a2c852daf4f54 jsocksAndroid-release.aar" | sha256sum -c + - echo "d38967569af56d809f09f08b888962971149411832c3bc2b7b0b64a43ceb0dcd service-release.aar" | sha256sum -c + - echo "0faa344f658d2e38c7cc881f51c1d8658aac56801f7def1b75be72a8d3f90c54 tor_x86.tar.gz" | sha256sum -c + - echo "acf1d403ca12e3302d1150d2b5fba6585aa83d46db16f15ad33fae39645c5b5d tor_x86_64.tar.gz" | sha256sum -c + - echo "132cb40bbc15bd8f72abd15324705ab720f8b316a2fca84baaeb5db37f602c32 tor_armv7.tar.gz" | sha256sum -c + - echo "6c453c5f7566c87d422ef60750cba794d9616e9197114be5dc1194f75b55b04e tor_aarch64.tar.gz" | sha256sum -c + + - mv android-release.aar universal-0.0.3.jar jsocksAndroid-release.aar service-release.aar app/ + + - tar -C app/src/main -xf tor_x86.tar.gz + - tar -C app/src/main -xf tor_x86_64.tar.gz + - tar -C app/src/main -xf tor_armv7.tar.gz + - tar -C app/src/main -xf tor_aarch64.tar.gz + - rm tor_x86.tar.gz tor_x86_64.tar.gz tor_armv7.tar.gz tor_aarch64.tar.gz + stages: - build - buildFenixProduction @@ -55,7 +84,7 @@ stages: buildDebug: stage: build script: - - ./gradlew clean app:assembleDebug --stacktrace + - ./gradlew -PdisableTor=true clean app:assembleDebug --stacktrace # Disable for now. #artifacts: @@ -69,7 +98,7 @@ testLight: # from config/pre-push-recommended.sh # `tee` into a log file because resulting output is larger than 4 MB # (4 MB is max log size) - - ./gradlew ktlint detekt assembleGeckoBetaDebug assembleGeckoBetaDebugAndroidTest testGeckoBetaDebug | tee testLight_gradle.log + - ./gradlew -PdisableTor=true ktlint detekt assembleGeckoBetaDebug assembleGeckoBetaDebugAndroidTest testGeckoBetaDebug | tee testLight_gradle.log artifacts: paths: - testLight_gradle.log @@ -83,25 +112,25 @@ buildFenixProduction: only: - schedules script: - - ./gradlew clean app:assembleFenixProduction --stacktrace + - ./gradlew -PdisableTor=true clean app:assembleFenixProduction --stacktrace buildFennecBeta: stage: buildFennecBeta only: - schedules script: - - ./gradlew clean app:assembleFennecBeta --stacktrace + - ./gradlew -PdisableTor=true clean app:assembleFennecBeta --stacktrace buildFennecProduction: stage: buildFennecProduction only: - schedules script: - - ./gradlew clean app:assembleFennecProduction --stacktrace + - ./gradlew -PdisableTor=true clean app:assembleFennecProduction --stacktrace testAll: stage: test only: - schedules script: - - ./gradlew clean test + - ./gradlew -PdisableTor=true clean test diff --git a/app/build.gradle b/app/build.gradle index 17ea9df2bdee3a194494069bcfe0bcdafdb38eba..9560af3a2822d51b8a590e7e4082fcf3a0d8f8ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -246,12 +246,20 @@ android.applicationVariants.all { variant -> def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false def versionName = Config.releaseVersionName(project) + def disableTor = false + if (project.hasProperty("disableTor")) { + disableTor = project.getProperty("disableTor") + } + println("----------------------------------------------") println("Variant name: " + variant.name) println("Application ID: " + [variant.mergedFlavor.applicationId, variant.buildType.applicationIdSuffix].findAll().join()) println("Build type: " + variant.buildType.name) println("Flavor: " + variant.flavorName) println("Telemetry enabled: " + !isDebugOrDCD) + println("Tor is disabled: " + disableTor) + + buildConfigField "boolean", "DISABLE_TOR", "$disableTor" if (useReleaseVersioning) { // The Google Play Store does not allow multiple APKs for the same app that all have the @@ -553,6 +561,18 @@ dependencies { testImplementation "org.mozilla.telemetry:glean-forUnitTests:${project.ext.glean_version}" lintChecks project(":mozilla-lint-rules") + + // Tor Android Services Dependencies + implementation 'net.freehaven.tor.control:jtorctl:0.2' + implementation 'org.slf4j:slf4j-api:1.7.25' + implementation 'org.slf4j:slf4j-android:1.7.25' + + // Tor Android Services. + implementation files('service-release.aar') + + // Tor Onion Proxy Library. + implementation files('universal-0.0.3.jar') + implementation files('android-release.aar') } if (project.hasProperty("raptor")) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 415156ac3771d436f7b86f446506b3491b342738..1a8ab061ebf53b65a290075faa30fe295f2cffb4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -288,6 +288,13 @@ android:name="androidx.work.impl.WorkManagerInitializer" android:authorities="${applicationId}.workmanager-init" tools:node="remove" /> + + + diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index d7086d254dfef330aa4a20d85b87d90ed9d09c5b..a5b4f9bce9b6aa783025d5935d2f6c64c21dd3c5 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -4,8 +4,10 @@ package org.mozilla.fenix +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.content.IntentFilter import android.os.Build import android.os.Bundle import android.os.StrictMode @@ -23,6 +25,7 @@ import androidx.appcompat.app.ActionBar import androidx.appcompat.widget.Toolbar import androidx.core.view.doOnPreDraw import androidx.lifecycle.lifecycleScope +import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.navigation.NavDestination import androidx.navigation.NavDirections import androidx.navigation.fragment.NavHostFragment @@ -36,6 +39,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.withTimeoutOrNull import mozilla.components.browser.search.SearchEngine import mozilla.components.browser.session.SessionManager import mozilla.components.browser.state.state.SessionState @@ -101,6 +106,9 @@ import org.mozilla.fenix.theme.DefaultThemeManager import org.mozilla.fenix.theme.ThemeManager import org.mozilla.fenix.trackingprotectionexceptions.TrackingProtectionExceptionsFragmentDirections import org.mozilla.fenix.utils.BrowsersCache +import org.torproject.android.service.TorService +import org.torproject.android.service.TorServiceConstants +import org.torproject.android.service.util.Prefs /** * The main activity of the application. The application is primarily a single Activity (this one) @@ -148,6 +156,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private lateinit var navigationToolbar: Toolbar final override fun onCreate(savedInstanceState: Bundle?) { + // Give Orbot the base Context + Prefs.setContext(applicationContext) + StrictModeManager.changeStrictModePolicies(supportFragmentManager) // There is disk read violations on some devices such as samsung and pixel for android 9/10 StrictMode.allowThreadDiskReads().resetPoliciesAfter { @@ -229,8 +240,63 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { components.appAllSourceStartTelemetry.receivedIntentInHomeActivity(safeIntent) } + /** + * Receive the current Tor status. + * + * Send a request for the current status and receive the response. + * Returns true if Tor is running, false otherwise. + * + */ + private suspend fun checkTorIsStarted(): Boolean { + val channel = Channel() + + // Register receiver + val lbm: LocalBroadcastManager = LocalBroadcastManager.getInstance(this@HomeActivity) + val localBroadcastReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + val action = intent.action ?: return + // We only want ACTION_STATUS messages + if (action != TorServiceConstants.ACTION_STATUS) { + return + } + // The current status has the EXTRA_STATUS key + val currentStatus = + intent.getStringExtra(TorServiceConstants.EXTRA_STATUS) + channel.offer(currentStatus === TorServiceConstants.STATUS_ON) + } + } + lbm.registerReceiver( + localBroadcastReceiver, + IntentFilter(TorServiceConstants.ACTION_STATUS) + ) + + // Request service status + val torServiceStatus = Intent(this@HomeActivity, TorService::class.java) + torServiceStatus.action = TorServiceConstants.ACTION_STATUS + startService(torServiceStatus) + + // Wait for response and unregister receiver + var torIsStarted = false + withTimeoutOrNull(timeout) { + torIsStarted = channel.receive() + } + lbm.unregisterReceiver(localBroadcastReceiver) + return torIsStarted + } + @CallSuper override fun onResume() { + if (!BuildConfig.DISABLE_TOR) { + lifecycleScope.launch { + val torNeedsStart = !checkTorIsStarted() + if (torNeedsStart) { + val torServiceStatus = Intent(this@HomeActivity, TorService::class.java) + torServiceStatus.action = TorServiceConstants.ACTION_START + startService(torServiceStatus) + } + } + } + super.onResume() components.backgroundServices.accountManagerAvailableQueue.runIfReadyOrQueue { @@ -281,6 +347,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { override fun onDestroy() { super.onDestroy() privateNotificationObserver?.stop() + + if (BuildConfig.DISABLE_TOR) { + return + } + + val torService = Intent(this, TorService::class.java) + stopService(torService) } /** @@ -711,6 +784,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { const val EXTRA_OPENED_FROM_NOTIFICATION = "notification_open" const val delay = 5000L const val START_IN_RECENTS_SCREEN = "start_in_recents_screen" + const val timeout = 5000L // PWA must have been used within last 30 days to be considered "recently used" for the // telemetry purposes. diff --git a/build.gradle b/build.gradle index 9f00fff0f9daf9af37382eceb8fc47f8aabc0199..f0934608455e6ece8e9b0449059a1154b658641e 100644 --- a/build.gradle +++ b/build.gradle @@ -127,6 +127,11 @@ allprojects { } } } + + // These are needed for Orbot's dependencies. + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url 'https://jitpack.io' } + jcenter() } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {