| author | |
| committer | |
| log | 6baed795fd800aa9f5dc8a1a5cae8ddea135bea7 |
| tree | 23343d05dc9a4b3c7ed14ede36887f244b55bdf5 |
| parent | 67f5fa76f24bfe7b46c5bb0f0ebc48ebea1b0473 |
| signature | Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU |
Resolve GitHub IDs and verified AT DIDs before granting knife-native access. Reserve Astheno names until the first verified sign-in, without rebinding existing identities.
Assisted-by: claude-sonnet-5.58 files changed, 329 insertions(+), 34 deletions(-)
dashboard/src/atproto.rs+7-1| ... | @@ -403,7 +403,8 @@ async fn post( | ... | @@ -403,7 +403,8 @@ async fn post( |
| 403 | Err(reject()) | 403 | Err(reject()) |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | pub async fn start(auth: &auth::Store, identifier: &str, next: &str) -> Result<(String, String)> { | 406 | /// The DID, PDS, and bidirectionally verified handle for a handle or DID. |
| 407 | pub async fn resolve(identifier: &str) -> Result<(String, Url, Option<String>)> { | ||
| 407 | let identifier = identifier.trim().trim_start_matches('@'); | 408 | let identifier = identifier.trim().trim_start_matches('@'); |
| 408 | let did = if identifier.starts_with("did:") { | 409 | let did = if identifier.starts_with("did:") { |
| 409 | did_url(identifier)?; | 410 | did_url(identifier)?; |
| ... | @@ -417,6 +418,11 @@ pub async fn start(auth: &auth::Store, identifier: &str, next: &str) -> Result<( | ... | @@ -417,6 +418,11 @@ pub async fn start(auth: &auth::Store, identifier: &str, next: &str) -> Result<( |
| 417 | { | 418 | { |
| 418 | return Err(reject()); | 419 | return Err(reject()); |
| 419 | } | 420 | } |
| 421 | Ok((did, pds, handle)) | ||
| 422 | } | ||
| 423 | |||
| 424 | pub async fn start(auth: &auth::Store, identifier: &str, next: &str) -> Result<(String, String)> { | ||
| 425 | let (did, pds, _) = resolve(identifier).await?; | ||
| 420 | let server = server(&pds).await?; | 426 | let server = server(&pds).await?; |
| 421 | let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1)?; | 427 | let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1)?; |
| 422 | let key = EcKey::generate(&group)?; | 428 | let key = EcKey::generate(&group)?; |
dashboard/src/guest.rs+254-29| ... | @@ -309,7 +309,7 @@ async fn exchange( | ... | @@ -309,7 +309,7 @@ async fn exchange( |
| 309 | code: &str, | 309 | code: &str, |
| 310 | callback: &str, | 310 | callback: &str, |
| 311 | flow: &Value, | 311 | flow: &Value, |
| 312 | ) -> Result<(String, String, Option<String>)> { | 312 | ) -> Result<(String, String, Option<String>, Option<String>)> { |
| 313 | let form = [ | 313 | let form = [ |
| 314 | ("client_id", client), | 314 | ("client_id", client), |
| 315 | ("client_secret", secret), | 315 | ("client_secret", secret), |
| ... | @@ -366,7 +366,7 @@ async fn exchange( | ... | @@ -366,7 +366,7 @@ async fn exchange( |
| 366 | "GitHub couldn't verify your account. Return to Shale and try again.", | 366 | "GitHub couldn't verify your account. Return to Shale and try again.", |
| 367 | ) | 367 | ) |
| 368 | })?; | 368 | })?; |
| 369 | return Ok((id.to_string(), login.to_owned(), None)); | 369 | return Ok((id.to_string(), login.to_owned(), None, None)); |
| 370 | } | 370 | } |
| 371 | let mut form = form.to_vec(); | 371 | let mut form = form.to_vec(); |
| 372 | form.push(("state", "none")); | 372 | form.push(("state", "none")); |
| ... | @@ -451,7 +451,42 @@ async fn exchange( | ... | @@ -451,7 +451,42 @@ async fn exchange( |
| 451 | && url.password().is_none() | 451 | && url.password().is_none() |
| 452 | }) | 452 | }) |
| 453 | .map(String::from); | 453 | .map(String::from); |
| 454 | Ok((string(&profile["sub"]).to_owned(), name, picture)) | 454 | Ok(( |
| 455 | string(&profile["sub"]).to_owned(), | ||
| 456 | name, | ||
| 457 | picture, | ||
| 458 | profile["preferred_username"] | ||
| 459 | .as_str() | ||
| 460 | .map(str::to_lowercase), | ||
| 461 | )) | ||
| 462 | } | ||
| 463 | |||
| 464 | fn username(provider: &str, subject: &str) -> String { | ||
| 465 | let suffix = if provider == "github" { | ||
| 466 | subject.to_owned() | ||
| 467 | } else { | ||
| 468 | mcp::hash(subject)[..24].to_owned() | ||
| 469 | }; | ||
| 470 | format!("guest-{provider}-{suffix}") | ||
| 471 | } | ||
| 472 | |||
| 473 | fn create( | ||
| 474 | db: &Connection, | ||
| 475 | provider: &str, | ||
| 476 | username: &str, | ||
| 477 | name: &str, | ||
| 478 | picture: Option<&str>, | ||
| 479 | ) -> Result<String> { | ||
| 480 | let id = uuid::Uuid::new_v4().to_string(); | ||
| 481 | let mut profile = json!({"kind":"guest","guestProvider":provider,"username":username,"enabled":true,"email":null,"emailVerified":false,"firstName":name,"lastName":null,"requiredActions":[],"attributes":{},"createdTimestamp":(now()*1000.0) as i64}); | ||
| 482 | if let Some(picture) = picture { | ||
| 483 | profile["attributes"]["picture"] = json!([picture]); | ||
| 484 | } | ||
| 485 | db.execute( | ||
| 486 | "INSERT INTO users(id,profile) VALUES (?,?)", | ||
| 487 | sql![id, profile.to_string()], | ||
| 488 | )?; | ||
| 489 | Ok(id) | ||
| 455 | } | 490 | } |
| 456 | 491 | ||
| 457 | fn account( | 492 | fn account( |
| ... | @@ -485,20 +520,7 @@ fn account( | ... | @@ -485,20 +520,7 @@ fn account( |
| 485 | tx.commit()?; | 520 | tx.commit()?; |
| 486 | return Ok(id); | 521 | return Ok(id); |
| 487 | } | 522 | } |
| 488 | let id = uuid::Uuid::new_v4().to_string(); | 523 | let id = create(&tx, provider, &username(provider, subject), name, picture)?; |
| 489 | let suffix = if provider == "github" { | ||
| 490 | subject.to_owned() | ||
| 491 | } else { | ||
| 492 | mcp::hash(subject)[..24].to_owned() | ||
| 493 | }; | ||
| 494 | let mut profile = json!({"kind":"guest","guestProvider":provider,"username":format!("guest-{provider}-{suffix}"),"enabled":true,"email":null,"emailVerified":false,"firstName":name,"lastName":null,"requiredActions":[],"attributes":{},"createdTimestamp":(now()*1000.0) as i64}); | ||
| 495 | if let Some(picture) = picture { | ||
| 496 | profile["attributes"]["picture"] = json!([picture]); | ||
| 497 | } | ||
| 498 | tx.execute( | ||
| 499 | "INSERT INTO users(id,profile) VALUES (?,?)", | ||
| 500 | sql![id, profile.to_string()], | ||
| 501 | )?; | ||
| 502 | tx.execute( | 524 | tx.execute( |
| 503 | "INSERT INTO external_identities VALUES (?,?,?)", | 525 | "INSERT INTO external_identities VALUES (?,?,?)", |
| 504 | sql![provider, subject, id], | 526 | sql![provider, subject, id], |
| ... | @@ -507,6 +529,138 @@ fn account( | ... | @@ -507,6 +529,138 @@ fn account( |
| 507 | Ok(id) | 529 | Ok(id) |
| 508 | } | 530 | } |
| 509 | 531 | ||
| 532 | /// Astheno's per-client subjects require binding reserved names at verified sign-in. | ||
| 533 | fn claim(auth: &auth::Store, subject: &str, username: &str) -> Result<()> { | ||
| 534 | auth.db.lock().unwrap().execute( | ||
| 535 | "INSERT OR IGNORE INTO external_identities SELECT 'astheno',?,id FROM users WHERE username=? AND id NOT IN (SELECT user_id FROM external_identities)", | ||
| 536 | sql![subject, format!("guest-astheno-{username}")], | ||
| 537 | )?; | ||
| 538 | Ok(()) | ||
| 539 | } | ||
| 540 | |||
| 541 | fn grant(auth: &auth::Store, provider: &str, subject: Option<&str>, name: &str) -> Result<Value> { | ||
| 542 | let mut db = auth.db.lock().unwrap(); | ||
| 543 | let tx = db.transaction()?; | ||
| 544 | let known: Vec<String> = match subject { | ||
| 545 | Some(subject) => vec![subject.to_owned()], | ||
| 546 | None => tx | ||
| 547 | .prepare("SELECT subject FROM external_identities JOIN users ON users.id=user_id WHERE provider=? AND lower(json_extract(profile,'$.firstName'))=?")? | ||
| 548 | .query_map(sql![provider, name], |r| r.get(0))? | ||
| 549 | .collect::<std::result::Result<_, _>>()?, | ||
| 550 | }; | ||
| 551 | if known.len() > 1 { | ||
| 552 | return Err(Error::new( | ||
| 553 | 409, | ||
| 554 | "Several accounts have signed in with that name. Open the right one under guests and join it to knife-native.", | ||
| 555 | )); | ||
| 556 | } | ||
| 557 | let username = match known.first() { | ||
| 558 | Some(subject) => username(provider, subject), | ||
| 559 | None => format!("guest-{provider}-{name}"), | ||
| 560 | }; | ||
| 561 | let existing: Option<String> = tx | ||
| 562 | .query_row("SELECT id FROM users WHERE username=?", [&username], |r| r.get(0)) | ||
| 563 | .optional()?; | ||
| 564 | let id = match &existing { | ||
| 565 | Some(id) => id.clone(), | ||
| 566 | None => { | ||
| 567 | let id = create(&tx, provider, &username, name, None)?; | ||
| 568 | if let Some(subject) = subject { | ||
| 569 | tx.execute( | ||
| 570 | "INSERT INTO external_identities VALUES (?,?,?)", | ||
| 571 | sql![provider, subject, id], | ||
| 572 | )?; | ||
| 573 | } | ||
| 574 | id | ||
| 575 | } | ||
| 576 | }; | ||
| 577 | tx.execute( | ||
| 578 | "INSERT OR IGNORE INTO memberships SELECT ?,id FROM roles WHERE name='knife-native'", | ||
| 579 | [&id], | ||
| 580 | )?; | ||
| 581 | tx.commit()?; | ||
| 582 | Ok(json!({"id":id,"created":existing.is_none()})) | ||
| 583 | } | ||
| 584 | |||
| 585 | async fn github_user(http: &reqwest::Client, login: &str) -> Result<(u64, String)> { | ||
| 586 | if login.is_empty() | ||
| 587 | || login.len() > 39 | ||
| 588 | || login.starts_with('-') | ||
| 589 | || !login.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') | ||
| 590 | { | ||
| 591 | return Err(Error::new(400, "Enter a GitHub username.")); | ||
| 592 | } | ||
| 593 | let unavailable = || Error::new(502, "GitHub didn't answer. Try again in a minute."); | ||
| 594 | let response = http | ||
| 595 | .get(format!("https://api.github.com/users/{login}")) | ||
| 596 | .send() | ||
| 597 | .await | ||
| 598 | .map_err(|_| unavailable())?; | ||
| 599 | if response.status() == StatusCode::NOT_FOUND { | ||
| 600 | return Err(Error::new(404, format!("GitHub has no user named {login}."))); | ||
| 601 | } | ||
| 602 | let profile = json_bytes(&response_bytes(response).await.map_err(|_| unavailable())?) | ||
| 603 | .map_err(|_| unavailable())?; | ||
| 604 | match (profile["id"].as_u64(), profile["login"].as_str()) { | ||
| 605 | (Some(id), Some(name)) if id > 0 && name.eq_ignore_ascii_case(login) => { | ||
| 606 | Ok((id, name.to_owned())) | ||
| 607 | } | ||
| 608 | _ => Err(unavailable()), | ||
| 609 | } | ||
| 610 | } | ||
| 611 | |||
| 612 | pub async fn add(auth: &auth::Store, provider: &str, handle: &str) -> Result<Value> { | ||
| 613 | let label = known(provider)?; | ||
| 614 | let registered: bool = auth.db.lock().unwrap().query_row( | ||
| 615 | "SELECT ?1='atproto' OR EXISTS(SELECT 1 FROM guest_providers WHERE id=?1)", | ||
| 616 | [provider], | ||
| 617 | |r| r.get(0), | ||
| 618 | )?; | ||
| 619 | if !registered { | ||
| 620 | return Err(Error::new( | ||
| 621 | 409, | ||
| 622 | format!("{label} sign-in isn't set up. Register it with tools/guest-provider.py {provider}."), | ||
| 623 | )); | ||
| 624 | } | ||
| 625 | let handle = handle.trim().trim_start_matches('@'); | ||
| 626 | match provider { | ||
| 627 | "github" => { | ||
| 628 | let (id, login) = github_user(&http()?, handle).await?; | ||
| 629 | grant(auth, provider, Some(&id.to_string()), &login) | ||
| 630 | } | ||
| 631 | "atproto" => { | ||
| 632 | let (did, _, handle) = atproto::resolve(handle).await.map_err(|_| { | ||
| 633 | Error::new(404, "Couldn't find that AT handle. Check the spelling.") | ||
| 634 | })?; | ||
| 635 | let name = handle.unwrap_or_else(|| did.clone()); | ||
| 636 | grant(auth, provider, Some(&did), &name) | ||
| 637 | } | ||
| 638 | _ => { | ||
| 639 | let name = handle.to_lowercase(); | ||
| 640 | if name.len() > 16 | ||
| 641 | || !name.starts_with(|c: char| c.is_ascii_alphanumeric()) | ||
| 642 | || !name.bytes().all(|b| b.is_ascii_alphanumeric() || b"._-".contains(&b)) | ||
| 643 | { | ||
| 644 | return Err(Error::new(400, "Enter an Astheno username.")); | ||
| 645 | } | ||
| 646 | grant(auth, provider, None, &name) | ||
| 647 | } | ||
| 648 | } | ||
| 649 | } | ||
| 650 | |||
| 651 | fn http() -> Result<reqwest::Client> { | ||
| 652 | Ok(reqwest::Client::builder() | ||
| 653 | .timeout(Duration::from_secs(10)) | ||
| 654 | .redirect(reqwest::redirect::Policy::none()) | ||
| 655 | .user_agent("Snow Globe guest sign-in") | ||
| 656 | .default_headers({ | ||
| 657 | let mut headers = HeaderMap::new(); | ||
| 658 | headers.insert("accept", "application/json".parse().unwrap()); | ||
| 659 | headers | ||
| 660 | }) | ||
| 661 | .build()?) | ||
| 662 | } | ||
| 663 | |||
| 510 | fn fields(query: &str) -> Result<HashMap<String, String>> { | 664 | fn fields(query: &str) -> Result<HashMap<String, String>> { |
| 511 | let mut map = HashMap::new(); | 665 | let mut map = HashMap::new(); |
| 512 | for (k, v) in url::form_urlencoded::parse(query.as_bytes()) { | 666 | for (k, v) in url::form_urlencoded::parse(query.as_bytes()) { |
| ... | @@ -709,18 +863,11 @@ async fn handle(app: &App, request: Request) -> Result<Response> { | ... | @@ -709,18 +863,11 @@ async fn handle(app: &App, request: Request) -> Result<Response> { |
| 709 | return auth.create_session(&id, "dashboard", headers, None); | 863 | return auth.create_session(&id, "dashboard", headers, None); |
| 710 | } | 864 | } |
| 711 | let (client, secret) = registration(auth, provider)?; | 865 | let (client, secret) = registration(auth, provider)?; |
| 712 | let http = reqwest::Client::builder() | 866 | let (subject, name, picture, handle) = |
| 713 | .timeout(Duration::from_secs(10)) | 867 | exchange(&http()?, provider, &client, &secret, code, &callback, &flow).await?; |
| 714 | .redirect(reqwest::redirect::Policy::none()) | 868 | if let Some(handle) = handle { |
| 715 | .user_agent("Snow Globe guest sign-in") | 869 | claim(auth, &subject, &handle)?; |
| 716 | .default_headers({ | 870 | } |
| 717 | let mut headers = HeaderMap::new(); | ||
| 718 | headers.insert("accept", "application/json".parse().unwrap()); | ||
| 719 | headers | ||
| 720 | }) | ||
| 721 | .build()?; | ||
| 722 | let (subject, name, picture) = | ||
| 723 | exchange(&http, provider, &client, &secret, code, &callback, &flow).await?; | ||
| 724 | let id = account(auth, provider, &subject, &name, picture.as_deref())?; | 871 | let id = account(auth, provider, &subject, &name, picture.as_deref())?; |
| 725 | auth.create_session(&id, "dashboard", headers, None) | 872 | auth.create_session(&id, "dashboard", headers, None) |
| 726 | } | 873 | } |
| ... | @@ -1011,4 +1158,82 @@ mod tests { | ... | @@ -1011,4 +1158,82 @@ mod tests { |
| 1011 | drop(auth); | 1158 | drop(auth); |
| 1012 | std::fs::remove_dir_all(path).unwrap(); | 1159 | std::fs::remove_dir_all(path).unwrap(); |
| 1013 | } | 1160 | } |
| 1161 | |||
| 1162 | fn members(auth: &auth::Store, id: &str) -> Value { | ||
| 1163 | auth::user(&auth.db.lock().unwrap(), id).unwrap()["groups"].clone() | ||
| 1164 | } | ||
| 1165 | |||
| 1166 | #[test] | ||
| 1167 | fn added_guests_are_the_accounts_their_first_sign_in_finds() { | ||
| 1168 | let path = std::env::temp_dir().join(format!("guest-add-test-{}", uuid::Uuid::new_v4())); | ||
| 1169 | let auth = auth::Store::new( | ||
| 1170 | &path, | ||
| 1171 | "https://snowglobe.paperclover.net", | ||
| 1172 | "https://file.paperclover.net", | ||
| 1173 | "auth.paperclover.net", | ||
| 1174 | ) | ||
| 1175 | .unwrap(); | ||
| 1176 | for (provider, subject) in [("github", "123"), ("atproto", "did:plc:ewvi7nxzyoun6zhxrhs64oiz")] { | ||
| 1177 | let added = grant(&auth, provider, Some(subject), "octo").unwrap(); | ||
| 1178 | let id = string(&added["id"]); | ||
| 1179 | assert_eq!(added["created"], true); | ||
| 1180 | assert_eq!(members(&auth, id)[0]["name"], "knife-native"); | ||
| 1181 | assert_eq!(account(&auth, provider, subject, "renamed", None).unwrap(), id); | ||
| 1182 | assert_eq!(grant(&auth, provider, Some(subject), "octo").unwrap()["created"], false); | ||
| 1183 | assert_eq!(members(&auth, id).as_array().unwrap().len(), 1); | ||
| 1184 | } | ||
| 1185 | |||
| 1186 | let reserved = string(&grant(&auth, "astheno", None, "alice").unwrap()["id"]).to_owned(); | ||
| 1187 | let identities = |id: &str| -> i64 { | ||
| 1188 | auth.db.lock().unwrap().query_row("SELECT count(*) FROM external_identities WHERE user_id=?", [id], |r| r.get(0)).unwrap() | ||
| 1189 | }; | ||
| 1190 | assert_eq!(identities(&reserved), 0); | ||
| 1191 | claim(&auth, "sub-2", "mallory").unwrap(); | ||
| 1192 | assert_eq!(identities(&reserved), 0); | ||
| 1193 | let stranger = account(&auth, "astheno", "sub-2", "mallory", None).unwrap(); | ||
| 1194 | assert_ne!(stranger, reserved); | ||
| 1195 | assert_eq!(members(&auth, &stranger), json!([])); | ||
| 1196 | claim(&auth, "sub-1", "alice").unwrap(); | ||
| 1197 | assert_eq!(account(&auth, "astheno", "sub-1", "alice", None).unwrap(), reserved); | ||
| 1198 | assert_eq!(members(&auth, &reserved)[0]["name"], "knife-native"); | ||
| 1199 | claim(&auth, "sub-3", "alice").unwrap(); | ||
| 1200 | let impostor = account(&auth, "astheno", "sub-3", "alice", None).unwrap(); | ||
| 1201 | assert_ne!(impostor, reserved); | ||
| 1202 | assert_eq!(members(&auth, &impostor), json!([])); | ||
| 1203 | |||
| 1204 | let earlier = account(&auth, "astheno", "sub-9", "carol", None).unwrap(); | ||
| 1205 | let added = grant(&auth, "astheno", None, "carol").unwrap(); | ||
| 1206 | assert_eq!((string(&added["id"]), &added["created"]), (earlier.as_str(), &json!(false))); | ||
| 1207 | assert_eq!(members(&auth, &earlier)[0]["name"], "knife-native"); | ||
| 1208 | account(&auth, "astheno", "sub-5", "dave", None).unwrap(); | ||
| 1209 | account(&auth, "astheno", "sub-6", "dave", None).unwrap(); | ||
| 1210 | assert_eq!(grant(&auth, "astheno", None, "dave").unwrap_err().status, 409); | ||
| 1211 | drop(auth); | ||
| 1212 | std::fs::remove_dir_all(path).unwrap(); | ||
| 1213 | } | ||
| 1214 | |||
| 1215 | #[tokio::test] | ||
| 1216 | async fn adding_needs_a_registered_provider_and_a_plausible_name() { | ||
| 1217 | let path = std::env::temp_dir().join(format!("guest-add-test-{}", uuid::Uuid::new_v4())); | ||
| 1218 | let auth = auth::Store::new( | ||
| 1219 | &path, | ||
| 1220 | "https://snowglobe.paperclover.net", | ||
| 1221 | "https://file.paperclover.net", | ||
| 1222 | "auth.paperclover.net", | ||
| 1223 | ) | ||
| 1224 | .unwrap(); | ||
| 1225 | assert_eq!(add(&auth, "astheno", "alice").await.unwrap_err().status, 409); | ||
| 1226 | assert_eq!(add(&auth, "gitlab", "alice").await.unwrap_err().status, 404); | ||
| 1227 | provision(&auth, json!({"provider":"astheno","enabled":true,"clientId":"client","clientSecret":"0123456789abcdef"})).unwrap(); | ||
| 1228 | for name in ["", "has space", "-alice", "a-name-over-sixteen"] { | ||
| 1229 | assert_eq!(add(&auth, "astheno", name).await.unwrap_err().status, 400, "{name}"); | ||
| 1230 | } | ||
| 1231 | let added = add(&auth, "astheno", " @Alice ").await.unwrap(); | ||
| 1232 | assert_eq!( | ||
| 1233 | auth::user(&auth.db.lock().unwrap(), string(&added["id"])).unwrap()["username"], | ||
| 1234 | "guest-astheno-alice" | ||
| 1235 | ); | ||
| 1236 | drop(auth); | ||
| 1237 | std::fs::remove_dir_all(path).unwrap(); | ||
| 1238 | } | ||
| 1014 | } | 1239 | } |
dashboard/src/users.rs+6| ... | @@ -200,6 +200,12 @@ pub async fn route( | ... | @@ -200,6 +200,12 @@ pub async fn route( |
| 200 | } | 200 | } |
| 201 | return Ok(StatusCode::NO_CONTENT.into_response()); | 201 | return Ok(StatusCode::NO_CONTENT.into_response()); |
| 202 | } | 202 | } |
| 203 | if parts == ["guests"] && method == Method::POST { | ||
| 204 | return Ok(axum::Json( | ||
| 205 | guest::add(&app.auth, string(&body["provider"]), string(&body["handle"])).await?, | ||
| 206 | ) | ||
| 207 | .into_response()); | ||
| 208 | } | ||
| 203 | if parts.is_empty() && method == Method::GET { | 209 | if parts.is_empty() && method == Method::GET { |
| 204 | let db = app.auth.db.lock().unwrap(); | 210 | let db = app.auth.db.lock().unwrap(); |
| 205 | let mut statement = db.prepare("SELECT id FROM users WHERE coalesce(json_extract(profile,'$.kind'),'')!='ai' ORDER BY username")?; | 211 | let mut statement = db.prepare("SELECT id FROM users WHERE coalesce(json_extract(profile,'$.kind'),'')!='ai' ORDER BY username")?; |
dashboard/web/api.contract.ts+3| ... | @@ -231,6 +231,9 @@ export type Api = Hono<{}, { | ... | @@ -231,6 +231,9 @@ export type Api = Hono<{}, { |
| 231 | $get: Endpoint<{users:(User & {sessions:Session[]})[]; groups:Group[]}>; | 231 | $get: Endpoint<{users:(User & {sessions:Session[]})[]; groups:Group[]}>; |
| 232 | $post: Endpoint<{ id: string; url: string | null }, { json: { profile: { email: string; firstName: string; lastName: string; username: string; }; groups: string[]; setup: { kind: "invite"; } | { kind: "password"; password: string; }; }; }, 201>; | 232 | $post: Endpoint<{ id: string; url: string | null }, { json: { profile: { email: string; firstName: string; lastName: string; username: string; }; groups: string[]; setup: { kind: "invite"; } | { kind: "password"; password: string; }; }; }, 201>; |
| 233 | }; | 233 | }; |
| 234 | "/users/guests": { | ||
| 235 | $post: Endpoint<{ id: string; created: boolean }, { json: { provider: "github" | "astheno" | "atproto"; handle: string; }; }>; | ||
| 236 | }; | ||
| 234 | "/users/:id": { | 237 | "/users/:id": { |
| 235 | $patch: Endpoint<null, { param: { id: string; }; } & { json: { username?: string | undefined; email?: string | undefined; firstName?: string | undefined; lastName?: string | undefined; enabled?: boolean | undefined; emailVerified?: boolean | undefined; requiredActions?: string[] | undefined; }; }, 204, "body">; | 238 | $patch: Endpoint<null, { param: { id: string; }; } & { json: { username?: string | undefined; email?: string | undefined; firstName?: string | undefined; lastName?: string | undefined; enabled?: boolean | undefined; emailVerified?: boolean | undefined; requiredActions?: string[] | undefined; }; }, 204, "body">; |
| 236 | $delete: Endpoint<null, { param: { id: string; }; }, 204, "body">; | 239 | $delete: Endpoint<null, { param: { id: string; }; }, 204, "body">; |
dashboard/web/pages/Users.css+18| ... | @@ -28,6 +28,24 @@ | ... | @@ -28,6 +28,24 @@ |
| 28 | .grant :is(img, .monogram, .icon) { flex: none; width: 15px; height: 15px; font-size: 9px; border-radius: 22%; } | 28 | .grant :is(img, .monogram, .icon) { flex: none; width: 15px; height: 15px; font-size: 9px; border-radius: 22%; } |
| 29 | .grant.dash .icon { color: var(--muted); border-radius: 0; } | 29 | .grant.dash .icon { color: var(--muted); border-radius: 0; } |
| 30 | 30 | ||
| 31 | .guest-menu { | ||
| 32 | inset: auto; | ||
| 33 | top: anchor(bottom); | ||
| 34 | right: anchor(right); | ||
| 35 | min-width: 190px; | ||
| 36 | margin: 6px 0 0; | ||
| 37 | padding: 4px; | ||
| 38 | border: 1px solid var(--line); | ||
| 39 | border-radius: var(--radius-lg); | ||
| 40 | background: var(--surface); | ||
| 41 | color: var(--text); | ||
| 42 | box-shadow: 0 8px 28px #0005; | ||
| 43 | font-size: 13px; | ||
| 44 | } | ||
| 45 | .guest-menu:popover-open { animation: menu-in 200ms var(--ease-out); } | ||
| 46 | .guest-menu button { display: block; width: 100%; padding: 7px 10px; border: 0; border-radius: var(--radius); background: none; color: inherit; font: inherit; text-align: left; cursor: pointer; } | ||
| 47 | .guest-menu button:is(:hover, :focus-visible) { background: var(--hover); } | ||
| 48 | |||
| 31 | .users-toolbar { display: flex; align-items: center; gap: 8px; margin: 6px 0 8px; } | 49 | .users-toolbar { display: flex; align-items: center; gap: 8px; margin: 6px 0 8px; } |
| 32 | .users-toolbar .count { margin-left: 6px; opacity: 0.7; font-variant-numeric: tabular-nums; } | 50 | .users-toolbar .count { margin-left: 6px; opacity: 0.7; font-variant-numeric: tabular-nums; } |
| 33 | 51 |
dashboard/web/pages/Users.tsx+38-1| ... | @@ -1,5 +1,6 @@ | ... | @@ -1,5 +1,6 @@ |
| 1 | import { A, useNavigate, useParams, useSearchParams } from "@solidjs/router"; | 1 | import { A, useNavigate, useParams, useSearchParams } from "@solidjs/router"; |
| 2 | import ArrowLeft from "lucide-solid/icons/arrow-left"; | 2 | import ArrowLeft from "lucide-solid/icons/arrow-left"; |
| 3 | import ChevronDown from "lucide-solid/icons/chevron-down"; | ||
| 3 | import Search from "lucide-solid/icons/search"; | 4 | import Search from "lucide-solid/icons/search"; |
| 4 | import UserPlus from "lucide-solid/icons/user-plus"; | 5 | import UserPlus from "lucide-solid/icons/user-plus"; |
| 5 | import X from "lucide-solid/icons/x"; | 6 | import X from "lucide-solid/icons/x"; |
| ... | @@ -27,6 +28,12 @@ import { FolderAccess } from "./Shares.tsx"; | ... | @@ -27,6 +28,12 @@ import { FolderAccess } from "./Shares.tsx"; |
| 27 | 28 | ||
| 28 | const STEPS: [string, string][] = [["SETUP", "finish setup"], ["UPDATE_PASSWORD", "new password"], ["UPDATE_PROFILE", "check profile"]]; | 29 | const STEPS: [string, string][] = [["SETUP", "finish setup"], ["UPDATE_PASSWORD", "new password"], ["UPDATE_PROFILE", "check profile"]]; |
| 29 | 30 | ||
| 31 | const GUESTS = { | ||
| 32 | github: { name: "GitHub", field: "GitHub username", placeholder: "octocat" }, | ||
| 33 | astheno: { name: "Astheno", field: "Astheno username", placeholder: "janedoe" }, | ||
| 34 | atproto: { name: "AT Protocol", field: "AT handle", placeholder: "alice.bsky.social" }, | ||
| 35 | } as const; | ||
| 36 | |||
| 30 | const STATES = { all: "users", guests: "guests", disabled: "disabled", pending: "setup pending" } as const; | 37 | const STATES = { all: "users", guests: "guests", disabled: "disabled", pending: "setup pending" } as const; |
| 31 | 38 | ||
| 32 | type Params = { q?: string; group?: string; state?: keyof typeof STATES }; | 39 | type Params = { q?: string; group?: string; state?: keyof typeof STATES }; |
| ... | @@ -214,6 +221,28 @@ function List(props: { data: Resource<Data>; ready: Accessor<Data | undefined>; | ... | @@ -214,6 +221,28 @@ function List(props: { data: Resource<Data>; ready: Accessor<Data | undefined>; |
| 214 | .toSorted((a, b) => a.username.localeCompare(b.username)); | 221 | .toSorted((a, b) => a.username.localeCompare(b.username)); |
| 215 | }; | 222 | }; |
| 216 | const selectable = () => shown(ready()?.users ?? []).filter((user) => user.kind !== "guest"); | 223 | const selectable = () => shown(ready()?.users ?? []).filter((user) => user.kind !== "guest"); |
| 224 | let guestMenu!: HTMLDivElement; | ||
| 225 | let guestTrigger!: HTMLButtonElement; | ||
| 226 | const addGuest = (provider: keyof typeof GUESTS) => { | ||
| 227 | const guest = GUESTS[provider]; | ||
| 228 | guestMenu.hidePopover(); | ||
| 229 | showTextDialog({ | ||
| 230 | title: `Add ${guest.name} guest`, | ||
| 231 | description: "They can sign in to Shale and open The Knife’s Native UI.", | ||
| 232 | label: guest.field, | ||
| 233 | placeholder: guest.placeholder, | ||
| 234 | body: provider === "astheno" ? () => <div class="field"><span class="hint">Astheno can’t look names up. The first person to sign in with this username gets the access.</span></div> : undefined, | ||
| 235 | confirmLabel: "add guest", | ||
| 236 | returnFocus: guestTrigger, | ||
| 237 | onConfirm: async (handle) => { | ||
| 238 | const { id, created } = await parseResponse(api.users.guests.$post({ json: { provider, handle } })); | ||
| 239 | await props.refetch(); | ||
| 240 | const user = ready()?.users.find((user) => user.id === id); | ||
| 241 | if (user) open(user); | ||
| 242 | if (!created) toast(`${user?.username ?? "That person"} was already a guest`); | ||
| 243 | }, | ||
| 244 | }); | ||
| 245 | }; | ||
| 217 | const create = (groups: Group[]) => showConfirmDialog({ | 246 | const create = (groups: Group[]) => showConfirmDialog({ |
| 218 | title: "New user", | 247 | title: "New user", |
| 219 | confirmLabel: "create user", | 248 | confirmLabel: "create user", |
| ... | @@ -277,6 +306,14 @@ function List(props: { data: Resource<Data>; ready: Accessor<Data | undefined>; | ... | @@ -277,6 +306,14 @@ function List(props: { data: Resource<Data>; ready: Accessor<Data | undefined>; |
| 277 | <button class="button" onClick={() => setSelection(new Set<string>())}>clear selection</button> | 306 | <button class="button" onClick={() => setSelection(new Set<string>())}>clear selection</button> |
| 278 | </Show> | 307 | </Show> |
| 279 | <span class="spacer" /> | 308 | <span class="spacer" /> |
| 309 | <button ref={guestTrigger} class="button" popovertarget="add-guest" style={{ "anchor-name": "--add-guest" }}> | ||
| 310 | add guest<ChevronDown size={14} /> | ||
| 311 | </button> | ||
| 312 | <div ref={guestMenu} id="add-guest" popover class="guest-menu" style={{ "position-anchor": "--add-guest" }}> | ||
| 313 | <For each={Object.keys(GUESTS) as (keyof typeof GUESTS)[]}> | ||
| 314 | {(provider) => <button type="button" onClick={() => addGuest(provider)}>{GUESTS[provider].field}</button>} | ||
| 315 | </For> | ||
| 316 | </div> | ||
| 280 | <button class="button primary" disabled={!ready()} onClick={() => create(ready()!.groups)}> | 317 | <button class="button primary" disabled={!ready()} onClick={() => create(ready()!.groups)}> |
| 281 | <UserPlus size={14} />new user | 318 | <UserPlus size={14} />new user |
| 282 | </button> | 319 | </button> |
| ... | @@ -601,7 +638,7 @@ function Profile(props: { user: User; data: Data; refetch: () => unknown }) { | ... | @@ -601,7 +638,7 @@ function Profile(props: { user: User; data: Data; refetch: () => unknown }) { |
| 601 | <span class="spacer" /> | 638 | <span class="spacer" /> |
| 602 | <Show when={props.user.kind !== "guest"}><button class="button small" onClick={setPassword}>set password</button></Show> | 639 | <Show when={props.user.kind !== "guest"}><button class="button small" onClick={setPassword}>set password</button></Show> |
| 603 | </h2> | 640 | </h2> |
| 604 | <Show when={props.user.kind !== "guest"} fallback={<p>signs in with {props.user.guestProvider === "github" ? "GitHub" : "Astheno"}</p>}> | 641 | <Show when={props.user.kind !== "guest"} fallback={<p>signs in with {GUESTS[props.user.guestProvider ?? "github"].name}</p>}> |
| 605 | <Loaded data={credentials} what="sign-in methods" retry={credentialActions.refetch} | 642 | <Loaded data={credentials} what="sign-in methods" retry={credentialActions.refetch} |
| 606 | skeleton={<div class="skeleton" style={{ height: "60px" }} />}> | 643 | skeleton={<div class="skeleton" style={{ height: "60px" }} />}> |
| 607 | {(list) => { | 644 | {(list) => { |
dashboard/web/types/users.ts+1-1| ... | @@ -2,7 +2,7 @@ export interface User { | ... | @@ -2,7 +2,7 @@ export interface User { |
| 2 | id: string; | 2 | id: string; |
| 3 | username: string; | 3 | username: string; |
| 4 | kind?: "guest"; | 4 | kind?: "guest"; |
| 5 | guestProvider?: "github" | "astheno"; | 5 | guestProvider?: "github" | "astheno" | "atproto"; |
| 6 | email: string | null; | 6 | email: string | null; |
| 7 | firstName: string | null; | 7 | firstName: string | null; |
| 8 | lastName: string | null; | 8 | lastName: string | null; |
tools/dashboard-oidc-test.py+2-2| ... | @@ -185,14 +185,14 @@ def main(): | ... | @@ -185,14 +185,14 @@ def main(): |
| 185 | assert request('/auth/status?' + urllib.parse.urlencode({'next': target}))['service'] == 'shale' | 185 | assert request('/auth/status?' + urllib.parse.urlencode({'next': target}))['service'] == 'shale' |
| 186 | forged = target.replace(urllib.parse.quote(callback, safe=''), urllib.parse.quote('https://evil.example/callback', safe='')) | 186 | forged = target.replace(urllib.parse.quote(callback, safe=''), urllib.parse.quote('https://evil.example/callback', safe='')) |
| 187 | assert request('/auth/status?' + urllib.parse.urlencode({'next': forged}))['service'] == 'snow globe' | 187 | assert request('/auth/status?' + urllib.parse.urlencode({'next': forged}))['service'] == 'snow globe' |
| 188 | assert request('/auth/status?' + urllib.parse.urlencode({'next': target}))['providers'] == [{'id':'github','name':'GitHub'}] | 188 | assert request('/auth/status?' + urllib.parse.urlencode({'next': target}))['providers'] == [{'id':'github','name':'GitHub'},{'id':'atproto','name':'AT / tangled / bsky'}] |
| 189 | request('/auth/guest/start/github?' + urllib.parse.urlencode({'next': '/'}), status=400) | 189 | request('/auth/guest/start/github?' + urllib.parse.urlencode({'next': '/'}), status=400) |
| 190 | started = request('/auth/guest/start/github?' + urllib.parse.urlencode({'next': target}), status=302) | 190 | started = request('/auth/guest/start/github?' + urllib.parse.urlencode({'next': target}), status=302) |
| 191 | external = urllib.parse.urlparse(started['location']); parameters = urllib.parse.parse_qs(external.query) | 191 | external = urllib.parse.urlparse(started['location']); parameters = urllib.parse.parse_qs(external.query) |
| 192 | assert external.netloc == 'github.com' and parameters['scope'] == ['read:user'] and parameters['code_challenge_method'] == ['S256'] | 192 | assert external.netloc == 'github.com' and parameters['scope'] == ['read:user'] and parameters['code_challenge_method'] == ['S256'] |
| 193 | state = parameters['state'][0] | 193 | state = parameters['state'][0] |
| 194 | request('/auth/guest/callback/github?state=' + state, session=False, status=403) | 194 | request('/auth/guest/callback/github?state=' + state, session=False, status=403) |
| 195 | request('/auth/guest/callback/astheno?state=' + state, status=503) | 195 | request('/auth/guest/callback/astheno?state=' + state, status=403) |
| 196 | declined = request('/auth/guest/callback/github?' + urllib.parse.urlencode({'state':state,'error':'access_denied'}), status=302)['location'] | 196 | declined = request('/auth/guest/callback/github?' + urllib.parse.urlencode({'state':state,'error':'access_denied'}), status=302)['location'] |
| 197 | assert 'guest_error=1' in declined | 197 | assert 'guest_error=1' in declined |
| 198 | request('/auth/guest/callback/github?state=' + state, status=403) | 198 | request('/auth/guest/callback/github?state=' + state, status=403) |