From ca9c951a536e9ccd2bf3e8f0e2e0a48992d0d655 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Thu, 2 Jul 2020 13:49:32 +0200 Subject: Fill OTP fields with SMS codes (#900) * Fill OTP fields with SMS codes * Allow SMS OTP fill also for web origins * Introduce free and nonFree build variants * Fix up workflow * Improve layout and feature detection * Workflow changes * Add Changelog entry * github: update release workflow for nonFree/Free split Signed-off-by: Harsh Shandilya * Switch to lifecycleScope * github: make snapshot deploy free variant Signed-off-by: Harsh Shandilya Co-authored-by: Harsh Shandilya --- .github/workflows/deploy_snapshot.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 62 +++++++--- CHANGELOG.md | 1 + app/build.gradle | 11 ++ .../autofill/oreo/ui/AutofillSmsActivity.kt | 28 +++++ app/src/main/AndroidManifest.xml | 5 + .../zeapo/pwdstore/autofill/oreo/AutofillHelper.kt | 9 +- .../pwdstore/autofill/oreo/AutofillScenario.kt | 7 +- .../java/com/zeapo/pwdstore/autofill/oreo/Form.kt | 13 ++ app/src/main/res/drawable/ic_autofill_sms.xml | 10 ++ .../main/res/layout/activity_oreo_autofill_sms.xml | 61 +++++++++ app/src/main/res/values/strings.xml | 2 + .../autofill/oreo/ui/AutofillSmsActivity.kt | 136 +++++++++++++++++++++ dependencies.gradle | 4 + release/deploy-snapshot.sh | 2 +- 16 files changed, 330 insertions(+), 25 deletions(-) create mode 100644 app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt create mode 100644 app/src/main/res/drawable/ic_autofill_sms.xml create mode 100644 app/src/main/res/layout/activity_oreo_autofill_sms.xml create mode 100644 app/src/nonFree/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index e34e41bf..5b3b1cc4 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -51,7 +51,7 @@ jobs: run: ./gradlew dependencies - name: Build release app - run: ./gradlew :app:assembleRelease + run: ./gradlew :app:assembleFreeRelease env: SNAPSHOT: "true" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ccd77e8b..d4326bb0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: api-level: [23, 29] - variant: [Debug, Release] + variant: [freeDebug, freeRelease, nonFreeRelease] steps: - name: Check if relevant files have changed diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b652347..5f03c588 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,20 +50,26 @@ jobs: - name: Download gradle dependencies run: ./gradlew dependencies - - name: Build release APK and bundle - run: ./gradlew :app:assembleRelease :app:bundleRelease + - name: Build release binaries + run: ./gradlew :app:assembleFreeRelease :app:assembleNonFreeRelease :app:bundleNonFreeRelease - - name: Upload release APK + - name: Upload non-free release APK uses: actions/upload-artifact@master with: - name: APS Release APK - path: app/build/outputs/apk/release/app-release.apk + name: APS Non-Free Release APK + path: app/build/outputs/apk/nonFree/release/app-release.apk - - name: Upload release Bundle + - name: Upload non-free release Bundle uses: actions/upload-artifact@master with: - name: APS Release Bundle - path: app/build/outputs/bundle/release/app-release.aab + name: APS Non-Free Release Bundle + path: app/build/outputs/bundle/nonFree/release/app-release.aab + + - name: Upload free release APK + uses: actions/upload-artifact@master + with: + name: APS Free Release APK + path: app/build/outputs/apk/free/release/app-release.apk - name: Clean secrets if: always() @@ -77,17 +83,23 @@ jobs: - name: Checkout uses: actions/checkout@v1 - - name: Get APK + - name: Get Non-Free Release APK uses: actions/download-artifact@v1 with: - name: APS Release APK - path: artifacts + name: APS Non-Free Release APK + path: artifacts/nonFree - - name: Get Bundle + - name: Get Non-Free Bundle uses: actions/download-artifact@v1 with: - name: APS Release Bundle - path: artifacts + name: APS Non-Free Release Bundle + path: artifacts/nonFree + + - name: Get Free Release APK + uses: actions/download-artifact@v1 + with: + name: APS Free Release APK + path: artifacts/free - name: Get Changelog Entry id: changelog_reader @@ -112,22 +124,32 @@ jobs: id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - - name: Upload Release Apk + - name: Upload Non-Free Release Apk uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./artifacts/app-release.apk - asset_name: APS_${{ steps.get_version.outputs.VERSION }}.apk + asset_path: ./artifacts/nonFree/app-release.apk + asset_name: APS-nonFree_${{ steps.get_version.outputs.VERSION }}.apk asset_content_type: application/vnd.android.package-archive - - name: Upload Release Bundle + - name: Upload Non-Free Release Bundle uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./artifacts/app-release.aab - asset_name: APS_${{ steps.get_version.outputs.VERSION }}.aab + asset_path: ./artifacts/nonFree/app-release.aab + asset_name: APS-nonFree_${{ steps.get_version.outputs.VERSION }}.aab asset_content_type: application/octet-stream + + - name: Upload Free Release Apk + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./artifacts/free/app-release.apk + asset_name: APS-free_${{ steps.get_version.outputs.VERSION }}.apk + asset_content_type: application/vnd.android.package-archive diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc258b6..06b60282 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. - TOTP support is reintroduced by popular demand. HOTP continues to be unsupported and heavily discouraged. - Initial support for detecting and filling OTP fields with Autofill +- OTP codes can be automatically filled from SMS (requires Android P+ and Google Play Services) - Importing TOTP secrets using QR codes - Navigate into newly created folders and scroll to newly created passwords diff --git a/app/build.gradle b/app/build.gradle index 4489c0ba..399402cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,6 +68,15 @@ android { buildTypes.release.signingConfig = signingConfigs.release buildTypes.debug.signingConfig = signingConfigs.release } + + flavorDimensions "free" + productFlavors { + free { + versionNameSuffix "-free" + } + nonFree { + } + } } dependencies { @@ -117,6 +126,8 @@ dependencies { debugImplementation deps.third_party.whatthestack } + nonFreeImplementation deps.non_free.google_play_auth_api_phone + // Testing-only dependencies androidTestImplementation deps.testing.junit androidTestImplementation deps.testing.kotlin_test_junit diff --git a/app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt new file mode 100644 index 00000000..f86e5d4c --- /dev/null +++ b/app/src/free/java/com/zeapo/pwdstore/autofill/oreo/ui/AutofillSmsActivity.kt @@ -0,0 +1,28 @@ +/* + * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. + * SPDX-License-Identifier: GPL-3.0-only + */ +package com.zeapo.pwdstore.autofill.oreo.ui + +import android.content.Context +import android.content.IntentSender +import android.os.Build +import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity +import com.zeapo.pwdstore.autofill.oreo.FormOrigin + +@RequiresApi(Build.VERSION_CODES.O) +@Suppress("UNUSED_PARAMETER") +class AutofillSmsActivity : AppCompatActivity() { + + companion object { + + fun shouldOfferFillFromSms(context: Context): Boolean { + return false + } + + fun makeFillOtpFromSmsIntentSender(context: Context): IntentSender { + throw NotImplementedError("Filling OTPs from SMS requires non-free dependencies") + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2098abc9..40bcb481 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -138,6 +138,11 @@ + { AutofillAction.Match -> passwordFieldsToFillOnMatch + listOfNotNull(otp) AutofillAction.Search -> passwordFieldsToFillOnSearch + listOfNotNull(otp) AutofillAction.Generate -> passwordFieldsToFillOnGenerate + AutofillAction.FillOtpFromSms -> listOfNotNull(otp) } return when { + action == AutofillAction.FillOtpFromSms -> { + // When filling from an SMS, we cannot get any data other than the OTP itself. + credentialFieldsToFill + } credentialFieldsToFill.isNotEmpty() -> { // If the current action would fill into any password field, we also fill into the // username field if possible. diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Form.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Form.kt index 210fefab..e4ae1f75 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Form.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/Form.kt @@ -25,6 +25,7 @@ import com.zeapo.pwdstore.autofill.oreo.ui.AutofillDecryptActivity import com.zeapo.pwdstore.autofill.oreo.ui.AutofillFilterView import com.zeapo.pwdstore.autofill.oreo.ui.AutofillPublisherChangedActivity import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSaveActivity +import com.zeapo.pwdstore.autofill.oreo.ui.AutofillSmsActivity import java.io.File /** @@ -285,6 +286,14 @@ class FillableForm private constructor( return makePlaceholderDataset(remoteView, intentSender, AutofillAction.Generate) } + private fun makeFillOtpFromSmsDataset(context: Context): Dataset? { + if (scenario.fieldsToFillOn(AutofillAction.FillOtpFromSms).isEmpty()) return null + if (!AutofillSmsActivity.shouldOfferFillFromSms(context)) return null + val remoteView = makeFillOtpFromSmsRemoteView(context, formOrigin) + val intentSender = AutofillSmsActivity.makeFillOtpFromSmsIntentSender(context) + return makePlaceholderDataset(remoteView, intentSender, AutofillAction.FillOtpFromSms) + } + private fun makePublisherChangedDataset( context: Context, publisherChangedException: AutofillPublisherChangedException @@ -341,6 +350,10 @@ class FillableForm private constructor( hasDataset = true addDataset(it) } + makeFillOtpFromSmsDataset(context)?.let { + hasDataset = true + addDataset(it) + } if (!hasDataset) return null makeSaveInfo()?.let { setSaveInfo(it) } setClientState(clientState) diff --git a/app/src/main/res/drawable/ic_autofill_sms.xml b/app/src/main/res/drawable/ic_autofill_sms.xml new file mode 100644 index 00000000..e58c33c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_autofill_sms.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_oreo_autofill_sms.xml b/app/src/main/res/layout/activity_oreo_autofill_sms.xml new file mode 100644 index 00000000..608727d0 --- /dev/null +++ b/app/src/main/res/layout/activity_oreo_autofill_sms.xml @@ -0,0 +1,61 @@ + + + + + + + + + + +