Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional debug info for the backups alpha.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-07-03 10:09:03 -04:00
committed by Alex Hart
parent 869b5aa3d5
commit dc8e93a9d3
13 changed files with 252 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
View File

@@ -75,7 +75,7 @@ object Scrubber {
private val CALL_LINK_PATTERN = Pattern.compile("([bBcCdDfFgGhHkKmMnNpPqQrRsStTxXzZ]{4})(-[bBcCdDfFgGhHkKmMnNpPqQrRsStTxXzZ]{4}){7}")
private const val CALL_LINK_CENSOR_SUFFIX = "-XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XXXX"
private val CALL_LINK_ROOM_ID_PATTERN = Pattern.compile("[0-9a-f]{61}([0-9a-f]{3})")
private val CALL_LINK_ROOM_ID_PATTERN = Pattern.compile("([^/])([0-9a-f]{61})([0-9a-f]{3})")
@JvmStatic
@Volatile
@@ -180,7 +180,7 @@ object Scrubber {
private fun CharSequence.scrubDomains(): CharSequence {
return scrub(this, DOMAIN_PATTERN) { matcher, output ->
val match: String = matcher.group(0)!!
if (matcher.groupCount() == 2 && TOP_100_TLDS.contains(matcher.group(2)!!.lowercase()) && !match.endsWith("signal.org")) {
if (matcher.groupCount() == 2 && TOP_100_TLDS.contains(matcher.group(2)!!.lowercase()) && !match.endsWith("signal.org") && !match.endsWith("debuglogs.org")) {
output
.append(DOMAIN_CENSOR)
.append(matcher.group(2))
@@ -209,10 +209,10 @@ object Scrubber {
private fun CharSequence.scrubCallLinkRoomIds(): CharSequence {
return scrub(this, CALL_LINK_ROOM_ID_PATTERN) { matcher, output ->
val match = matcher.group(1)
output
.append("[REDACTED]")
.append(match)
.append(matcher.group(1))
.append("*************************************************************")
.append(matcher.group(3))
}
}

12
core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
View File

@@ -206,6 +206,14 @@ class ScrubberTest(private val input: String, private val expected: String) {
"Not a Call Link Root Key (Missing Quartet) BCAF-FGHK-MNPQ-RSTX-ZRQH-BCDF-STXZ",
"Not a Call Link Root Key (Missing Quartet) BCAF-FGHK-MNPQ-RSTX-ZRQH-BCDF-STXZ"
),
arrayOf(
"A Call Link Room ID 905db82618b907f9ceaf8f12cb65f061ffc187f7df747cb3f38d5281f7c686be",
"A Call Link Room ID *************************************************************6be"
),
arrayOf(
"Not a Call Link Room ID 905db82618b907f9ceaf8f12cb65f061ffc187f7df747cb3f38d5281f7c686b",
"Not a Call Link Room ID 905db82618b907f9ceaf8f12cb65f061ffc187f7df747cb3f38d5281f7c686b"
),
arrayOf(
"2345:0425:2CA1:0000:0000:0567:5673:23b5",
"...ipv6..."
@@ -241,6 +249,10 @@ class ScrubberTest(private val input: String, private val expected: String) {
arrayOf(
"Recipient::123",
"Recipient::123"
),
arrayOf(
"https://debuglogs.org/android/7.47.2/2b5ccf4e3e58e44f12b3c92cfd5b526a2432f1dd0f81c8f89dededb176f1122d",
"https://debuglogs.org/android/7.47.2/2b5ccf4e3e58e44f12b3c92cfd5b526a2432f1dd0f81c8f89dededb176f1122d"
)
)
}