nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2812 from davotoula/fix/redact-debug-surfaces

Browse Source 
fix: redact secrets and sensitive payloads from debug logs (Quartz/Amethyst)
This commit is contained in:
Vitor Pamplona
2026-05-09 08:53:25 -04:00
committed by GitHub
parent 3a52f74fc6 a947834f31
commit 5fe0a05f29
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
+3 -3
View File
@@ -696,7 +696,7 @@ object LocalPreferences {
JsonMapper.fromJson<TopFilter>(value)
} catch (e: Throwable) {
if (e is CancellationException) throw e
Log.w("LocalPreferences", "Error Decoding TopFilter from Preferences with value $value", e)
Log.w("LocalPreferences", "Error Decoding TopFilter from Preferences", e)
default
}
}
@@ -754,7 +754,7 @@ object LocalPreferences {
}
} catch (e: Throwable) {
if (e is CancellationException) throw e
Log.w("LocalPreferences", "Error Decoding ${T::class.java} from Preferences with value $value", e)
Log.w("LocalPreferences", "Error Decoding ${T::class.simpleName} from Preferences", e)
null
}
}
@@ -767,7 +767,7 @@ object LocalPreferences {
Event.fromJson(value) as T?
} catch (e: Throwable) {
if (e is CancellationException) throw e
Log.w("LocalPreferences", "Error Decoding ${T::class.java} from Preferences with value $value", e)
Log.w("LocalPreferences", "Error Decoding ${T::class.simpleName} from Preferences", e)
null
}
}
amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt
+2 -2
View File
@@ -75,7 +75,7 @@ class AppSpecificState(
settings.syncedSettings.updateFrom(syncedSettings)
} catch (e: Throwable) {
if (e is CancellationException) throw e
Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences with value", e)
Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences", e)
}
}
}
@@ -92,7 +92,7 @@ class AppSpecificState(
settings.updateAppSpecificData(it, syncedSettings)
} catch (e: Throwable) {
if (e is CancellationException) throw e
Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences with value $decrypted", e)
Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences", e)
}
}
} catch (e: Throwable) {
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/EventExt.kt
+2 -2
View File
@@ -39,7 +39,7 @@ fun Event.verifySignature(): Boolean {
/** Checks if the ID is correct and then if the pubKey's secret key signed the event. */
fun Event.checkSignature() {
if (!verifyId()) {
throw Exception("ID mismatch: our ID is ${generateId()} for event ${toJson()}")
throw Exception("ID mismatch: our ID is ${generateId()} for event id=$id, pubKey=$pubKey, kind=$kind, createdAt=$createdAt")
}
if (!verifySignature()) {
throw Exception("Bad signature!")
@@ -50,6 +50,6 @@ fun Event.verify(): Boolean =
try {
verifyId() && verifySignature()
} catch (e: Exception) {
Log.w("Event", "Event $id does not have a valid signature: ${toJson()}", e)
Log.w("Event", "Event $id does not have a valid signature (pubKey=$pubKey, kind=$kind, createdAt=$createdAt)", e)
false
}
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/KeyPair.kt
+1 -1
View File
@@ -53,5 +53,5 @@ class KeyPair(
}
}
override fun toString(): String = "KeyPair(privateKey=${privKey?.toHexKey()}, publicKey=${pubKey.toHexKey()}"
override fun toString(): String = "KeyPair(publicKey=${pubKey.toHexKey()}, privateKey=<redacted>)"
}