mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-06 11:28:22 +00:00
Extract SignerProvider query logic into SignerProviderQuery helper
Move the signing/encryption logic out of the SignerProvider ContentProvider into a reusable SignerProviderQuery helper. SignerProvider now just adapts the binder call (context + calling package) and delegates. The NIP-46 relay path (EventNotificationConsumer) previously reached this logic through a same-app ContentResolver.query() round-trip; it now calls SignerProviderQuery.query() directly, avoiding the IPC. The helper's parameters are named for intent instead of mirroring the ContentProvider signature, and the sortOrder-based package-name override is removed. The requester identity is now always derived by Amber (the calling package for IPC, the client pubkey for NIP-46) and never read from caller-supplied query arguments, so external apps can no longer impersonate another requester. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AhvBy73LEpCFpDR7aQNBDn
This commit is contained in:
Claude
@@ -3,53 +3,10 @@ package com.greenart7c3.nostrsigner
|
||||
import android.content.ContentProvider
|
||||
import android.content.ContentValues
|
||||
import android.database.Cursor
|
||||
import android.database.MatrixCursor
|
||||
import android.net.Uri
|
||||
import android.util.Log
|
||||
import com.greenart7c3.nostrsigner.database.HistoryEntity
|
||||
import com.greenart7c3.nostrsigner.database.LogEntity
|
||||
import com.greenart7c3.nostrsigner.models.Account
|
||||
import com.greenart7c3.nostrsigner.models.SignerType
|
||||
import com.greenart7c3.nostrsigner.models.kindToNip
|
||||
import com.greenart7c3.nostrsigner.models.permissionTypeFromContent
|
||||
import com.greenart7c3.nostrsigner.service.AmberUtils
|
||||
import com.greenart7c3.nostrsigner.service.IntentUtils
|
||||
import com.greenart7c3.nostrsigner.service.RelayUrlUtils
|
||||
import com.greenart7c3.nostrsigner.service.model.AmberEvent
|
||||
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||
import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
|
||||
import com.vitorpamplona.quartz.utils.Hex
|
||||
import com.vitorpamplona.quartz.utils.TimeUtils
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
|
||||
class SignerProvider : ContentProvider() {
|
||||
private val scope get() = Amber.instance.applicationIOScope
|
||||
|
||||
private fun rejectedCursor(): Cursor = MatrixCursor(arrayOf("rejected")).also { it.addRow(arrayOf("true")) }
|
||||
|
||||
/**
|
||||
* Capture the calling app's launcher icon/name onto its saved app while it is
|
||||
* visible to us. Dispatched off the binder thread so it adds no latency to the
|
||||
* signing response, and gated to run once per app (see [IntentUtils.persistNativeAppMetadata]).
|
||||
*/
|
||||
private fun captureCallerMetadata(account: Account) {
|
||||
val pkg = callingPackage ?: return
|
||||
val ctx = context ?: return
|
||||
scope.launch {
|
||||
IntentUtils.persistNativeAppMetadata(ctx, account, pkg)
|
||||
}
|
||||
}
|
||||
|
||||
// Decodes the Base64 v3 wire value to readable plaintext for history.
|
||||
@OptIn(kotlin.io.encoding.ExperimentalEncodingApi::class)
|
||||
private fun nip44v3Plaintext(wireValue: String): String = try {
|
||||
kotlin.io.encoding.Base64.decode(wireValue).toString(Charsets.UTF_8)
|
||||
} catch (_: Exception) {
|
||||
wireValue
|
||||
}
|
||||
|
||||
override fun delete(
|
||||
uri: Uri,
|
||||
selection: String?,
|
||||
@@ -72,574 +29,26 @@ class SignerProvider : ContentProvider() {
|
||||
selectionArgs: Array<String>?,
|
||||
sortOrder: String?,
|
||||
): Cursor? {
|
||||
Log.d(Amber.TAG, "Querying $uri has context ${context != null}")
|
||||
|
||||
val appId = BuildConfig.APPLICATION_ID
|
||||
val uriString = uri.toString()
|
||||
val packageName = if (sortOrder.isNullOrBlank()) {
|
||||
callingPackage
|
||||
} else {
|
||||
if (Hex.isHex(sortOrder)) {
|
||||
sortOrder
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
if (packageName == null) {
|
||||
Log.d(Amber.TAG, "No package name")
|
||||
val ctx = context
|
||||
if (ctx == null) {
|
||||
Log.d(Amber.TAG, "No context")
|
||||
return null
|
||||
}
|
||||
return try {
|
||||
when (uriString) {
|
||||
"content://$appId.SIGN_EVENT" -> {
|
||||
val json = projection?.first()
|
||||
if (json == null) {
|
||||
Log.d(Amber.TAG, "No json")
|
||||
return null
|
||||
}
|
||||
val npub = IntentUtils.parsePubKey(projection[2])
|
||||
if (npub == null) {
|
||||
Log.d(Amber.TAG, "No npub")
|
||||
return null
|
||||
}
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context!!, npub)
|
||||
if (account == null) {
|
||||
Log.d(Amber.TAG, "No account from storage")
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(account)
|
||||
val event = try {
|
||||
IntentUtils.getUnsignedEvent(json, account)
|
||||
} catch (e: Exception) {
|
||||
Log.d(Amber.TAG, "Failed to parse event from $packageName", e)
|
||||
return null
|
||||
}
|
||||
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
|
||||
// For kind 22242 (NIP-42 relay auth), extract relay host once for both whitelist and permission checks
|
||||
val relayHost = if (event.kind == 22242) {
|
||||
RelayUrlUtils.extractHostAndPort(AmberEvent.relay(event))
|
||||
} else {
|
||||
""
|
||||
}
|
||||
|
||||
val whitelistAutoAccept = if (event.kind == 22242) {
|
||||
val authWhitelist = Amber.instance.settings.authWhitelist
|
||||
when {
|
||||
authWhitelist.isEmpty() -> false
|
||||
relayHost in authWhitelist -> true
|
||||
else -> {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = event.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
return MatrixCursor(arrayOf("rejected")).also { it.addRow(arrayOf("true")) }
|
||||
}
|
||||
}
|
||||
} else {
|
||||
false
|
||||
}
|
||||
|
||||
var permission = if (event.kind == 22242) {
|
||||
// Kind 22242 = relay client auth (NIP-42): check relay-specific permission first
|
||||
permDao.getPermissionForRelay(packageName, "SIGN_EVENT", 22242, relayHost)
|
||||
?: permDao.getWildcardRelayPermission(packageName, "SIGN_EVENT", 22242)
|
||||
} else {
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"SIGN_EVENT",
|
||||
event.kind,
|
||||
)
|
||||
}
|
||||
if (permission == null && event.kind != 22242) {
|
||||
event.kind.kindToNip()?.let {
|
||||
val nipNumber = it.toIntOrNull()
|
||||
permission = if (nipNumber == null) {
|
||||
null
|
||||
} else {
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"NIP",
|
||||
nipNumber,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = whitelistAutoAccept || IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = event.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
val signedEvent = account.signSync<Event>(event.createdAt, event.kind, event.tags, event.content)
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_EVENT",
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = signedEvent.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("signature", "event", "result")).also {
|
||||
val signature =
|
||||
if (event.kind == LnZapRequestEvent.KIND &&
|
||||
event.tags.any { tag ->
|
||||
tag.any { t -> t == "anon" }
|
||||
}
|
||||
) {
|
||||
signedEvent.toJson()
|
||||
} else {
|
||||
signedEvent.sig
|
||||
}
|
||||
it.addRow(arrayOf(signature, signedEvent.toJson(), signature))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
"content://$appId.NIP04_DECRYPT",
|
||||
"content://$appId.NIP44_DECRYPT",
|
||||
"content://$appId.NIP04_ENCRYPT",
|
||||
"content://$appId.NIP44_ENCRYPT",
|
||||
"content://$appId.NIP44_V3_DECRYPT",
|
||||
"content://$appId.NIP44_V3_ENCRYPT",
|
||||
"content://$appId.DECRYPT_ZAP_EVENT",
|
||||
-> {
|
||||
val content = projection?.first() ?: return null
|
||||
val npub = IntentUtils.parsePubKey(projection[2]) ?: return null
|
||||
val stringType = uriString.replace("content://$appId.", "")
|
||||
val pubkey = projection[1]
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context!!, npub) ?: return null
|
||||
captureCallerMetadata(account)
|
||||
val logDatabase = Amber.instance.getLogDatabase(account.npub)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val type =
|
||||
when (stringType) {
|
||||
"NIP04_DECRYPT" -> SignerType.NIP04_DECRYPT
|
||||
"NIP44_DECRYPT" -> SignerType.NIP44_DECRYPT
|
||||
"NIP04_ENCRYPT" -> SignerType.NIP04_ENCRYPT
|
||||
"NIP44_ENCRYPT" -> SignerType.NIP44_ENCRYPT
|
||||
"NIP44_V3_DECRYPT" -> SignerType.NIP44_V3_DECRYPT
|
||||
"NIP44_V3_ENCRYPT" -> SignerType.NIP44_V3_ENCRYPT
|
||||
"DECRYPT_ZAP_EVENT" -> SignerType.DECRYPT_ZAP_EVENT
|
||||
else -> null
|
||||
} ?: return null
|
||||
|
||||
val isEncrypt = type == SignerType.NIP04_ENCRYPT ||
|
||||
type == SignerType.NIP44_ENCRYPT ||
|
||||
type == SignerType.NIP44_V3_ENCRYPT
|
||||
val isV3 = type == SignerType.NIP44_V3_ENCRYPT || type == SignerType.NIP44_V3_DECRYPT
|
||||
|
||||
// V3 carries kind and scope as projection[3] and projection[4].
|
||||
// A missing/invalid kind is a malformed request: auto-reject
|
||||
// instead of prompting the user.
|
||||
val (v3Kind, v3Scope) = if (isV3) {
|
||||
val kindStr = projection.getOrNull(3)
|
||||
val scopeStr = projection.getOrNull(4) ?: ""
|
||||
val parsedKind = kindStr?.toIntOrNull()
|
||||
if (parsedKind == null) {
|
||||
Log.d(Amber.TAG, "NIP-44 v3 request missing/invalid kind")
|
||||
return rejectedCursor()
|
||||
}
|
||||
parsedKind to scopeStr
|
||||
} else {
|
||||
null to ""
|
||||
}
|
||||
|
||||
// For ENCRYPT: classify plaintext input; for DECRYPT: perform operation first then classify result
|
||||
val result =
|
||||
if (isEncrypt) {
|
||||
null // defer until after permission check
|
||||
} else {
|
||||
try {
|
||||
runBlocking {
|
||||
AmberUtils.encryptOrDecryptData(
|
||||
content,
|
||||
type,
|
||||
account,
|
||||
pubkey,
|
||||
v3Kind,
|
||||
v3Scope,
|
||||
) ?: "Could not decrypt the message"
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
logDatabase.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Could not decrypt the message",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
// A V3 decrypt that throws cannot succeed (wrong
|
||||
// version/context, bad MAC, corrupt padding, ...):
|
||||
// reject it rather than prompting the user.
|
||||
if (isV3) return rejectedCursor()
|
||||
"Could not decrypt the message"
|
||||
}
|
||||
}
|
||||
|
||||
// Permission lookup. V3 grants are scoped by (packageName,
|
||||
// SignerType, kind); fall back to a kind=null "all kinds"
|
||||
// grant. V3 grants do NOT satisfy V2 requests and vice versa.
|
||||
var permission = if (isV3) {
|
||||
// V3 grants are kind-scoped; fall back to the explicit
|
||||
// "all kinds" (kind IS NULL) grant only, never to any
|
||||
// other kind — otherwise e.g. a kind-A reject would
|
||||
// leak to a kind-B request.
|
||||
permDao.getPermission(packageName, type.toString(), v3Kind!!)
|
||||
?: permDao.getPermissionAllKinds(packageName, type.toString())
|
||||
} else {
|
||||
// Classify the content to determine EncryptedDataKind-based permission type
|
||||
val classifyContent = if (isEncrypt) content else (result ?: content)
|
||||
val permType = permissionTypeFromContent(classifyContent, isEncrypt, type)
|
||||
permDao.getPermission(packageName, permType)
|
||||
?: permDao.getPermission(packageName, type.toString())
|
||||
}
|
||||
if (permission == null && !isV3) {
|
||||
val nip = when (stringType) {
|
||||
"NIP04_DECRYPT" -> 4
|
||||
"NIP44_DECRYPT" -> 44
|
||||
"NIP04_ENCRYPT" -> 4
|
||||
"NIP44_ENCRYPT" -> 44
|
||||
"DECRYPT_ZAP_EVENT" -> null
|
||||
else -> null
|
||||
}
|
||||
nip?.let {
|
||||
permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"NIP",
|
||||
it,
|
||||
)
|
||||
}
|
||||
}
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
v3Kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = content,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
// For encrypt: perform the operation now after permission is confirmed
|
||||
val finalResult =
|
||||
result ?: try {
|
||||
runBlocking {
|
||||
AmberUtils.encryptOrDecryptData(
|
||||
content,
|
||||
type,
|
||||
account,
|
||||
pubkey,
|
||||
v3Kind,
|
||||
v3Scope,
|
||||
) ?: "Could not decrypt the message"
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
logDatabase.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Could not decrypt the message",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
"Could not decrypt the message"
|
||||
}
|
||||
|
||||
// For v3 the wire value is Base64; this auto-accept path has no
|
||||
// EncryptedDataKind, so decode it once for the readable log.
|
||||
val historyContent = if (isV3) {
|
||||
nip44v3Plaintext(if (!isEncrypt) finalResult else content)
|
||||
} else {
|
||||
if (!isEncrypt) finalResult else content
|
||||
}
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
v3Kind,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = historyContent,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor = MatrixCursor(arrayOf("signature", "event", "result"))
|
||||
cursor.addRow(arrayOf<Any>(finalResult, finalResult, finalResult))
|
||||
return cursor
|
||||
}
|
||||
|
||||
"content://$appId.SIGN_PSBT" -> {
|
||||
val psbtHex = projection?.first()
|
||||
if (psbtHex == null) {
|
||||
Log.d(Amber.TAG, "No psbt")
|
||||
return null
|
||||
}
|
||||
val npub = IntentUtils.parsePubKey(projection[2])
|
||||
if (npub == null) {
|
||||
Log.d(Amber.TAG, "No npub")
|
||||
return null
|
||||
}
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context!!, npub)
|
||||
if (account == null) {
|
||||
Log.d(Amber.TAG, "No account from storage")
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(account)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
)
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = psbtHex,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
val result = try {
|
||||
runBlocking { account.signPsbt(psbtHex) }
|
||||
} catch (e: Exception) {
|
||||
Log.d(Amber.TAG, "Failed to sign psbt", e)
|
||||
scope.launch {
|
||||
val logDb = Amber.instance.getLogDatabase(account.npub)
|
||||
logDb.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
e.message ?: "Could not sign the psbt",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = psbtHex,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val localCursor = MatrixCursor(arrayOf("signature", "event", "result")).also {
|
||||
it.addRow(arrayOf(result, result, result))
|
||||
}
|
||||
|
||||
return localCursor
|
||||
}
|
||||
"content://$appId.PING" -> {
|
||||
val npub = if (projection != null && projection.isNotEmpty()) IntentUtils.parsePubKey(projection[0]) else null
|
||||
val account = if (npub != null) {
|
||||
LocalPreferences.loadFromEncryptedStorageSync(context!!, npub)
|
||||
} else {
|
||||
LocalPreferences.allSavedAccounts(context!!).firstNotNullOfOrNull { accountInfo ->
|
||||
val localDatabase = Amber.instance.getDatabase(accountInfo.npub)
|
||||
val hasAccount = localDatabase.dao().getByKeySync(packageName) != null
|
||||
if (hasAccount) {
|
||||
LocalPreferences.loadFromEncryptedStorageSync(context!!, accountInfo.npub)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
}
|
||||
if (account == null) {
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(account)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"PING",
|
||||
)
|
||||
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor = MatrixCursor(arrayOf("signature", "result"))
|
||||
cursor.addRow(arrayOf<Any>("pong", "pong"))
|
||||
return cursor
|
||||
}
|
||||
else -> null
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
LocalPreferences.allSavedAccounts(context!!).forEach { accInfo ->
|
||||
val database = Amber.instance.getLogDatabase(accInfo.npub)
|
||||
database.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Error from $callingPackage $uri",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
// External apps are always attributed to their own Android package. The
|
||||
// requester identity is taken from the binder's calling package, never from
|
||||
// caller-supplied query arguments, so an app cannot impersonate another one.
|
||||
val caller = callingPackage
|
||||
if (caller == null) {
|
||||
Log.d(Amber.TAG, "No calling package")
|
||||
return null
|
||||
}
|
||||
return SignerProviderQuery.query(
|
||||
context = ctx,
|
||||
requesterId = caller,
|
||||
callerPackageName = caller,
|
||||
operationUri = uri,
|
||||
arguments = projection,
|
||||
)
|
||||
}
|
||||
|
||||
override fun update(
|
||||
|
||||
@@ -0,0 +1,643 @@
|
||||
package com.greenart7c3.nostrsigner
|
||||
|
||||
import android.content.Context
|
||||
import android.database.Cursor
|
||||
import android.database.MatrixCursor
|
||||
import android.net.Uri
|
||||
import android.util.Log
|
||||
import com.greenart7c3.nostrsigner.database.HistoryEntity
|
||||
import com.greenart7c3.nostrsigner.database.LogEntity
|
||||
import com.greenart7c3.nostrsigner.models.Account
|
||||
import com.greenart7c3.nostrsigner.models.SignerType
|
||||
import com.greenart7c3.nostrsigner.models.kindToNip
|
||||
import com.greenart7c3.nostrsigner.models.permissionTypeFromContent
|
||||
import com.greenart7c3.nostrsigner.service.AmberUtils
|
||||
import com.greenart7c3.nostrsigner.service.IntentUtils
|
||||
import com.greenart7c3.nostrsigner.service.RelayUrlUtils
|
||||
import com.greenart7c3.nostrsigner.service.model.AmberEvent
|
||||
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||
import com.vitorpamplona.quartz.nip57Zaps.LnZapRequestEvent
|
||||
import com.vitorpamplona.quartz.utils.TimeUtils
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
|
||||
/**
|
||||
* Holds the signing/encryption logic that backs [SignerProvider].
|
||||
*
|
||||
* The same logic is reached two ways:
|
||||
* - [SignerProvider] (a [android.content.ContentProvider]) for external IPC callers, and
|
||||
* - in-process callers such as [com.greenart7c3.nostrsigner.service.EventNotificationConsumer]
|
||||
* (the NIP-46 relay path), which call [query] directly instead of going through
|
||||
* a same-app [android.content.ContentResolver] round-trip.
|
||||
*/
|
||||
object SignerProviderQuery {
|
||||
private val scope get() = Amber.instance.applicationIOScope
|
||||
|
||||
private fun rejectedCursor(): Cursor = MatrixCursor(arrayOf("rejected")).also { it.addRow(arrayOf("true")) }
|
||||
|
||||
/**
|
||||
* Capture the calling app's launcher icon/name onto its saved app while it is
|
||||
* visible to us. Dispatched off the binder thread so it adds no latency to the
|
||||
* signing response, and gated to run once per app (see [IntentUtils.persistNativeAppMetadata]).
|
||||
*/
|
||||
private fun captureCallerMetadata(
|
||||
context: Context,
|
||||
callerPackageName: String?,
|
||||
account: Account,
|
||||
) {
|
||||
val pkg = callerPackageName ?: return
|
||||
scope.launch {
|
||||
IntentUtils.persistNativeAppMetadata(context, account, pkg)
|
||||
}
|
||||
}
|
||||
|
||||
// Decodes the Base64 v3 wire value to readable plaintext for history.
|
||||
@OptIn(kotlin.io.encoding.ExperimentalEncodingApi::class)
|
||||
private fun nip44v3Plaintext(wireValue: String): String = try {
|
||||
kotlin.io.encoding.Base64.decode(wireValue).toString(Charsets.UTF_8)
|
||||
} catch (_: Exception) {
|
||||
wireValue
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs a signer operation and returns its result as a [Cursor], mirroring the
|
||||
* column layout the [SignerProvider] ContentProvider exposes to external apps.
|
||||
*
|
||||
* @param context an application [Context] used for storage and PackageManager lookups.
|
||||
* @param requesterId who the request is attributed to for permission checks,
|
||||
* history and logs. For IPC requests this is the caller's Android package name;
|
||||
* for NIP-46 relay requests it is the client's pubkey (hex). This is always
|
||||
* derived by Amber, never taken from caller-supplied arguments, so external
|
||||
* apps cannot impersonate another requester.
|
||||
* @param callerPackageName the installed Android package whose launcher icon/name
|
||||
* should be captured onto the saved app, or null when there is no installed
|
||||
* caller (e.g. NIP-46 relay requests).
|
||||
* @param operationUri identifies the operation to run, e.g. `content://<appId>.SIGN_EVENT`.
|
||||
* @param arguments the operation's input values; their meaning depends on
|
||||
* [operationUri] (e.g. for SIGN_EVENT: [0] = event json, [2] = npub). See callers.
|
||||
*/
|
||||
fun query(
|
||||
context: Context,
|
||||
requesterId: String,
|
||||
callerPackageName: String?,
|
||||
operationUri: Uri,
|
||||
arguments: Array<String>?,
|
||||
): Cursor? {
|
||||
Log.d(Amber.TAG, "Querying $operationUri")
|
||||
|
||||
val appId = BuildConfig.APPLICATION_ID
|
||||
val uriString = operationUri.toString()
|
||||
val packageName = requesterId
|
||||
return try {
|
||||
when (uriString) {
|
||||
"content://$appId.SIGN_EVENT" -> {
|
||||
val json = arguments?.first()
|
||||
if (json == null) {
|
||||
Log.d(Amber.TAG, "No json")
|
||||
return null
|
||||
}
|
||||
val npub = IntentUtils.parsePubKey(arguments[2])
|
||||
if (npub == null) {
|
||||
Log.d(Amber.TAG, "No npub")
|
||||
return null
|
||||
}
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context, npub)
|
||||
if (account == null) {
|
||||
Log.d(Amber.TAG, "No account from storage")
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(context, callerPackageName, account)
|
||||
val event = try {
|
||||
IntentUtils.getUnsignedEvent(json, account)
|
||||
} catch (e: Exception) {
|
||||
Log.d(Amber.TAG, "Failed to parse event from $packageName", e)
|
||||
return null
|
||||
}
|
||||
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
|
||||
// For kind 22242 (NIP-42 relay auth), extract relay host once for both whitelist and permission checks
|
||||
val relayHost = if (event.kind == 22242) {
|
||||
RelayUrlUtils.extractHostAndPort(AmberEvent.relay(event))
|
||||
} else {
|
||||
""
|
||||
}
|
||||
|
||||
val whitelistAutoAccept = if (event.kind == 22242) {
|
||||
val authWhitelist = Amber.instance.settings.authWhitelist
|
||||
when {
|
||||
authWhitelist.isEmpty() -> false
|
||||
relayHost in authWhitelist -> true
|
||||
else -> {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = event.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
return MatrixCursor(arrayOf("rejected")).also { it.addRow(arrayOf("true")) }
|
||||
}
|
||||
}
|
||||
} else {
|
||||
false
|
||||
}
|
||||
|
||||
var permission = if (event.kind == 22242) {
|
||||
// Kind 22242 = relay client auth (NIP-42): check relay-specific permission first
|
||||
permDao.getPermissionForRelay(packageName, "SIGN_EVENT", 22242, relayHost)
|
||||
?: permDao.getWildcardRelayPermission(packageName, "SIGN_EVENT", 22242)
|
||||
} else {
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"SIGN_EVENT",
|
||||
event.kind,
|
||||
)
|
||||
}
|
||||
if (permission == null && event.kind != 22242) {
|
||||
event.kind.kindToNip()?.let {
|
||||
val nipNumber = it.toIntOrNull()
|
||||
permission = if (nipNumber == null) {
|
||||
null
|
||||
} else {
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"NIP",
|
||||
nipNumber,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = whitelistAutoAccept || IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = event.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
val signedEvent = account.signSync<Event>(event.createdAt, event.kind, event.tags, event.content)
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_EVENT",
|
||||
event.kind,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = signedEvent.toJson(),
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("signature", "event", "result")).also {
|
||||
val signature =
|
||||
if (event.kind == LnZapRequestEvent.KIND &&
|
||||
event.tags.any { tag ->
|
||||
tag.any { t -> t == "anon" }
|
||||
}
|
||||
) {
|
||||
signedEvent.toJson()
|
||||
} else {
|
||||
signedEvent.sig
|
||||
}
|
||||
it.addRow(arrayOf(signature, signedEvent.toJson(), signature))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
"content://$appId.NIP04_DECRYPT",
|
||||
"content://$appId.NIP44_DECRYPT",
|
||||
"content://$appId.NIP04_ENCRYPT",
|
||||
"content://$appId.NIP44_ENCRYPT",
|
||||
"content://$appId.NIP44_V3_DECRYPT",
|
||||
"content://$appId.NIP44_V3_ENCRYPT",
|
||||
"content://$appId.DECRYPT_ZAP_EVENT",
|
||||
-> {
|
||||
val content = arguments?.first() ?: return null
|
||||
val npub = IntentUtils.parsePubKey(arguments[2]) ?: return null
|
||||
val stringType = uriString.replace("content://$appId.", "")
|
||||
val pubkey = arguments[1]
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context, npub) ?: return null
|
||||
captureCallerMetadata(context, callerPackageName, account)
|
||||
val logDatabase = Amber.instance.getLogDatabase(account.npub)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val type =
|
||||
when (stringType) {
|
||||
"NIP04_DECRYPT" -> SignerType.NIP04_DECRYPT
|
||||
"NIP44_DECRYPT" -> SignerType.NIP44_DECRYPT
|
||||
"NIP04_ENCRYPT" -> SignerType.NIP04_ENCRYPT
|
||||
"NIP44_ENCRYPT" -> SignerType.NIP44_ENCRYPT
|
||||
"NIP44_V3_DECRYPT" -> SignerType.NIP44_V3_DECRYPT
|
||||
"NIP44_V3_ENCRYPT" -> SignerType.NIP44_V3_ENCRYPT
|
||||
"DECRYPT_ZAP_EVENT" -> SignerType.DECRYPT_ZAP_EVENT
|
||||
else -> null
|
||||
} ?: return null
|
||||
|
||||
val isEncrypt = type == SignerType.NIP04_ENCRYPT ||
|
||||
type == SignerType.NIP44_ENCRYPT ||
|
||||
type == SignerType.NIP44_V3_ENCRYPT
|
||||
val isV3 = type == SignerType.NIP44_V3_ENCRYPT || type == SignerType.NIP44_V3_DECRYPT
|
||||
|
||||
// V3 carries kind and scope as arguments[3] and arguments[4].
|
||||
// A missing/invalid kind is a malformed request: auto-reject
|
||||
// instead of prompting the user.
|
||||
val (v3Kind, v3Scope) = if (isV3) {
|
||||
val kindStr = arguments.getOrNull(3)
|
||||
val scopeStr = arguments.getOrNull(4) ?: ""
|
||||
val parsedKind = kindStr?.toIntOrNull()
|
||||
if (parsedKind == null) {
|
||||
Log.d(Amber.TAG, "NIP-44 v3 request missing/invalid kind")
|
||||
return rejectedCursor()
|
||||
}
|
||||
parsedKind to scopeStr
|
||||
} else {
|
||||
null to ""
|
||||
}
|
||||
|
||||
// For ENCRYPT: classify plaintext input; for DECRYPT: perform operation first then classify result
|
||||
val result =
|
||||
if (isEncrypt) {
|
||||
null // defer until after permission check
|
||||
} else {
|
||||
try {
|
||||
runBlocking {
|
||||
AmberUtils.encryptOrDecryptData(
|
||||
content,
|
||||
type,
|
||||
account,
|
||||
pubkey,
|
||||
v3Kind,
|
||||
v3Scope,
|
||||
) ?: "Could not decrypt the message"
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
logDatabase.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Could not decrypt the message",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
// A V3 decrypt that throws cannot succeed (wrong
|
||||
// version/context, bad MAC, corrupt padding, ...):
|
||||
// reject it rather than prompting the user.
|
||||
if (isV3) return rejectedCursor()
|
||||
"Could not decrypt the message"
|
||||
}
|
||||
}
|
||||
|
||||
// Permission lookup. V3 grants are scoped by (packageName,
|
||||
// SignerType, kind); fall back to a kind=null "all kinds"
|
||||
// grant. V3 grants do NOT satisfy V2 requests and vice versa.
|
||||
var permission = if (isV3) {
|
||||
// V3 grants are kind-scoped; fall back to the explicit
|
||||
// "all kinds" (kind IS NULL) grant only, never to any
|
||||
// other kind — otherwise e.g. a kind-A reject would
|
||||
// leak to a kind-B request.
|
||||
permDao.getPermission(packageName, type.toString(), v3Kind!!)
|
||||
?: permDao.getPermissionAllKinds(packageName, type.toString())
|
||||
} else {
|
||||
// Classify the content to determine EncryptedDataKind-based permission type
|
||||
val classifyContent = if (isEncrypt) content else (result ?: content)
|
||||
val permType = permissionTypeFromContent(classifyContent, isEncrypt, type)
|
||||
permDao.getPermission(packageName, permType)
|
||||
?: permDao.getPermission(packageName, type.toString())
|
||||
}
|
||||
if (permission == null && !isV3) {
|
||||
val nip = when (stringType) {
|
||||
"NIP04_DECRYPT" -> 4
|
||||
"NIP44_DECRYPT" -> 44
|
||||
"NIP04_ENCRYPT" -> 4
|
||||
"NIP44_ENCRYPT" -> 44
|
||||
"DECRYPT_ZAP_EVENT" -> null
|
||||
else -> null
|
||||
}
|
||||
nip?.let {
|
||||
permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"NIP",
|
||||
it,
|
||||
)
|
||||
}
|
||||
}
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
v3Kind,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = content,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
// For encrypt: perform the operation now after permission is confirmed
|
||||
val finalResult =
|
||||
result ?: try {
|
||||
runBlocking {
|
||||
AmberUtils.encryptOrDecryptData(
|
||||
content,
|
||||
type,
|
||||
account,
|
||||
pubkey,
|
||||
v3Kind,
|
||||
v3Scope,
|
||||
) ?: "Could not decrypt the message"
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
logDatabase.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Could not decrypt the message",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
"Could not decrypt the message"
|
||||
}
|
||||
|
||||
// For v3 the wire value is Base64; this auto-accept path has no
|
||||
// EncryptedDataKind, so decode it once for the readable log.
|
||||
val historyContent = if (isV3) {
|
||||
nip44v3Plaintext(if (!isEncrypt) finalResult else content)
|
||||
} else {
|
||||
if (!isEncrypt) finalResult else content
|
||||
}
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
v3Kind,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = historyContent,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor = MatrixCursor(arrayOf("signature", "event", "result"))
|
||||
cursor.addRow(arrayOf<Any>(finalResult, finalResult, finalResult))
|
||||
return cursor
|
||||
}
|
||||
|
||||
"content://$appId.SIGN_PSBT" -> {
|
||||
val psbtHex = arguments?.first()
|
||||
if (psbtHex == null) {
|
||||
Log.d(Amber.TAG, "No psbt")
|
||||
return null
|
||||
}
|
||||
val npub = IntentUtils.parsePubKey(arguments[2])
|
||||
if (npub == null) {
|
||||
Log.d(Amber.TAG, "No npub")
|
||||
return null
|
||||
}
|
||||
val account = LocalPreferences.loadFromEncryptedStorageSync(context, npub)
|
||||
if (account == null) {
|
||||
Log.d(Amber.TAG, "No account from storage")
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(context, callerPackageName, account)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
)
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
content = psbtHex,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
val result = try {
|
||||
runBlocking { account.signPsbt(psbtHex) }
|
||||
} catch (e: Exception) {
|
||||
Log.d(Amber.TAG, "Failed to sign psbt", e)
|
||||
scope.launch {
|
||||
val logDb = Amber.instance.getLogDatabase(account.npub)
|
||||
logDb.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
e.message ?: "Could not sign the psbt",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
"SIGN_PSBT",
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
content = psbtHex,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val localCursor = MatrixCursor(arrayOf("signature", "event", "result")).also {
|
||||
it.addRow(arrayOf(result, result, result))
|
||||
}
|
||||
|
||||
return localCursor
|
||||
}
|
||||
"content://$appId.PING" -> {
|
||||
val npub = if (arguments != null && arguments.isNotEmpty()) IntentUtils.parsePubKey(arguments[0]) else null
|
||||
val account = if (npub != null) {
|
||||
LocalPreferences.loadFromEncryptedStorageSync(context, npub)
|
||||
} else {
|
||||
LocalPreferences.allSavedAccounts(context).firstNotNullOfOrNull { accountInfo ->
|
||||
val localDatabase = Amber.instance.getDatabase(accountInfo.npub)
|
||||
val hasAccount = localDatabase.dao().getByKeySync(packageName) != null
|
||||
if (hasAccount) {
|
||||
LocalPreferences.loadFromEncryptedStorageSync(context, accountInfo.npub)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
}
|
||||
}
|
||||
if (account == null) {
|
||||
return null
|
||||
}
|
||||
captureCallerMetadata(context, callerPackageName, account)
|
||||
val historyDatabase = Amber.instance.getHistoryDatabase(account.npub)
|
||||
val permDao = Amber.instance.dao(account.npub)
|
||||
val permission =
|
||||
permDao
|
||||
.getPermission(
|
||||
packageName,
|
||||
"PING",
|
||||
)
|
||||
|
||||
val signPolicy = permDao.getSignPolicy(packageName)
|
||||
val isRemembered = IntentUtils.isRemembered(signPolicy, permission) ?: return null
|
||||
if (!isRemembered) {
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
false,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor =
|
||||
MatrixCursor(arrayOf("rejected")).also {
|
||||
it.addRow(arrayOf("true"))
|
||||
}
|
||||
|
||||
return cursor
|
||||
}
|
||||
|
||||
scope.launch {
|
||||
historyDatabase.dao().addHistory(
|
||||
listOf(
|
||||
HistoryEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
null,
|
||||
TimeUtils.now(),
|
||||
true,
|
||||
),
|
||||
),
|
||||
account.npub,
|
||||
)
|
||||
}
|
||||
|
||||
val cursor = MatrixCursor(arrayOf("signature", "result"))
|
||||
cursor.addRow(arrayOf<Any>("pong", "pong"))
|
||||
return cursor
|
||||
}
|
||||
else -> null
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
scope.launch {
|
||||
LocalPreferences.allSavedAccounts(context).forEach { accInfo ->
|
||||
val database = Amber.instance.getLogDatabase(accInfo.npub)
|
||||
database.dao().insertLog(
|
||||
LogEntity(
|
||||
0,
|
||||
packageName,
|
||||
uriString.replace("content://$appId.", ""),
|
||||
e.message ?: "Error from ${callerPackageName ?: packageName} $operationUri",
|
||||
System.currentTimeMillis(),
|
||||
),
|
||||
)
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,6 +31,7 @@ import com.greenart7c3.nostrsigner.Amber
|
||||
import com.greenart7c3.nostrsigner.BuildConfig
|
||||
import com.greenart7c3.nostrsigner.LocalPreferences
|
||||
import com.greenart7c3.nostrsigner.R
|
||||
import com.greenart7c3.nostrsigner.SignerProviderQuery
|
||||
import com.greenart7c3.nostrsigner.database.ApplicationWithPermissions
|
||||
import com.greenart7c3.nostrsigner.database.HistoryEntity
|
||||
import com.greenart7c3.nostrsigner.database.LogEntity
|
||||
@@ -532,12 +533,14 @@ class EventNotificationConsumer(private val applicationContext: Context) {
|
||||
else -> arrayOf(data, pubKey, acc.npub)
|
||||
}
|
||||
val cursor =
|
||||
applicationContext.contentResolver.query(
|
||||
"content://${BuildConfig.APPLICATION_ID}.$type".toUri(),
|
||||
projection,
|
||||
"Amber",
|
||||
null,
|
||||
event.pubKey,
|
||||
SignerProviderQuery.query(
|
||||
context = applicationContext,
|
||||
// NIP-46 requests are attributed to the client's pubkey, not an
|
||||
// installed app. There is no installed caller, so nothing to capture.
|
||||
requesterId = event.pubKey,
|
||||
callerPackageName = null,
|
||||
operationUri = "content://${BuildConfig.APPLICATION_ID}.$type".toUri(),
|
||||
arguments = projection,
|
||||
)
|
||||
|
||||
cursor.use { localCursor ->
|
||||
|
||||
Reference in New Issue
Block a user