Skip to content

Route background NIP-55 pubkey verification through shared checkPubkey helper #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kwsantiago merged 1 commit into from
Aug 22, 2026
Merged

Route background NIP-55 pubkey verification through shared checkPubkey helper #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions app/src/main/kotlin/io/privkey/keep/nip55/Nip55ContentProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,19 +417,11 @@ class Nip55ContentProvider : ContentProvider() {

return runCatching { h.handleRequest(request, callerPackage) }
.mapCatching { response ->
if (requestType == Nip55RequestType.GET_PUBLIC_KEY) {
if (response.result.isEmpty()) {
throw IllegalStateException("Handler returned empty pubkey")
}
val groupPubkey = app.getStorage()?.getShareMetadata()?.groupPubkey
if (groupPubkey == null || groupPubkey.isEmpty()) {
throw IllegalStateException("Stored pubkey unavailable for verification")
}
val storedPubkey = groupPubkey.joinToString("") { "%02x".format(it.toInt() and 0xFF) }
if (!MessageDigest.isEqual(response.result.toByteArray(Charsets.UTF_8), storedPubkey.toByteArray(Charsets.UTF_8))) {
if (BuildConfig.DEBUG) Log.e(TAG, "Pubkey verification failed: mismatch detected")
throw IllegalStateException("Pubkey verification failed")
}
// Same self-verification as the foreground path: compare the handler's
// returned pubkey against the independently-read stored group pubkey
// (keystore share metadata) through the single shared checkPubkey helper.
checkPubkey(requestType, response.result, app.getStorage()?.getShareMetadata()?.groupPubkey)?.let {
throw IllegalStateException("Pubkey verification failed")
}
runCatching {
runWithTimeout { store.logOperation(callerPackage, requestType, eventKind, "allow", wasAutomatic = true) }
Expand Down