tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nwc: fix parsing issue with NIP-47 compliant NWC urls without double-slashes

Browse Source 
Closes: https://github.com/damus-io/damus/issues/1547
Changelog-Fixed: Fix parsing issue with NIP-47 compliant NWC urls without double-slashes
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
Reviewed-by: William Casarin <jb55@jb55.com>
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Daniel D’Aquino
2023-09-13 18:44:42 +00:00
committed by William Casarin
parent 1fc5ceff3b
commit b1e0a62109
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/Util/WalletConnect.swift
View File

@@ -36,11 +36,11 @@ struct WalletConnectURL: Equatable {
} }
init?(str: String) { init?(str: String) {
guard let url = URL(string: str), guard let components = URLComponents(string: str),
url.scheme == "nostrwalletconnect" || url.scheme == "nostr+walletconnect", components.scheme == "nostrwalletconnect" || components.scheme == "nostr+walletconnect",
let pkhost = url.host, // The line below provides flexibility for both `nostrwalletconnect://` (non-compliant, but commonly used) and `nostrwalletconnect:` (NIP-47 compliant) formats
let pubkey = hex_decode_pubkey(pkhost), let encoded_pubkey = components.path == "" ? components.host : components.path,
let components = URLComponents(url: url, resolvingAgainstBaseURL: true), let pubkey = hex_decode_pubkey(encoded_pubkey),
let items = components.queryItems, let items = components.queryItems,
let relay = items.first(where: { qi in qi.name == "relay" })?.value, let relay = items.first(where: { qi in qi.name == "relay" })?.value,
let relay_url = RelayURL(relay), let relay_url = RelayURL(relay),

26
damusTests/WalletConnectTests.swift
View File

@@ -36,6 +36,12 @@ final class WalletConnectTests: XCTestCase {
} }
func testDoesNWCParse() { func testDoesNWCParse() {
// Test an NWC url format which is not technically NIP-47 and RFC 3986 compliant, but still commonly used (by Alby, for example)
// See Github issue #1547 for details on why this URL is non-compliant
// This test URL also features:
// - `nostrwalletconnect` scheme
// - A non-url-encoded relay parameter
// - lud16 parameter
let pk = Pubkey(hex: "9d088f4760422443d4699b485e2ac66e565a2f5da1198c55ddc5679458e3f67a")! let pk = Pubkey(hex: "9d088f4760422443d4699b485e2ac66e565a2f5da1198c55ddc5679458e3f67a")!
let sec = Privkey(hex: "ff2eefd57196d42089e1b42acc39916d7ecac52e0625bd70597bbd5be14aff18")! let sec = Privkey(hex: "ff2eefd57196d42089e1b42acc39916d7ecac52e0625bd70597bbd5be14aff18")!
let relay = "wss://relay.getalby.com/v1" let relay = "wss://relay.getalby.com/v1"
@@ -51,6 +57,26 @@ final class WalletConnectTests: XCTestCase {
XCTAssertEqual(url.keypair.pubkey, privkey_to_pubkey(privkey: sec)) XCTAssertEqual(url.keypair.pubkey, privkey_to_pubkey(privkey: sec))
XCTAssertEqual(url.relay.id, relay) XCTAssertEqual(url.relay.id, relay)
XCTAssertEqual(url.lud16, "jb55@jb55.com") XCTAssertEqual(url.lud16, "jb55@jb55.com")
// Test an NWC url format which is NIP-47 and RFC 3986 compliant
// This test URL also features:
// - `nostr+walletconnect` scheme
// - A url-encoded relay parameter
// - No lud16 parameter
let pk_2 = Pubkey(hex: "b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4")!
let sec_2 = Privkey(hex: "71a8c14c1407c113601079c4302dab36460f0ccd0ad506f1f2dc73b5100e4f3c")!
let relay_2 = "wss://relay.damus.io"
let str_2 = "nostr+walletconnect:b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&secret=71a8c14c1407c113601079c4302dab36460f0ccd0ad506f1f2dc73b5100e4f3c"
let url_2 = WalletConnectURL(str: str_2)
XCTAssertNotNil(url_2)
guard let url_2 else {
return
}
XCTAssertEqual(url_2.pubkey, pk_2)
XCTAssertEqual(url_2.keypair.privkey, sec_2)
XCTAssertEqual(url_2.keypair.pubkey, privkey_to_pubkey(privkey: sec_2))
XCTAssertEqual(url_2.relay.id, relay_2)
} }
func testNWCEphemeralRelay() { func testNWCEphemeralRelay() {