laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve NIP-42 relay authentication permissions by using hostnames

Browse Source 
- Update `IntentMultiEventHomeScreen`, `BunkerMultiEventHomeScreen`, `IntentSingleEventHomeScreen`, and `BunkerSingleEventHomeScreen` to extract the hostname from relay URLs when processing Kind 22242 events. This ensures permissions are stored and checked against the relay host rather than the full URL.

- Broaden `getWildcardRelayPermission` in `ApplicationDao` to match permissions where the relay is `*`, an empty string, or `NULL`, improving fallback logic for global relay permissions.
This commit is contained in:
greenart7c3
2026-03-09 14:05:02 -03:00
parent c024b13c8c
commit bf791f43a1
5 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/database/ApplicationDao.kt
+1 -1
View File
@@ -80,7 +80,7 @@ interface ApplicationDao {
relay: String,
): ApplicationPermissionsEntity?
@Query("SELECT * FROM applicationPermission WHERE pkKey = :key AND type = :type AND kind = :kind AND relay = '*' LIMIT 1")
@Query("SELECT * FROM applicationPermission WHERE pkKey = :key AND type = :type AND kind = :kind AND (relay = '*' OR relay = '' OR relay IS NULL) LIMIT 1")
fun getWildcardRelayPermission(
key: String,
type: String,
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
+26 -2
View File
@@ -328,7 +328,19 @@ fun BunkerMultiEventHomeScreen(
if (request.rememberType.value != RememberType.NEVER && request.checked.value) {
val rejectKind = if (request.request is BunkerRequestSign) request.request.event.kind else null
val rejectRelay = if (request.request is BunkerRequestSign && request.request.event.kind == 22242) {
if (relayAuthScope == RelayAuthScope.ALL) "*" else (AmberEvent.relay(request.request.event) ?: "")
if (relayAuthScope == RelayAuthScope.ALL) {
"*"
} else {
(
AmberEvent.relay(request.request.event)?.let { url ->
try {
java.net.URI(url).host ?: url
} catch (e: Exception) {
url
}
} ?: ""
)
}
} else {
""
}
@@ -416,7 +428,19 @@ fun BunkerMultiEventHomeScreen(
if (request.rememberType.value != RememberType.NEVER && request.checked.value) {
val signRelay = if (localEvent.kind == 22242) {
if (relayAuthScope == RelayAuthScope.ALL) "*" else (AmberEvent.relay(localEvent) ?: "")
if (relayAuthScope == RelayAuthScope.ALL) {
"*"
} else {
(
AmberEvent.relay(localEvent)?.let { url ->
try {
java.net.URI(url).host ?: url
} catch (e: Exception) {
url
}
} ?: ""
)
}
} else {
""
}
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerSingleEventHomeScreen.kt
+8 -2
View File
@@ -619,8 +619,14 @@ fun BunkerSingleEventHomeScreen(
}
} else if (event.kind == 22242) {
// Kind 22242 = relay client authentication (NIP-42)
// Permission is per-relay URL extracted from the event's "relay" tag
val relayUrl = AmberEvent.relay(event) ?: ""
// Permission is per-relay hostname extracted from the event's "relay" tag
val relayUrl = AmberEvent.relay(event)?.let { url ->
try {
java.net.URI(url).host ?: url
} catch (e: Exception) {
url
}
} ?: ""
// Check for a relay-specific permission first, then wildcard "*" (all relays)
val permission = applicationEntity?.permissions?.firstOrNull {
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
+13 -1
View File
@@ -332,7 +332,19 @@ fun IntentMultiEventHomeScreen(
if (intentData.rememberType.value != RememberType.NEVER && intentData.checked.value) {
val rejectKind = if (intentData.type == SignerType.SIGN_EVENT) intentData.event?.kind else null
val rejectRelay = if (intentData.type == SignerType.SIGN_EVENT && intentData.event?.kind == 22242) {
if (relayAuthScope == RelayAuthScope.ALL) "*" else (intentData.event?.let { AmberEvent.relay(it) } ?: "")
if (relayAuthScope == RelayAuthScope.ALL) {
"*"
} else {
(
AmberEvent.relay(intentData.event)?.let { url ->
try {
java.net.URI(url).host ?: url
} catch (e: Exception) {
url
}
} ?: ""
)
}
} else {
""
}
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentSingleEventHomeScreen.kt
+8 -2
View File
@@ -245,8 +245,14 @@ fun IntentSingleEventHomeScreen(
}
} else if (event.kind == 22242) {
// Kind 22242 = relay client authentication (NIP-42)
// Permission is per-relay URL extracted from the event's "relay" tag
val relayUrl = AmberEvent.relay(event) ?: ""
// Permission is per-relay hostname extracted from the event's "relay" tag
val relayUrl = AmberEvent.relay(event)?.let { url ->
try {
java.net.URI(url).host ?: url
} catch (e: Exception) {
url
}
} ?: ""
// Check for relay-specific permission first, then wildcard "*" (all relays)
val permission = applicationEntity?.permissions?.firstOrNull {