From ff686d7c3bd38a3b73891f7a93e7f3ba586328e5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 5 Nov 2026 14:16:48 -0500 Subject: [PATCH] fix: expire stale log exports safely --- .../launcher/agent/AgentBridgeProvider.kt | 22 ++++++++++++++++++- tools/droiddeckctl | 13 +++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index 7d16029634..f41b342507 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -25,6 +25,7 @@ import com.droiddeck.launcher.session.SessionState import org.json.JSONArray import org.json.JSONObject import java.io.File +import java.nio.file.Files import java.util.UUID import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -203,11 +204,29 @@ class AgentBridgeProvider : ContentProvider() { private fun logDir(context: Context): File? = SessionState.logDirectory ?: SessionState.logFile?.parentFile ?: SessionPaths.sessionFolders(context).lastOrNull() + private fun cleanupExpiredLogExports(exports: File) { + val now = System.currentTimeMillis() + val canonicalRoot = exports.canonicalFile + exports.listFiles()?.forEach { candidate -> + val isUuid = runCatching { UUID.fromString(candidate.name).toString() == candidate.name }.getOrDefault(false) + if (!isUuid || !candidate.isDirectory || Files.isSymbolicLink(candidate.toPath())) return@forEach + if (candidate.canonicalFile.parentFile != canonicalRoot) return@forEach + if (now - candidate.lastModified() >= LOG_EXPORT_RETENTION_MS) candidate.deleteRecursively() + } + } + // The session folder is app-private, so adb pulls this copy from external files instead. private fun logs(context: Context): JSONObject { val dir = logDir(context)?.takeIf { it.isDirectory } ?: return error("NO_SESSION_LOGS", "No session artifact directory is available") - val output = File(context.getExternalFilesDir(null), "agent-logs/${UUID.randomUUID()}") + val externalFiles = context.getExternalFilesDir(null) + ?: return error("NO_SESSION_LOGS", "External app storage is unavailable") + val exports = File(externalFiles, "agent-logs") + if (!exports.exists() && !exports.mkdirs()) { + return error("NO_SESSION_LOGS", "Could not create the session export directory") + } + cleanupExpiredLogExports(exports) + val output = File(exports, UUID.randomUUID().toString()) val zip = try { SessionLogShare.zipFolder(context, dir, output) } catch (error: Exception) { @@ -373,6 +392,7 @@ class AgentBridgeProvider : ContentProvider() { const val RESULT_JSON = "json" const val EXTRA_REQUEST = "request" const val SCHEMA = 2 + private const val LOG_EXPORT_RETENTION_MS = 24 * 60 * 60 * 1000L private val recoveryComplete = CountDownLatch(1) fun awaitRecovery() { diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 270cb7b807..2279bd12f1 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -476,6 +476,16 @@ def unpack_logs(archive: Path, destination: Path, session_id: str) -> None: backed_up = {} installed = set() manifest_backup = backups / manifest.name + manifest_fd, manifest_path = tempfile.mkstemp( + prefix=".droiddeckctl-managed-logs-", suffix=".tmp", dir=destination + ) + temp_manifest = Path(manifest_path) + try: + with os.fdopen(manifest_fd, "w", encoding="utf-8") as manifest_file: + manifest_file.write(json.dumps(sorted(extracted), indent=2) + "\n") + except Exception: + temp_manifest.unlink(missing_ok=True) + raise try: for name in sorted(previous): target = managed_target(name) @@ -494,10 +504,9 @@ def unpack_logs(archive: Path, destination: Path, session_id: str) -> None: target.parent.mkdir(parents=True, exist_ok=True) os.replace(staged_files / name, target) installed.add(name) - temp_manifest = staged / "managed-logs.json" - temp_manifest.write_text(json.dumps(sorted(extracted), indent=2) + "\n", encoding="utf-8") os.replace(temp_manifest, manifest) except Exception: + temp_manifest.unlink(missing_ok=True) for name in installed: target = managed_target(name) if target is not None and target.is_file():