diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index a46f037750..ad48f26641 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -222,6 +222,15 @@ object LogRedactor { */ const val RULES_VERSION = 3 + /** + * A private IPv4 address (10/8, 172.16/12, 192.168/16, link-local 169.254/16): the home + * network's layout, e.g. its router as the resolver. Blanked in a shared zip only; public + * server addresses stay. Not part of a longer dotted number (a version like 10.0.19041.1). + */ + private val LAN_IPV4 = Regex( + "(? out.write(redact(line)); out.write("\n") } @@ -230,13 +239,14 @@ object LogRedactor { /** * The last pass for a file going into a shared zip: [redact], then the rules the stores' log * uses too ([SecretScrub]) - URLs without query, fragment and user:password and with any - * token-bearing path segment blanked, token values and Authorization / Cookie headers blanked. - * A line already clean comes out unchanged. + * token-bearing path segment blanked, token values and Authorization / Cookie headers blanked + * - and private IPv4 addresses as ``. A line already clean comes out unchanged. */ fun redactForShare(line: String): String { if (line.isEmpty()) return line return try { - SecretScrub.scrub(redact(line), SecretScrub.Urls.KEEP_PATH, "") + val out = SecretScrub.scrub(redact(line), SecretScrub.Urls.KEEP_PATH, "") + LAN_IPV4.replace(out, "") } catch (t: Throwable) { "" } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index 15e36b8a12..cc0f5ad821 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -181,7 +181,7 @@ object SessionArtifacts { Log.w(TAG, "$dir is not fully scrubbed; it is scrubbed again when shared") return false } - try { + return try { File(dir, SCRUBBED_MARKER).writeText("scrubbed ${now()}\n") val lines = StringBuilder("rules ${LogRedactor.RULES_VERSION}\n") record.files.forEach { (f, s) -> diff --git a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt index 1dea75db49..b1c97962d8 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -133,4 +133,19 @@ class LogRedactorTest { assertEquals(line, LogRedactor.redact(line)) } } + + @Test fun privateAddressesLeaveTheZipPublicOnesStay() { + assertEquals("I/LinuxNetworkLink: resolver: 8.8.8.8", + LogRedactor.redactForShare("I/LinuxNetworkLink: resolver: 192.168.1.1 10.0.0.138 8.8.8.8")) + assertEquals("gateway :53 link lan ", + LogRedactor.redactForShare("gateway 172.16.4.20:53 link 169.254.10.2 lan 172.31.255.254")) + for (line in listOf( + "connecting to CM 162.254.193.47:27017", + "public 172.32.0.1 and 11.0.0.1 and 193.168.1.1", + "Windows 10.0.19041.1 build 10.0.19045", + "Proton 10.0-3, driver 25.1.0.4", + )) assertEquals(line, LogRedactor.redactForShare(line)) + val once = LogRedactor.redactForShare("resolver: 192.168.0.1") + assertEquals(once, LogRedactor.redactForShare(once)) + } } diff --git a/docs/progress-log.md b/docs/progress-log.md index 3056d23c07..23d1529b76 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -58,6 +58,9 @@ the timeline, then lessons and backlog. Companion to the README (what the app *d and it logs one line: `logs: scrubbed N folders under r3`. Test: nine migrated folders carrying `.scrubbed-2`, `.scrubbed-1` or a stale `.scrubbed-r3` all end up scrubbed under r3 after one migration + start pass. +- **LAN addresses in the zip:** private IPv4 addresses (10/8, 172.16/12, 192.168/16, 169.254/16; + e.g. the router in `LinuxNetworkLink: resolver: ...`) become `` in the zip pass; + public server addresses and dotted version numbers stay (`LogRedactorTest`). ## 2026-10-08 - `feat/stores`: GOG, Epic Games and Amazon Games in the launcher (in progress) A new **Stores** section - the three storefronts' libraries and public catalogs, one download