Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Webauthn-transport #1204

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

WIP: Webauthn-transport #1204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f14c34
WIP: use transport-auth
micolous Nov 20, 2022
e7e91fe
remove mozilla-u2fhid support, use new APIs
micolous Jul 11, 2023
07a0b43
migrate to webauthn-rs 0.5.0 APIs
micolous Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
234 changes: 141 additions & 93 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@ wasm-bindgen = "^0.2.86"
wasm-bindgen-futures = "^0.4.30"
wasm-bindgen-test = "0.3.35"

webauthn-authenticator-rs = "0.4.8"
webauthn-rs = "0.4.8"
webauthn-rs-core = "0.4.8"
webauthn-rs-proto = "0.4.8"
# webauthn-authenticator-rs = { path = "../webauthn-rs/webauthn-authenticator-rs" }
# webauthn-rs = { path = "../webauthn-rs/webauthn-rs" }
# webauthn-rs-core = { path = "../webauthn-rs/webauthn-rs-core" }
# webauthn-rs-proto = { path = "../webauthn-rs/webauthn-rs-proto" }
# webauthn-authenticator-rs = "0.5.0"
# webauthn-rs = "0.5.0"
# webauthn-rs-core = "0.5.0"
# webauthn-rs-proto = "0.5.0"
webauthn-authenticator-rs = { path = "../webauthn-rs/webauthn-authenticator-rs" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could point at a git commit instead for now.

webauthn-rs = { path = "../webauthn-rs/webauthn-rs" }
webauthn-rs-core = { path = "../webauthn-rs/webauthn-rs-core" }
webauthn-rs-proto = { path = "../webauthn-rs/webauthn-rs-proto" }
web-sys = "^0.3.62"
whoami = "^1.4.1"
walkdir = "2"
Expand Down
2 changes: 1 addition & 1 deletion server/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ users = { workspace = true }

[dev-dependencies]
criterion = { workspace = true, features = ["html_reports"] }
webauthn-authenticator-rs = { workspace = true }
webauthn-authenticator-rs = { workspace = true, features = ["softpasskey"] }

futures = { workspace = true }
kanidmd_lib_macros = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/be/dbvalue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
use url::Url;
use uuid::Uuid;
use webauthn_rs::prelude::{
DeviceKey as DeviceKeyV4, Passkey as PasskeyV4, SecurityKey as SecurityKeyV4,
AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4, SecurityKey as SecurityKeyV4,
};
use webauthn_rs_core::proto::{COSEKey, UserVerificationPolicy};

Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use smartstring::alias::String as AttrString;
use time::OffsetDateTime;
use tracing::trace;
use uuid::Uuid;
use webauthn_rs::prelude::{DeviceKey as DeviceKeyV4, Passkey as PasskeyV4};
use webauthn_rs::prelude::{AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4};

use crate::be::dbentry::{DbEntry, DbEntryV2, DbEntryVers};
use crate::be::dbvalue::DbValueSetV2;
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/idm/account.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use kanidm_proto::v1::{
use time::OffsetDateTime;
use uuid::Uuid;
use webauthn_rs::prelude::{
AuthenticationResult, CredentialID, DeviceKey as DeviceKeyV4, Passkey as PasskeyV4,
AuthenticationResult, CredentialID, AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4,
};

use crate::constants::UUID_ANONYMOUS;
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/idm/credupdatesession.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use kanidm_proto::v1::{
use serde::{Deserialize, Serialize};
use time::OffsetDateTime;
use webauthn_rs::prelude::{
CreationChallengeResponse, DeviceKey as DeviceKeyV4, Passkey as PasskeyV4, PasskeyRegistration,
CreationChallengeResponse, AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4, PasskeyRegistration,
RegisterPublicKeyCredential,
};

Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/repl/proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};

use webauthn_rs::prelude::{
DeviceKey as DeviceKeyV4, Passkey as PasskeyV4, SecurityKey as SecurityKeyV4,
AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4, SecurityKey as SecurityKeyV4,
};

// Re-export this for our own usage.
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use sshkeys::PublicKey as SshPublicKey;
use time::OffsetDateTime;
use url::Url;
use uuid::Uuid;
use webauthn_rs::prelude::{DeviceKey as DeviceKeyV4, Passkey as PasskeyV4};
use webauthn_rs::prelude::{AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4};

use kanidm_proto::v1::ApiTokenPurpose;
use kanidm_proto::v1::Filter as ProtoFilter;
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/valueset/cred.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::btree_map::Entry as BTreeEntry;
use std::collections::BTreeMap;

use webauthn_rs::prelude::{DeviceKey as DeviceKeyV4, Passkey as PasskeyV4};
use webauthn_rs::prelude::{AttestedResidentKey as DeviceKeyV4, Passkey as PasskeyV4};

use crate::be::dbvalue::{
DbValueCredV1, DbValueDeviceKeyV1, DbValueIntentTokenStateV1, DbValuePasskeyV1,
Expand Down
2 changes: 1 addition & 1 deletion server/lib/src/valueset/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use hashbrown::HashSet;
use smolset::SmolSet;
use time::OffsetDateTime;
// use std::fmt::Debug;
use webauthn_rs::prelude::DeviceKey as DeviceKeyV4;
use webauthn_rs::prelude::AttestedResidentKey as DeviceKeyV4;
use webauthn_rs::prelude::Passkey as PasskeyV4;

use kanidm_proto::v1::Filter as ProtoFilter;
Expand Down