commit c3015928d14b7b5fc7acfb4b188a720728bd1d8b
parent d89d7c0f8d2e98982c842935267cb35dfe26d05f
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Sun, 4 Feb 2024 18:58:12 +0100
fix(core): anonymized logs
Diffstat:
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt b/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt
@@ -207,19 +207,26 @@ class LogManager(
fun internalLog(tag: String, logLevel: LogLevel, message: Any?) {
runCatching {
+ val anonymizedMessage = message.toString().let {
+ if (remoteSideContext.config.isInitialized() && anonymizeLogs)
+ it
+ // remove uuids
+ .replace(Regex("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}", RegexOption.MULTILINE), "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")
+ // remove content uris
+ .replace(Regex("content://[a-zA-Z0-9_\\-./]+"), "content://xxx")
+ // remove file names
+ .replace(Regex("[a-zA-Z0-9_\\-./]+\\.[a-zA-Z0-9_\\-./]+"), "xxx.xxx")
+ else it
+ }
val line = LogLine(
logLevel = logLevel,
dateTime = getCurrentDateTime(),
tag = tag,
- message = message.toString().let {
- if (remoteSideContext.config.isInitialized() && anonymizeLogs)
- it.replace(Regex("[0-9a-f]{8}-[0-9a-f]{4}-{3}[0-9a-f]{12}", RegexOption.MULTILINE), "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")
- else it
- }
+ message = anonymizedMessage
)
logFile.appendText("|$line\n", Charsets.UTF_8)
lineAddListener(line)
- Log.println(logLevel.priority, tag, message.toString())
+ Log.println(logLevel.priority, tag, anonymizedMessage)
}.onFailure {
Log.println(Log.ERROR, tag, "Failed to log message: $message")
Log.println(Log.ERROR, tag, it.stackTraceToString())
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/EndToEndEncryption.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/EndToEndEncryption.kt
@@ -83,8 +83,6 @@ class EndToEndEncryption : MessagingRuleFeature(
return
}
- context.log.verbose("created publicKey: ${publicKey.contentToString()}")
-
sendCustomMessage(conversationId, REQUEST_PK_MESSAGE_ID) {
addBuffer(2, publicKey)
}
