mailbox-private-keys-written-to-log.diff (2215B)
1 diff --git a/wallet/src/main/java/net/taler/wallet/mailbox/MailboxManager.kt b/wallet/src/main/java/net/taler/wallet/mailbox/MailboxManager.kt 2 index dac720c5..809a6bae 100644 3 --- a/wallet/src/main/java/net/taler/wallet/mailbox/MailboxManager.kt 4 +++ b/wallet/src/main/java/net/taler/wallet/mailbox/MailboxManager.kt 5 @@ -40,7 +40,17 @@ data class MailboxConfiguration( 6 val hAddress: String, 7 val expiration: Timestamp, 8 val payUri: String? = null, 9 -) 10 +) { 11 + /** 12 + * Without this the generated toString() puts both private keys in any log 13 + * line this object is interpolated into -- and it was interpolated into 14 + * two. 15 + */ 16 + override fun toString(): String = 17 + "MailboxConfiguration(mailboxBaseUrl=$mailboxBaseUrl, hAddress=$hAddress, " + 18 + "expiration=$expiration, payUri=$payUri, " + 19 + "privateKey=<redacted>, privateEncryptionKey=<redacted>)" 20 +} 21 22 @Serializable 23 data class MailboxMessageRecord( 24 @@ -100,14 +110,14 @@ class MailboxManager( 25 fun loadMailbox(baseUrl: String = "https://mailbox.gnunet.org") { 26 _mailbox.value = MailboxResult.Loading 27 scope.launch { 28 - Log.e(TAG, "Loading mailbox") 29 + Log.d(TAG, "loading mailbox at $baseUrl") 30 api.request("getMailbox", GetMailboxResponse.serializer()) { 31 put("mailboxBaseUrl", baseUrl) 32 }.onSuccess { resp -> 33 if (null == resp.mailboxConfiguration) { 34 initializeMailbox(baseUrl) 35 } else { 36 - Log.e(TAG, "Got mailbox ${resp.mailboxConfiguration}") 37 + Log.d(TAG, "got mailbox at ${resp.mailboxConfiguration.mailboxBaseUrl}") 38 getMessages(resp.mailboxConfiguration) 39 } 40 }.onError { 41 @@ -143,7 +153,7 @@ class MailboxManager( 42 43 fun refreshMailbox(config: MailboxConfiguration) { 44 45 - Log.e(TAG, "Rereshing mailbox ${config}") 46 + Log.d(TAG, "refreshing mailbox at ${config.mailboxBaseUrl}") 47 scope.launch { 48 api.request("refreshMailbox", MailboxMessagesResponse.serializer()) { 49 JSONObject(BackendManager.json.encodeToString(config))