From 26971c902518e709acf7bbd93597764910c1c551 Mon Sep 17 00:00:00 2001 From: ash-iir <254348575+ash-iir@users.noreply.github.com> Date: Thu, 19 Nov 2026 11:37:03 +0000 Subject: [PATCH] companion: only write the consent result inside the app's files dir ConsentActivity is exported so root can start it, which means any app can start it too and pick the result path. Accept only a consent.* file directly in filesDir, which is what the WebUI passes. Fix the README example, which pointed at /data/adb (not writable by the app). Signed-off-by: ash-iir <254348575+ash-iir@users.noreply.github.com> --- companion/README.md | 2 +- .../kotlin/ru/vd171/vdbackup/ConsentActivity.kt | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/companion/README.md b/companion/README.md index cb4a717..dcb5960 100644 --- a/companion/README.md +++ b/companion/README.md @@ -69,7 +69,7 @@ am start-foreground-service \ # 2) first-run consent (VISIBLE Activity, the one unavoidable UI step) am start \ -n ru.vd171.vdbackup/.ConsentActivity \ - -e result /data/adb/vdbackup/drive/consent.json + -e result /data/data/ru.vd171.vdbackup/files/consent.json # user signs in; result JSON: ok=true code=ERR_NONE, or ok=false code=ERR_CONSENT_DENIED ``` diff --git a/companion/app/src/main/kotlin/ru/vd171/vdbackup/ConsentActivity.kt b/companion/app/src/main/kotlin/ru/vd171/vdbackup/ConsentActivity.kt index e83584a..a4ace75 100644 --- a/companion/app/src/main/kotlin/ru/vd171/vdbackup/ConsentActivity.kt +++ b/companion/app/src/main/kotlin/ru/vd171/vdbackup/ConsentActivity.kt @@ -31,6 +31,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInClient import com.google.android.gms.auth.api.signin.GoogleSignInOptions import com.google.android.gms.common.api.ApiException import com.google.android.gms.common.api.Scope +import java.io.File class ConsentActivity : Activity() { @@ -71,13 +72,21 @@ class ConsentActivity : Activity() { } private fun finishWith(ok: Boolean, code: String, msg: String? = null) { - intent.getStringExtra(EXTRA_RESULT)?.let { path -> - CommandResult.write(path, ok, "consent", code, null, msg ?: if (ok) "consent granted" else "consent denied") + resultFile()?.let { f -> + CommandResult.write(f.path, ok, "consent", code, null, msg ?: if (ok) "consent granted" else "consent denied") } setResult(if (ok) RESULT_OK else RESULT_CANCELED) finish() } + // The Activity is exported (root starts it with `am start`), so the result path + // comes from any caller: accept only a consent.* file directly in our files dir. + private fun resultFile(): File? { + val path = intent.getStringExtra(EXTRA_RESULT) ?: return null + val f = runCatching { File(path).canonicalFile }.getOrNull() ?: return null + return f.takeIf { it.parentFile == filesDir.canonicalFile && it.name.startsWith("consent.") } + } + companion object { private const val RC_SIGN_IN = 0x7D1 const val EXTRA_RESULT = "result"