From 2a8cb74d0e2f2870abcbd6cce02d3562e89c8dea Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 28 Sep 2026 18:54:23 +0000 Subject: [PATCH] fix(notifications): decrypt private zaps for the zapped user decryptZapContentAuthor only decrypted when the zapped author list contained the request's own pubkey. A private zap request is signed by a one-time key, so that was almost never true and zap notifications showed the throwaway key and an empty message instead of the real zapper and comment. Decrypt when the notified account is the zapped author, and fall back to the request if the signer can't open it (e.g. rejected by an external signer) instead of dropping the notification. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01QytMdt3MPxvmmWrAX3bJYS --- .../notifications/NotificationContent.kt | 17 ++- .../NotificationContentPrivateZapTest.kt | 110 ++++++++++++++++++ 2 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 amethyst/src/test/java/com/vitorpamplona/amethyst/service/notifications/NotificationContentPrivateZapTest.kt diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationContent.kt index 68077c7d66..9c44871db6 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationContent.kt @@ -34,6 +34,8 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NPub import com.vitorpamplona.quartz.nip57Zaps.ZapRequestEvent import com.vitorpamplona.quartz.nip68Picture.PictureEvent import com.vitorpamplona.quartz.nip71Video.VideoEvent +import com.vitorpamplona.quartz.utils.Log +import kotlin.coroutines.cancellation.CancellationException /** * Content-extraction helpers shared by the per-kind notification renderers: @@ -176,15 +178,24 @@ object NotificationContent { return RenderedText(text, resolved.citedUsers, imageUrl) } + /** + * A private zap request is signed by a one-time key; the real zapper and message are encrypted + * for the zapped author. Decrypts them when [signer] is that recipient, otherwise (or when the + * signer can't) returns the request as-is. + */ suspend fun decryptZapContentAuthor( event: ZapRequestEvent, signer: NostrSigner, - ): Event? = - if (event.isPrivateZap() && event.zappedAuthor().contains(event.pubKey)) { + ): Event? { + if (!event.isPrivateZap() || signer.pubKey !in event.zappedAuthor()) return event + return try { signer.decryptZapEvent(event) - } else { + } catch (e: Exception) { + if (e is CancellationException) throw e + Log.w("NotificationContent", "Could not decrypt private zap ${event.id}", e) event } + } suspend fun decryptContent( note: Note, diff --git a/amethyst/src/test/java/com/vitorpamplona/amethyst/service/notifications/NotificationContentPrivateZapTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/notifications/NotificationContentPrivateZapTest.kt new file mode 100644 index 0000000000..0097f9855d --- /dev/null +++ b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/notifications/NotificationContentPrivateZapTest.kt @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2025 Vitor Pamplona + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + * Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +package com.vitorpamplona.amethyst.service.notifications + +import com.vitorpamplona.quartz.nip01Core.core.Event +import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair +import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer +import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal +import com.vitorpamplona.quartz.nip57Zaps.ZapReceiptEvent +import com.vitorpamplona.quartz.nip57Zaps.ZapRequestEvent +import kotlinx.coroutines.runBlocking +import org.junit.Assert.assertEquals +import org.junit.Assert.assertSame +import org.junit.Test + +/** + * A private zap is signed by a one-time key and carries the real sender and message encrypted + * for the zapped author. The notification must decrypt it with the recipient's signer so the + * shade names the real zapper, and fall back to the request itself when it can't. + */ +class NotificationContentPrivateZapTest { + private val relays = setOf(RelayUrlNormalizer.normalizeOrNull("wss://relay.example/")!!) + private val recipient = NostrSignerInternal(KeyPair()) + private val sender = NostrSignerInternal(KeyPair()) + + private val zappedPost = + Event( + id = "a".repeat(64), + pubKey = recipient.pubKey, + createdAt = 1000L, + kind = 1, + tags = emptyArray(), + content = "Hello world", + sig = "b".repeat(128), + ) + + private fun zapPost(zapType: ZapReceiptEvent.ZapType) = + runBlocking { + ZapRequestEvent.create( + zappedEvent = zappedPost, + relays = relays, + signer = sender, + pollOption = null, + message = "great post", + zapType = zapType, + toUserPubHex = null, + ) + } + + @Test + fun privateZapOnAPostIsDecryptedForTheRecipient() = + runBlocking { + val decrypted = NotificationContent.decryptZapContentAuthor(zapPost(ZapReceiptEvent.ZapType.PRIVATE), recipient)!! + + assertEquals(sender.pubKey, decrypted.pubKey) + assertEquals("great post", decrypted.content) + } + + @Test + fun privateProfileZapIsDecryptedForTheRecipient() = + runBlocking { + val zap = + ZapRequestEvent.create( + userHex = recipient.pubKey, + relays = relays, + signer = sender, + message = "thanks", + zapType = ZapReceiptEvent.ZapType.PRIVATE, + ) + + val decrypted = NotificationContent.decryptZapContentAuthor(zap, recipient)!! + + assertEquals(sender.pubKey, decrypted.pubKey) + assertEquals("thanks", decrypted.content) + } + + @Test + fun privateZapTheSignerCannotOpenFallsBackToTheRequest() = + runBlocking { + val zap = zapPost(ZapReceiptEvent.ZapType.PRIVATE) + + assertSame(zap, NotificationContent.decryptZapContentAuthor(zap, NostrSignerInternal(KeyPair()))) + } + + @Test + fun publicZapIsReturnedAsIs() = + runBlocking { + val zap = zapPost(ZapReceiptEvent.ZapType.PUBLIC) + + assertSame(zap, NotificationContent.decryptZapContentAuthor(zap, recipient)) + } +}