Skip to content

Commit abfe78a

Browse files
feat(desktop): redesign Nostr bind verification flow (#1850)
Co-authored-by: tulsi <[email protected]>
1 parent 3e8dae7 commit abfe78a

6 files changed

Lines changed: 1070 additions & 141 deletions

File tree

‎desktop/playwright.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export default defineConfig({
9696
"**/onboarding-avatar-skip.spec.ts",
9797
"**/onboarding-backup.spec.ts",
9898
"**/onboarding-agent-defaults.spec.ts",
99+
"**/nostr-bind.spec.ts",
99100
"**/profile-nsec-reveal.spec.ts",
100101
"**/agent-provider-dropdowns.spec.ts",
101102
"**/agent-lifecycle-feedback.spec.ts",

‎desktop/src-tauri/src/deep_link.rs‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ struct NostrBindDeepLinkPayload {
9494
origin: String,
9595
expires_at: String,
9696
return_mode: String,
97+
callback_url: Option<String>,
9798
}
9899

99100
fn non_empty_param(url: &Url, name: &str) -> Result<String, String> {
@@ -104,6 +105,35 @@ fn non_empty_param(url: &Url, name: &str) -> Result<String, String> {
104105
.ok_or_else(|| format!("missing {name}"))
105106
}
106107

108+
fn optional_non_empty_param(url: &Url, name: &str) -> Option<String> {
109+
url.query_pairs()
110+
.find(|(key, _)| key == name)
111+
.map(|(_, value)| value.into_owned())
112+
.filter(|value| !value.is_empty())
113+
}
114+
115+
fn validate_nostr_bind_callback_url(callback_url: &str, origin: &str) -> Result<(), String> {
116+
let callback =
117+
Url::parse(callback_url).map_err(|error| format!("invalid callback_url: {error}"))?;
118+
let origin = Url::parse(origin).map_err(|error| format!("invalid origin: {error}"))?;
119+
if callback.scheme() != "https" {
120+
return Err("callback_url must use https".into());
121+
}
122+
if callback.host_str().is_none() {
123+
return Err("callback_url missing host".into());
124+
}
125+
if !callback.username().is_empty() || callback.password().is_some() {
126+
return Err("callback_url must not include credentials".into());
127+
}
128+
if callback.scheme() != origin.scheme()
129+
|| callback.host_str() != origin.host_str()
130+
|| callback.port_or_known_default() != origin.port_or_known_default()
131+
{
132+
return Err("callback_url must match origin".into());
133+
}
134+
Ok(())
135+
}
136+
107137
fn parse_nostr_bind_deep_link(url: &Url) -> Result<NostrBindDeepLinkPayload, String> {
108138
let challenge_id = non_empty_param(url, "challenge_id")?;
109139
let nonce = non_empty_param(url, "nonce")?;
@@ -115,6 +145,7 @@ fn parse_nostr_bind_deep_link(url: &Url) -> Result<NostrBindDeepLinkPayload, Str
115145
let origin = non_empty_param(url, "origin")?;
116146
let expires_at = non_empty_param(url, "expires_at")?;
117147
let return_mode = non_empty_param(url, "return")?;
148+
let callback_url = optional_non_empty_param(url, "callback_url");
118149

119150
nostr_bind::validate_challenge_id(&challenge_id)?;
120151
nostr_bind::validate_nonce(&nonce)?;
@@ -127,6 +158,9 @@ fn parse_nostr_bind_deep_link(url: &Url) -> Result<NostrBindDeepLinkPayload, Str
127158
if return_mode != nostr_bind::RETURN_MODE {
128159
return Err("unsupported return mode".into());
129160
}
161+
if let Some(callback_url) = callback_url.as_deref() {
162+
validate_nostr_bind_callback_url(callback_url, &origin)?;
163+
}
130164

131165
Ok(NostrBindDeepLinkPayload {
132166
challenge_id,
@@ -139,6 +173,7 @@ fn parse_nostr_bind_deep_link(url: &Url) -> Result<NostrBindDeepLinkPayload, Str
139173
origin,
140174
expires_at,
141175
return_mode,
176+
callback_url,
142177
})
143178
}
144179

@@ -341,6 +376,29 @@ mod tests {
341376
assert_eq!(payload.origin, "https://example.com");
342377
assert_eq!(payload.expires_at, "2999-01-01T00:00:00Z");
343378
assert_eq!(payload.return_mode, "clipboard");
379+
assert_eq!(payload.callback_url, None);
380+
}
381+
382+
#[test]
383+
fn parse_nostr_bind_deep_link_accepts_same_origin_callback_url() {
384+
let url = Url::parse("buzz://nostr-bind?challenge_id=550e8400-e29b-41d4-a716-446655440000&nonce=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi01234567&verification_code=123456&audience=buzz%3Anostr-identity&action=bind_nostr_identity&protocol=buzz-nostr-identity&version=1&origin=https%3A%2F%2Fexample.com&expires_at=2999-01-01T00%3A00%3A00Z&return=clipboard&callback_url=https%3A%2F%2Fexample.com%2Fbuzz%3FmockSession%3D1").unwrap();
385+
let payload = parse_nostr_bind_deep_link(&url).unwrap();
386+
assert_eq!(
387+
payload.callback_url.as_deref(),
388+
Some("https://example.com/buzz?mockSession=1")
389+
);
390+
}
391+
392+
#[test]
393+
fn parse_nostr_bind_deep_link_rejects_cross_origin_callback_url() {
394+
let url = Url::parse("buzz://nostr-bind?challenge_id=550e8400-e29b-41d4-a716-446655440000&nonce=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi01234567&verification_code=123456&audience=buzz%3Anostr-identity&action=bind_nostr_identity&protocol=buzz-nostr-identity&version=1&origin=https%3A%2F%2Fexample.com&expires_at=2999-01-01T00%3A00%3A00Z&return=clipboard&callback_url=https%3A%2F%2Fevil.example%2Fbuzz").unwrap();
395+
assert!(parse_nostr_bind_deep_link(&url).is_err());
396+
}
397+
398+
#[test]
399+
fn parse_nostr_bind_deep_link_rejects_http_callback_url() {
400+
let url = Url::parse("buzz://nostr-bind?challenge_id=550e8400-e29b-41d4-a716-446655440000&nonce=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi01234567&verification_code=123456&audience=buzz%3Anostr-identity&action=bind_nostr_identity&protocol=buzz-nostr-identity&version=1&origin=https%3A%2F%2Fexample.com&expires_at=2999-01-01T00%3A00%3A00Z&return=clipboard&callback_url=http%3A%2F%2Fexample.com%2Fbuzz").unwrap();
401+
assert!(parse_nostr_bind_deep_link(&url).is_err());
344402
}
345403

346404
#[test]

0 commit comments

Comments
 (0)