mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

20220427 dependency updates (#718)

Browse source
This commit is contained in:
Firstyear 2022-04-27 13:35:26 +10:00 committed by GitHub
parent 0aa0163ced
commit a58edc5128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 841 additions and 841 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,3 +17,4 @@ vendor.tar.*
*.patch
orca/example_profiles/small/orca-edited.toml
docs/
kanidm_unix_int/pam_tester/Cargo.lock

574
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

20
kanidm_client/Cargo.toml
View file

@ -11,14 +11,14 @@ homepage = "https://github.com/kanidm/kanidm/"
repository = "https://github.com/kanidm/kanidm/"
[dependencies]
tracing = "0.1"
reqwest = { version = "0.11", features=["cookies", "json", "native-tls"] }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
toml = "0.5"
uuid = { version = "0.8", features = ["serde", "v4"] }
url = { version = "2", features = ["serde"] }
webauthn-rs = "0.3"
tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] }
tracing = "^0.1.34"
reqwest = { version = "^0.11.10", features=["cookies", "json", "native-tls"] }
kanidm_proto = { path = "../kanidm_proto" }
serde = { version = "^1.0.136", features = ["derive"] }
serde_json = "^1.0.79"
toml = "^0.5.9"
uuid = { version = "^1.0.0", features = ["serde", "v4"] }
url = { version = "^2.2.2", features = ["serde"] }
webauthn-rs = "^0.3.2"
tokio = { version = "^1.17.0", features = ["rt", "net", "time", "macros", "sync", "signal"] }

19
kanidm_proto/Cargo.toml
View file

@ -11,15 +11,12 @@ homepage = "https://github.com/kanidm/kanidm/"
repository = "https://github.com/kanidm/kanidm/"
[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
uuid = { version = "0.8", features = ["serde", "wasm-bindgen"] }
base32 = "0.4"
webauthn-rs = { version = "0.3", default-features = false, features = ["wasm"] }
time = { version = "0.2", features = ["serde", "std"] }
url = { version = "2", features = ["serde"] }
# zxcvbn = { version = "2.0", features = ["ser"] }
[dev-dependencies]
serde_json = "1.0"
serde = { version = "^1.0.136", features = ["derive"] }
serde_json = "^1.0.79"
uuid = { version = "^1.0.0", features = ["serde"] }
base32 = "^0.4.0"
webauthn-rs = { version = "^0.3.2", default-features = false, features = ["wasm"] }
# Can not upgrade due to breaking timezone apis.
time = { version = "=0.2.27", features = ["serde", "std"] }
url = { version = "^2.2.2", features = ["serde"] }

34
kanidm_tools/Cargo.toml
View file

@ -29,26 +29,26 @@ name = "kanidm_badlist_preprocess"
path = "src/badlist_preprocess.rs"
[dependencies]
kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha.4" }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha.4" }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
rpassword = "5.0"
structopt = { version = "0.3", default-features = false }
libc = "0.2"
serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
shellexpand = "2.0"
rayon = "1.2"
time = { version = "0.2", features = ["serde", "std"] }
qrcode = { version = "0.12", default-features = false }
compact_jwt = "^0.2.0"
kanidm_client = { path = "../kanidm_client" }
kanidm_proto = { path = "../kanidm_proto" }
tracing = "^0.1.34"
tracing-subscriber = { version = "^0.3.11", features = ["env-filter", "fmt"] }
rpassword = "^6.0.1"
structopt = { version = "^0.3.26", default-features = false }
libc = "^0.2.124"
serde = { version = "^1.0.136", features = ["derive"] }
serde_json = "^1.0.79"
shellexpand = "^2.1.0"
rayon = "^1.5.2"
time = { version = "=0.2.27", features = ["serde", "std"] }
qrcode = { version = "^0.12.0", default-features = false }
compact_jwt = "^0.2.1"
zxcvbn = "2.0"
zxcvbn = "^2.2.1"
dialoguer = "0.9"
dialoguer = "^0.10.0"
webauthn-authenticator-rs = "^0.3.0-alpha.12"
[build-dependencies]
structopt = { version = "0.3", default-features = false }
structopt = { version = "^0.3.26", default-features = false }

6
kanidm_tools/src/cli/lib.rs
View file

@ -60,7 +60,7 @@ impl SelfOpt {
SelfOpt::SetPassword(copt) => {
let client = copt.to_client();
let password = match rpassword::prompt_password_stderr("Enter new password: ") {
let password = match rpassword::prompt_password("Enter new password: ") {
Ok(p) => p,
Err(e) => {
error!("Error -> {:?}", e);
@ -124,10 +124,10 @@ impl KanidmClientOpt {
pub(crate) fn password_prompt(prompt: &str) -> Option<String> {
for _ in 0..3 {
let password = rpassword::prompt_password_stderr(prompt).ok()?;
let password = rpassword::prompt_password(prompt).ok()?;
let password_confirm =
rpassword::prompt_password_stderr("Retype the new password to confirm: ").ok()?;
rpassword::prompt_password("Retype the new password to confirm: ").ok()?;
if password == password_confirm {
return Some(password);

2
kanidm_tools/src/cli/session.rs
View file

@ -143,7 +143,7 @@ impl LoginOpt {
}
fn do_password(&self, client: &mut KanidmClient) -> Result<AuthResponse, ClientError> {
let password = rpassword::prompt_password_stderr("Enter password: ").unwrap_or_else(|e| {
let password = rpassword::prompt_password("Enter password: ").unwrap_or_else(|e| {
error!("Failed to create password prompt -- {:?}", e);
std::process::exit(1);
});

2
kanidm_tools/src/ssh_authorizedkeys.rs
View file

@ -65,7 +65,7 @@ fn main() {
let r = if opt.username == "anonymous" {
client.auth_anonymous()
} else {
let password = rpassword::prompt_password_stderr("Enter password: ").unwrap_or_else(|e| {
let password = rpassword::prompt_password("Enter password: ").unwrap_or_else(|e| {
error!("Failed to retrieve password - {:?}", e);
std::process::exit(1);
});

48
kanidm_unix_int/Cargo.toml
View file

@ -43,38 +43,38 @@ name = "kanidm_test_auth"
path = "src/test_auth.rs"
[dependencies]
kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha" }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
kanidm = { path = "../kanidmd/idm", version = "1.1.0-alpha" }
kanidm_client = { path = "../kanidm_client" }
kanidm_proto = { path = "../kanidm_proto" }
kanidm = { path = "../kanidmd/idm" }
tracing = "0.1"
tracing-subscriber = "0.3"
tracing = "^0.1.34"
tracing-subscriber = "^0.3.11"
toml = "0.5"
rpassword = "5.0"
tokio = { version = "1", features = ["rt", "macros", "sync", "time", "net", "io-util"] }
tokio-util = { version = "0.6", features = ["codec"] }
toml = "^0.5.9"
rpassword = "^6.0.1"
tokio = { version = "^1.17.0", features = ["rt", "macros", "sync", "time", "net", "io-util"] }
tokio-util = { version = "^0.7.1", features = ["codec"] }
futures = "0.3"
bytes = "1.0"
futures = "^0.3.21"
bytes = "^1.1.0"
libc = "0.2"
serde = { version = "1", features = ["derive"] }
serde_cbor = "0.11"
structopt = { version = "0.3", default-features = false }
libc = "^0.2.124"
serde = { version = "^1.0.136", features = ["derive"] }
serde_cbor = "^0.11.2"
structopt = { version = "0.3.26", default-features = false }
libsqlite3-sys = { version = "0.23" }
rusqlite = { version = "0.26", features = ["backup"] }
r2d2 = "0.8"
r2d2_sqlite = "0.19"
libsqlite3-sys = "0.24.2"
rusqlite = "^0.27.0"
r2d2 = "^0.8.9"
r2d2_sqlite = "^0.20.0"
reqwest = { version = "0.11" }
reqwest = "^0.11.10"
users = "0.11"
async-std = { version = "1.6", features = ["tokio1"] }
users = "^0.11.0"
async-std = { version = "^1.11.0", features = ["tokio1"] }
lru = "0.7"
lru = "^0.7.5"
[features]
# default = [ "libsqlite3-sys/bundled" ]
@ -84,6 +84,6 @@ lru = "0.7"
score = { path = "../kanidmd/score" }
[build-dependencies]
structopt = { version = "0.3", default-features = false }
structopt = { version = "^0.3.26", default-features = false }
profiles = { path = "../profiles" }

11
kanidm_unix_int/nss_kanidm/Cargo.toml
View file

@ -11,10 +11,9 @@ crate-type = [ "cdylib" ]
path = "src/lib.rs"
[dependencies]
kanidm_unix_int = { path = "../", version = "1.1.0-alpha" }
libnss = "0.4"
# libnss = { git = "https://github.com/csnewman/libnss-rs.git", rev = "eab2d93d2438652773699b0807d558ce75b1e748" }
libc = "0.2.0"
paste = "1.0"
lazy_static = "1.3"
kanidm_unix_int = { path = "../" }
libnss = "^0.4.0"
libc = "^0.2.124"
paste = "^1.0.7"
lazy_static = "^1.4.0"

6
kanidm_unix_int/pam_kanidm/Cargo.toml
View file

@ -12,8 +12,8 @@ crate-type = [ "cdylib" ]
path = "src/lib.rs"
[dependencies]
kanidm_unix_int = { path = "../", version = "1.1.0-alpha" }
libc = "0.2"
kanidm_unix_int = { path = "../" }
libc = "^0.2.124"
[build-dependencies]
pkg-config = "0.3.25"
pkg-config = "^0.3.25"

4
kanidm_unix_int/pam_tester/Cargo.toml
View file

@ -8,6 +8,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
pam = "0.7.0"
[workspace]
pam = "^0.7.0"

2
kanidm_unix_int/src/test_auth.rs
View file

@ -32,7 +32,7 @@ async fn main() {
.read_options_from_optional_config("/etc/kanidm/unixd")
.expect("Failed to parse /etc/kanidm/unixd");
let password = rpassword::prompt_password_stderr("Enter unix password: ").unwrap();
let password = rpassword::prompt_password("Enter unix password: ").unwrap();
let req = ClientRequest::PamAuthenticate(opt.account_id.clone(), password);
let sereq = ClientRequest::PamAccountAllowed(opt.account_id);

10
kanidmd/daemon/Cargo.toml
View file

@ -19,11 +19,11 @@ path = "src/main.rs"
[dependencies]
kanidm = { path = "../idm" }
score = { path = "../score" }
structopt = { version = "0.3", default-features = false }
users = "0.11"
serde = { version = "1", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
toml = "0.5"
structopt = { version = "^0.3.26", default-features = false }
users = "^0.11.0"
serde = { version = "^1.0.136", features = ["derive"] }
tokio = { version = "^1.17.0", features = ["rt-multi-thread", "macros", "signal"] }
toml = "0.5.9"
[build-dependencies]
serde = { version = "1", features = ["derive"] }

99
kanidmd/idm/Cargo.toml
View file

@ -15,86 +15,83 @@ name = "kanidm"
path = "src/lib.rs"
[dependencies]
kanidm_proto = { path = "../../kanidm_proto", version = "1.1.0-alpha" }
tracing = { version = "0.1", features = ["attributes"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
tracing-serde = "0.1"
kanidm_proto = { path = "../../kanidm_proto" }
tracing = { version = "^0.1.34", features = ["attributes"] }
tracing-subscriber = { version = "^0.3.11", features = ["env-filter"] }
tracing-serde = "^0.1.3"
jemallocator = { version = "0.3.0", optional = true }
either = "1.6"
jemallocator = { version = "0.3.2", optional = true }
either = "^1.6.1"
url = { version = "2", features = ["serde"] }
tide = "0.16"
async-trait = "0.1"
async-h1 = "2.0"
url = { version = "^2.2.2", features = ["serde"] }
tide = "^0.16.0"
async-trait = "^0.1.53"
fernet = { version = "^0.1.4", features = ["fernet_danger_timestamps"] }
compact_jwt = "^0.2.0"
compact_jwt = "^0.2.1"
async-std = { version = "1.6", features = ["tokio1"] }
async-std = { version = "^1.11.0", features = ["tokio1"] }
rand = "0.8"
toml = "0.5"
rand = "^0.8.5"
toml = "^0.5.9"
chrono = "0.4"
saffron = "0.1.0"
regex = "1"
lazy_static = "1.2.0"
chrono = "^0.4.19"
saffron = "^0.1.0"
regex = "^1.5.5"
lazy_static = "^1.4.0"
futures = "0.3"
futures-util = "0.3"
tokio = { version = "1", features = ["full"] }
tokio-util = { version = "0.6", features = ["codec"] }
openssl = "0.10"
futures = "^0.3.21"
futures-util = "^0.3.21"
tokio = { version = "^1.17.0", features = ["net", "sync", "time"] }
tokio-util = { version = "^0.7.1", features = ["codec"] }
openssl = "^0.10.38"
uuid = { version = "0.8", features = ["serde", "v4" ] }
uuid = { version = "^1.0.0", features = ["serde", "v4" ] }
compiled-uuid = "0.1.2"
serde = { version = "1", features = ["derive"] }
serde_cbor = "0.11"
serde_json = "1.0"
serde = { version = "^1.0.136", features = ["derive"] }
serde_cbor = "^0.11.2"
serde_json = "^1.0.79"
libsqlite3-sys = { version = "0.23" }
rusqlite = { version = "0.26", features = ["backup"] }
r2d2 = "0.8"
r2d2_sqlite = "0.19"
libsqlite3-sys = "0.24.2"
rusqlite = "^0.27.0"
r2d2 = "^0.8.9"
r2d2_sqlite = "^0.20.0"
time = { version = "0.2", features = ["serde", "std"] }
time = { version = "=0.2.27", features = ["serde", "std"] }
hashbrown = { version = "0.11", features = ["serde", "inline-more", "ahash"] }
concread = "^0.3"
smolset = "1.3"
hashbrown = { version = "0.12.0", features = ["serde", "inline-more", "ahash"] }
concread = "^0.3.1"
smolset = "^1.3.1"
sshkeys = "^0.3.1"
zxcvbn = "2.0"
base64 = "0.13"
zxcvbn = "^2.2.1"
base64 = "^0.13.0"
idlset = { version = "^0.2" }
idlset = { version = "^0.2.3" }
# Needs to be ldap3_proto!
ldap3_proto = "0.2.2"
ldap3_proto = "^0.2.3"
webauthn-rs = "0.3"
webauthn-rs = "^0.3.2"
libc = "0.2"
users = "0.11"
libc = "^0.2.124"
users = "^0.11.0"
smartstring = { version = "0.2", features = ["serde"] }
smartstring = { version = "^1.0.1", features = ["serde"] }
validator = { version = "0.14", features = ["phone"] }
validator = { version = "^0.14.0", features = ["phone"] }
touch = "0.0.1"
filetime = "0.2"
num_enum = "0.5"
touch = "^0.0.1"
filetime = "^0.2.16"
num_enum = "^0.5.7"
[features]
# default = [ "libsqlite3-sys/bundled", "openssl/vendored" ]
[dev-dependencies]
criterion = { version = "0.3", features = ["html_reports"] }
criterion = { version = "^0.3.5", features = ["html_reports"] }
# For testing webauthn
webauthn-authenticator-rs = "0.3.0-alpha.12"
webauthn-authenticator-rs = "^0.3.2"
[build-dependencies]
profiles = { path = "../../profiles" }

10
kanidmd/idm/src/be/idl_sqlite.rs
View file

@ -273,7 +273,7 @@ pub trait IdlSqliteTransaction {
fn uuid2spn(&mut self, uuid: &Uuid) -> Result<Option<Value>, OperationError> {
spanned!("be::idl_sqlite::uuid2spn", {
let uuids = uuid.to_hyphenated_ref().to_string();
let uuids = uuid.as_hyphenated().to_string();
// The table exists - lets now get the actual index itself.
let mut stmt = self
.get_conn()
@ -304,7 +304,7 @@ pub trait IdlSqliteTransaction {
fn uuid2rdn(&mut self, uuid: &Uuid) -> Result<Option<String>, OperationError> {
spanned!("be::idl_sqlite::uuid2rdn", {
let uuids = uuid.to_hyphenated_ref().to_string();
let uuids = uuid.as_hyphenated().to_string();
// The table exists - lets now get the actual index itself.
let mut stmt = self
.get_conn()
@ -777,7 +777,7 @@ impl IdlSqliteWriteTransaction {
}
pub fn write_name2uuid_add(&self, name: &str, uuid: &Uuid) -> Result<(), OperationError> {
let uuids = uuid.to_hyphenated_ref().to_string();
let uuids = uuid.as_hyphenated().to_string();
self.conn
.prepare("INSERT OR REPLACE INTO idx_name2uuid (name, uuid) VALUES(:name, :uuid)")
@ -810,7 +810,7 @@ impl IdlSqliteWriteTransaction {
}
pub fn write_uuid2spn(&self, uuid: &Uuid, k: Option<&Value>) -> Result<(), OperationError> {
let uuids = uuid.to_hyphenated_ref().to_string();
let uuids = uuid.as_hyphenated().to_string();
match k {
Some(k) => {
let dbv1 = k.to_supplementary_db_valuev1();
@ -846,7 +846,7 @@ impl IdlSqliteWriteTransaction {
}
pub fn write_uuid2rdn(&self, uuid: &Uuid, k: Option<&String>) -> Result<(), OperationError> {
let uuids = uuid.to_hyphenated_ref().to_string();
let uuids = uuid.as_hyphenated().to_string();
match k {
Some(k) => self
.conn

2
kanidmd/idm/src/entry.rs
View file

@ -977,7 +977,7 @@ impl Entry<EntrySealed, EntryCommitted> {
.get("name")
.and_then(|vs| vs.to_proto_string_single().map(|v| format!("name={}", v)))
})
.unwrap_or_else(|| format!("uuid={}", self.get_uuid().to_hyphenated_ref()))
.unwrap_or_else(|| format!("uuid={}", self.get_uuid().as_hyphenated()))
}
#[inline]

2
kanidmd/idm/src/identity.rs
View file

@ -91,7 +91,7 @@ impl std::fmt::Display for Identity {
f,
"User( {}, {} ) ",
nv.to_proto_string_clone(),
u.entry.get_uuid().to_hyphenated_ref()
u.entry.get_uuid().as_hyphenated()
)
}
}

2
kanidmd/idm/src/idm/group.rs
View file

@ -110,7 +110,7 @@ impl Group {
pub fn to_proto(&self) -> ProtoGroup {
ProtoGroup {
name: self.name.clone(),
uuid: self.uuid.to_hyphenated_ref().to_string(),
uuid: self.uuid.as_hyphenated().to_string(),
}
}
}

2
kanidmd/idm/src/idm/radius.rs
View file

@ -112,7 +112,7 @@ impl RadiusAccount {
Ok(RadiusAuthToken {
name: self.name.clone(),
displayname: self.displayname.clone(),
uuid: self.uuid.to_hyphenated_ref().to_string(),
uuid: self.uuid.as_hyphenated().to_string(),
secret: self.radius_secret.clone(),
groups: self.groups.iter().map(|g| g.to_proto()).collect(),
})

4
kanidmd/idm/src/idm/unix.rs
View file

@ -158,7 +158,7 @@ impl UnixUserAccount {
spn: self.spn.clone(),
displayname: self.displayname.clone(),
gidnumber: self.gidnumber,
uuid: self.uuid.to_hyphenated_ref().to_string(),
uuid: self.uuid.as_hyphenated().to_string(),
shell: self.shell.clone(),
groups,
sshkeys: self.sshkeys.clone(),
@ -439,7 +439,7 @@ impl UnixGroup {
Ok(UnixGroupToken {
name: self.name.clone(),
spn: self.spn.clone(),
uuid: self.uuid.to_hyphenated_ref().to_string(),
uuid: self.uuid.as_hyphenated().to_string(),
gidnumber: self.gidnumber,
})
}

2
kanidmd/idm/src/server.rs
View file

@ -298,7 +298,7 @@ pub trait QueryServerTransaction<'a> {
// If we have a some, pass it on, else unwrap into a default.
self.get_be_txn()
.uuid2rdn(uuid)
.map(|v| v.unwrap_or_else(|| format!("uuid={}", uuid.to_hyphenated_ref())))
.map(|v| v.unwrap_or_else(|| format!("uuid={}", uuid.as_hyphenated())))
}
// From internal, generate an exists event and dispatch

6
kanidmd/idm/src/utils.rs
View file

@ -41,7 +41,7 @@ fn uuid_from_u64_u32(a: u64, b: u32, sid: Sid) -> Uuid {
#[allow(clippy::expect_used)]
Builder::from_slice(v.as_slice())
.expect("invalid slice for uuid builder")
.build()
.into_uuid()
}
pub fn uuid_from_duration(d: Duration, sid: Sid) -> Uuid {
@ -193,13 +193,13 @@ mod tests {
let u1 = uuid_from_duration(Duration::from_secs(1), [0xff; 4]);
assert_eq!(
"00000000-0000-0001-0000-0000ffffffff",
u1.to_hyphenated().to_string()
u1.as_hyphenated().to_string()
);
let u2 = uuid_from_duration(Duration::from_secs(1000), [0xff; 4]);
assert_eq!(
"00000000-0000-03e8-0000-0000ffffffff",
u2.to_hyphenated().to_string()
u2.as_hyphenated().to_string()
);
}

12
kanidmd/idm/src/value.rs
View file

@ -677,7 +677,7 @@ impl PartialValue {
| PartialValue::Nsuniqueid(s)
| PartialValue::EmailAddress(s)
| PartialValue::RestrictedString(s) => s.clone(),
PartialValue::Refer(u) | PartialValue::Uuid(u) => u.to_hyphenated_ref().to_string(),
PartialValue::Refer(u) | PartialValue::Uuid(u) => u.as_hyphenated().to_string(),
PartialValue::Bool(b) => b.to_string(),
PartialValue::Syntax(syn) => syn.to_string(),
PartialValue::Index(it) => it.to_string(),
@ -701,12 +701,12 @@ impl PartialValue {
}
PartialValue::Url(u) => u.to_string(),
PartialValue::OauthScope(u) => u.to_string(),
PartialValue::OauthScopeMap(u) => u.to_hyphenated_ref().to_string(),
PartialValue::OauthScopeMap(u) => u.as_hyphenated().to_string(),
PartialValue::Address(a) => a.to_string(),
PartialValue::PhoneNumber(a) => a.to_string(),
PartialValue::IntentToken(u) => u.to_hyphenated_ref().to_string(),
PartialValue::TrustedDeviceEnrollment(u) => u.to_hyphenated_ref().to_string(),
PartialValue::AuthSession(u) => u.to_hyphenated_ref().to_string(),
PartialValue::IntentToken(u) => u.as_hyphenated().to_string(),
PartialValue::TrustedDeviceEnrollment(u) => u.as_hyphenated().to_string(),
PartialValue::AuthSession(u) => u.as_hyphenated().to_string(),
}
}
@ -1472,7 +1472,7 @@ impl Value {
pub(crate) fn to_proto_string_clone(&self) -> String {
match &self {
Value::Iname(s) => s.clone(),
Value::Uuid(u) => u.to_hyphenated_ref().to_string(),
Value::Uuid(u) => u.as_hyphenated().to_string(),
// We display the tag and fingerprint.
Value::SshKey(tag, key) =>
// Check it's really an sshkey in the

14
kanidmd/idm/src/valueset.rs
View file

@ -244,7 +244,7 @@ impl TryFrom<DbValueV1> for ValueSet {
impl ValueSet {
pub fn uuid_to_proto_string(u: &Uuid) -> String {
u.to_hyphenated_ref().to_string()
u.as_hyphenated().to_string()
}
pub fn new(value: Value) -> Self {
@ -1060,14 +1060,14 @@ impl ValueSet {
I::Iname(set) => set.iter().cloned().collect(),
I::Uuid(set) => set
.iter()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
I::Bool(set) => set.iter().map(|u| u.to_string()).collect(),
I::Syntax(set) => set.iter().map(|u| u.to_string()).collect(),
I::Index(set) => set.iter().map(|u| u.to_string()).collect(),
I::Refer(set) => set
.iter()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
I::JsonFilt(set) => set
.iter()
@ -1102,22 +1102,22 @@ impl ValueSet {
I::OauthScope(_set) => vec![],
I::OauthScopeMap(map) => map
.keys()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
I::PrivateBinary(_set) => vec![],
I::PublicBinary(map) => map.keys().cloned().collect(),
I::RestrictedString(set) => set.iter().cloned().collect(),
I::IntentToken(map) => map
.keys()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
I::TrustedDeviceEnrollment(map) => map
.keys()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
I::AuthSession(map) => map
.keys()
.map(|u| u.to_hyphenated_ref().to_string())
.map(|u| u.as_hyphenated().to_string())
.collect(),
}
}

45
kanidmd/score/Cargo.toml
View file

@ -15,43 +15,42 @@ repository = "https://github.com/kanidm/kanidm/"
[dependencies]
kanidm = { path = "../idm" }
kanidm_proto = { path = "../../kanidm_proto" }
libc = "0.2"
libc = "^0.2.124"
uuid = { version = "0.8", features = ["serde", "v4" ] }
uuid = { version = "^1.0.0", features = ["serde", "v4" ] }
tide = "0.16"
tide = "^0.16.0"
tide-openssl = "^0.1.1"
futures-util = "0.3"
tokio = { version = "1", features = ["full"] }
tokio-util = { version = "0.6", features = ["codec"] }
tokio-openssl = "0.6"
openssl = "0.10"
ldap3_proto = "0.2.2"
futures-util = "^0.3.21"
tokio = { version = "^1.17.0", features = ["net", "sync", "io-util"] }
tokio-util = { version = "^0.7.1", features = ["codec"] }
tokio-openssl = "^0.6.3"
openssl = "^0.10.38"
ldap3_proto = "^0.2.3"
tracing = { version = "0.1", features = ["attributes"] }
serde = { version = "1", features = ["derive"] }
async-trait = "0.1"
async-std = { version = "1.6", features = ["tokio1"] }
compact_jwt = "^0.2.0"
tracing = { version = "^0.1.34", features = ["attributes"] }
serde = { version = "^1.0.136", features = ["derive"] }
async-trait = "^0.1.53"
async-std = { version = "^1.11.0", features = ["tokio1"] }
compact_jwt = "^0.2.1"
[build-dependencies]
profiles = { path = "../../profiles" }
[dev-dependencies]
tracing-subscriber = "0.3"
tracing-subscriber = "^0.3.11"
# tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] }
# kanidm = { path = "../kanidmd" }
# score = { path = "../kanidmd/score" }
futures = "0.3"
serde_json = "1.0"
futures = "^0.3.21"
serde_json = "^1.0.79"
# async-std = { version = "1.6", features = ["tokio1"] }
webauthn-authenticator-rs = "0.3.0-alpha.12"
oauth2_ext = { package = "oauth2", version = "4.0", default-features = false }
base64 = "0.13"
# compact_jwt = "^0.1.5"
webauthn-authenticator-rs = "^0.3.2"
oauth2_ext = { package = "oauth2", version = "^4.1.0", default-features = false }
base64 = "^0.13.0"
kanidm_client = { path = "../../kanidm_client" }
url = { version = "2", features = ["serde"] }
reqwest = { version = "0.11", features=["cookies", "json", "native-tls"] }
url = { version = "^2.2.2", features = ["serde"] }
reqwest = { version = "0.11.10", features=["cookies", "json", "native-tls"] }

2
kanidmd/score/src/https/mod.rs
View file

@ -100,7 +100,7 @@ impl RequestExtensions for tide::Request<AppState> {
fn new_eventid(&self) -> (Uuid, String) {
let eventid = kanidm::tracing_tree::operation_id().unwrap();
let hv = eventid.to_hyphenated().to_string();
let hv = eventid.as_hyphenated().to_string();
(eventid, hv)
}
}

23
kanidmd_web_ui/Cargo.toml
View file

@ -17,23 +17,22 @@ repository = "https://github.com/kanidm/kanidm/"
crate-type = ["cdylib", "rlib"]
[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
serde = { version = "^1.0.136", features = ["derive"] }
serde_json = "^1.0.79"
wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
wasm-bindgen-futures = { version = "0.4" }
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
# anyhow = "1"
wasm-bindgen = { version = "^0.2.80", features = ["serde-serialize"] }
wasm-bindgen-futures = { version = "^0.4.30" }
kanidm_proto = { path = "../kanidm_proto" }
webauthn-rs = { version = "0.3", default-features = false, features = ["wasm"] }
webauthn-rs = { version = "^0.3.2", default-features = false, features = ["wasm"] }
yew-router = "0.16"
yew = "0.19"
gloo = "0.5"
js-sys = "0.3"
yew-router = "^0.16.0"
yew = "^0.19.3"
gloo = "^0.7.0"
js-sys = "^0.3.57"
[dependencies.web-sys]
version = "0.3"
version = "^0.3.57"
features = [
"AuthenticationExtensionsClientOutputs",
"AuthenticatorResponse",

6
kanidmd_web_ui/pkg/kanidmd_web_ui.d.ts vendored
View file

@ -12,9 +12,9 @@ export interface InitOutput {
readonly __wbindgen_malloc: (a: number) => number;
readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
readonly __wbindgen_export_2: WebAssembly.Table;
readonly _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43: (a: number, b: number, c: number) => void;
readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b: (a: number, b: number, c: number) => void;
readonly _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b: (a: number, b: number, c: number) => void;
readonly _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f: (a: number, b: number, c: number) => void;
readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a: (a: number, b: number, c: number) => void;
readonly _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f: (a: number, b: number, c: number) => void;
readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
readonly __wbindgen_free: (a: number, b: number) => void;
readonly __wbindgen_exn_store: (a: number) => void;

650
kanidmd_web_ui/pkg/kanidmd_web_ui.js
View file

@ -17,7 +17,7 @@ function getUint8Memory0() {
return cachegetUint8Memory0;
}
let cachedTextEncoder = new TextEncoder('utf-8');
const cachedTextEncoder = new TextEncoder('utf-8');
const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
? function (arg, view) {
@ -80,7 +80,7 @@ function getInt32Memory0() {
return cachegetInt32Memory0;
}
let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
cachedTextDecoder.decode();
@ -240,7 +240,7 @@ function logError(f, args) {
function __wbg_adapter_30(arg0, arg1, arg2) {
_assertNum(arg0);
_assertNum(arg1);
wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f(arg0, arg1, addHeapObject(arg2));
}
function makeMutClosure(arg0, arg1, dtor, f) {
@ -270,7 +270,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
function __wbg_adapter_33(arg0, arg1, arg2) {
_assertNum(arg0);
_assertNum(arg1);
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a(arg0, arg1, addHeapObject(arg2));
}
let stack_pointer = 32;
@ -284,7 +284,7 @@ function __wbg_adapter_36(arg0, arg1, arg2) {
try {
_assertNum(arg0);
_assertNum(arg1);
wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b(arg0, arg1, addBorrowedObject(arg2));
wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f(arg0, arg1, addBorrowedObject(arg2));
} finally {
heap[stack_pointer++] = undefined;
}
@ -371,59 +371,56 @@ async function init(input) {
imports.wbg = {};
imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) {
const obj = getObject(arg1);
var ret = JSON.stringify(obj === undefined ? null : obj);
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
const ret = JSON.stringify(obj === undefined ? null : obj);
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
var ret = getStringFromWasm0(arg0, arg1);
const ret = getStringFromWasm0(arg0, arg1);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
const obj = getObject(arg1);
var ret = typeof(obj) === 'string' ? obj : undefined;
const ret = typeof(obj) === 'string' ? obj : undefined;
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
var ret = getObject(arg0);
const ret = getObject(arg0);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_json_parse = function(arg0, arg1) {
var ret = JSON.parse(getStringFromWasm0(arg0, arg1));
const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};
imports.wbg.__wbindgen_boolean_get = function(arg0) {
const v = getObject(arg0);
var ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
_assertNum(ret);
return ret;
};
imports.wbg.__wbindgen_is_undefined = function(arg0) {
var ret = getObject(arg0) === undefined;
const ret = getObject(arg0) === undefined;
_assertBoolean(ret);
return ret;
};
imports.wbg.__wbindgen_number_new = function(arg0) {
var ret = arg0;
const ret = arg0;
return addHeapObject(ret);
};
imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
const obj = getObject(arg1);
var ret = typeof(obj) === 'number' ? obj : undefined;
const ret = typeof(obj) === 'number' ? obj : undefined;
if (!isLikeNone(ret)) {
_assertNum(ret);
}
getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
};
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
takeObject(arg0);
};
imports.wbg.__wbg_error_09919627ac0992f5 = function() { return logError(function (arg0, arg1) {
try {
console.error(getStringFromWasm0(arg0, arg1));
@ -432,23 +429,26 @@ async function init(input) {
}
}, arguments) };
imports.wbg.__wbg_new_693216e109162396 = function() { return logError(function () {
var ret = new Error();
const ret = new Error();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_stack_0ddaca5d1abfb52f = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).stack;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
const ret = getObject(arg1).stack;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
takeObject(arg0);
};
imports.wbg.__wbindgen_cb_drop = function(arg0) {
const obj = takeObject(arg0).original;
if (obj.cnt-- == 1) {
obj.a = 0;
return true;
}
var ret = false;
const ret = false;
_assertBoolean(ret);
return ret;
};
@ -462,396 +462,396 @@ async function init(input) {
wasm.__wbindgen_free(arg0, arg1 * 4);
console.warn(...v0);
}, arguments) };
imports.wbg.__wbg_instanceof_Window_434ce1849eb4e0fc = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof Window;
imports.wbg.__wbg_instanceof_Window_0e6c0f1096d66c3c = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof Window;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_document_5edd43643d1060d9 = function() { return logError(function (arg0) {
var ret = getObject(arg0).document;
imports.wbg.__wbg_document_99eddbbc11ec831e = function() { return logError(function (arg0) {
const ret = getObject(arg0).document;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_location_11472bb76bf5bbca = function() { return logError(function (arg0) {
var ret = getObject(arg0).location;
imports.wbg.__wbg_location_fa9019d2eb2195e8 = function() { return logError(function (arg0) {
const ret = getObject(arg0).location;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_history_52cfc93c824e772b = function() { return handleError(function (arg0) {
var ret = getObject(arg0).history;
imports.wbg.__wbg_history_dd96d7b18f9170a6 = function() { return handleError(function (arg0) {
const ret = getObject(arg0).history;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_navigator_0e0588c949560476 = function() { return logError(function (arg0) {
var ret = getObject(arg0).navigator;
imports.wbg.__wbg_navigator_1f72d7edb7b4c387 = function() { return logError(function (arg0) {
const ret = getObject(arg0).navigator;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_localStorage_2b7091e6919605e2 = function() { return handleError(function (arg0) {
var ret = getObject(arg0).localStorage;
imports.wbg.__wbg_localStorage_6e9ba4e9a3771427 = function() { return handleError(function (arg0) {
const ret = getObject(arg0).localStorage;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_sessionStorage_fdaffb6b65d0b064 = function() { return handleError(function (arg0) {
var ret = getObject(arg0).sessionStorage;
imports.wbg.__wbg_sessionStorage_ac0b57844426d0d8 = function() { return handleError(function (arg0) {
const ret = getObject(arg0).sessionStorage;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_fetch_427498e0ccea81f4 = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg0).fetch(getObject(arg1));
imports.wbg.__wbg_fetch_ef7a6623d1fcd3b8 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg0).fetch(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_body_7538539844356c1c = function() { return logError(function (arg0) {
var ret = getObject(arg0).body;
imports.wbg.__wbg_body_2a1ff14b05042a51 = function() { return logError(function (arg0) {
const ret = getObject(arg0).body;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_createElement_d017b8d2af99bab9 = function() { return handleError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2));
imports.wbg.__wbg_createElement_3c9b5f3aa42457a1 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_createElementNS_fd4a7e49f74039e1 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
var ret = getObject(arg0).createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
imports.wbg.__wbg_createElementNS_a0904ea4c02292f4 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
const ret = getObject(arg0).createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_createTextNode_39a0de25d14bcde5 = function() { return logError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).createTextNode(getStringFromWasm0(arg1, arg2));
imports.wbg.__wbg_createTextNode_72cf3c22f1eed9ee = function() { return logError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).createTextNode(getStringFromWasm0(arg1, arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_getElementById_b30e88aff96f66a1 = function() { return logError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2));
imports.wbg.__wbg_getElementById_f83c5de20dc455d6 = function() { return logError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_querySelector_cc714d0aa0b868ed = function() { return handleError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).querySelector(getStringFromWasm0(arg1, arg2));
imports.wbg.__wbg_querySelector_c03126fc82664294 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).querySelector(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_pathname_7affbcff36f35c0e = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).pathname;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_new_4473c9af1cac368b = function() { return handleError(function (arg0, arg1) {
var ret = new URL(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_value_d3a30bc2c7caf357 = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).value;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_setvalue_6a34bab301f38bf2 = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).value = getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_get_5835a17331a9d8f2 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg0).get(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_add_c1e566b20be6badb = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).add(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_remove_b4d29ca5eb7db54e = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).remove(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_href_cad8f02caf39f2fb = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).href;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_headers_1a60dec7fbd28a3b = function() { return logError(function (arg0) {
var ret = getObject(arg0).headers;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newwithstrandinit_c07f0662ece15bc6 = function() { return handleError(function (arg0, arg1, arg2) {
var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_instanceof_Event_39e54e1fe6593f4c = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof Event;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_target_e560052e31e4567c = function() { return logError(function (arg0) {
var ret = getObject(arg0).target;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_cancelBubble_17d7988ab2fbe4c9 = function() { return logError(function (arg0) {
var ret = getObject(arg0).cancelBubble;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_preventDefault_fa00541ff125b78c = function() { return logError(function (arg0) {
getObject(arg0).preventDefault();
}, arguments) };
imports.wbg.__wbg_getClientExtensionResults_37549795564cd9d3 = function() { return logError(function (arg0) {
var ret = getObject(arg0).getClientExtensionResults();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_instanceof_HtmlInputElement_8969541a2a0bded0 = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof HTMLInputElement;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_setchecked_f6ead3490df88a7f = function() { return logError(function (arg0, arg1) {
getObject(arg0).checked = arg1 !== 0;
}, arguments) };
imports.wbg.__wbg_value_fc1c354d1a0e9714 = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).value;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_setvalue_ce4a23f487065c07 = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).value = getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_addEventListener_55682f77717d7665 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), getObject(arg4));
}, arguments) };
imports.wbg.__wbg_removeEventListener_9cd36e5806463d5d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), arg4 !== 0);
}, arguments) };
imports.wbg.__wbg_instanceof_HtmlDocument_395ec6365cabde6c = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof HTMLDocument;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_cookie_66f4449cc764fcb2 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg1).cookie;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_instanceof_Element_c9423704dd5d9b1d = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof Element;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_namespaceURI_e9a971e6c1ce68db = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg1).namespaceURI;
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_classList_5086913f676eb3f3 = function() { return logError(function (arg0) {
var ret = getObject(arg0).classList;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_removeAttribute_1adaecf6b4d35a09 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).removeAttribute(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_setAttribute_1776fcc9b98d464e = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
imports.wbg.__wbg_instanceof_HtmlElement_d3e8f1c1d6788b24 = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof HTMLElement;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_focus_4434360545ac99cf = function() { return handleError(function (arg0) {
getObject(arg0).focus();
}, arguments) };
imports.wbg.__wbg_credentials_403bf2de10e8f1c3 = function() { return logError(function (arg0) {
var ret = getObject(arg0).credentials;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_pushState_89ce908020e1d6aa = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) {
imports.wbg.__wbg_pushState_b0c96c33f80b8f64 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) {
getObject(arg0).pushState(getObject(arg1), getStringFromWasm0(arg2, arg3), arg4 === 0 ? undefined : getStringFromWasm0(arg4, arg5));
}, arguments) };
imports.wbg.__wbg_pathname_d0014089875ea691 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg1).pathname;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
imports.wbg.__wbg_pathname_805641640383ca79 = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg1).pathname;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_search_7e1c9ba7f3985c36 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg1).search;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
imports.wbg.__wbg_search_083c5449552cf16e = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg1).search;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_replace_ec236a3e3182c4da = function() { return handleError(function (arg0, arg1, arg2) {
imports.wbg.__wbg_replace_345170f940d047af = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).replace(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_parentElement_96e1e07348340043 = function() { return logError(function (arg0) {
var ret = getObject(arg0).parentElement;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
imports.wbg.__wbg_instanceof_Response_ccfeb62399355bcd = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof Response;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_lastChild_e2b014abab089e08 = function() { return logError(function (arg0) {
var ret = getObject(arg0).lastChild;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
imports.wbg.__wbg_status_600fd8b881393898 = function() { return logError(function (arg0) {
const ret = getObject(arg0).status;
_assertNum(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_setnodeValue_f175b74a390f8fda = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_appendChild_3fe5090c665d3bb4 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg0).appendChild(getObject(arg1));
imports.wbg.__wbg_headers_9e7f2c05a9b962ea = function() { return logError(function (arg0) {
const ret = getObject(arg0).headers;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_insertBefore_4f09909023feac91 = function() { return handleError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2));
imports.wbg.__wbg_json_df9259ba758ea2fe = function() { return handleError(function (arg0) {
const ret = getObject(arg0).json();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_removeChild_f4a83c9698136bbb = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg0).removeChild(getObject(arg1));
imports.wbg.__wbg_text_2612fbe0b9d32220 = function() { return handleError(function (arg0) {
const ret = getObject(arg0).text();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_get_bee69a0c35eec41c = function() { return handleError(function (arg0, arg1, arg2, arg3) {
var ret = getObject(arg1).get(getStringFromWasm0(arg2, arg3));
imports.wbg.__wbg_getItem_eb6e17b18b890a47 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
const ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3));
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_set_f9448486a94c9aef = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
imports.wbg.__wbg_getItem_f92ef607397e96b1 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3));
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_removeItem_ccc2014f87a14e1b = function() { return handleError(function (arg0, arg1, arg2) {
imports.wbg.__wbg_removeItem_be0233b7e0822d46 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).removeItem(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_setItem_279b13e5ad0b82cb = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
imports.wbg.__wbg_setItem_ed2ea572329ab721 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
imports.wbg.__wbg_instanceof_Response_ea36d565358a42f7 = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof Response;
imports.wbg.__wbg_get_85a5f49f8e22030b = function() { return handleError(function (arg0, arg1, arg2, arg3) {
const ret = getObject(arg1).get(getStringFromWasm0(arg2, arg3));
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_set_6884dcc6cdd65022 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
imports.wbg.__wbg_headers_0a71906114661592 = function() { return logError(function (arg0) {
const ret = getObject(arg0).headers;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newwithstrandinit_fd99688f189f053e = function() { return handleError(function (arg0, arg1, arg2) {
const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_pathname_704bbbf916a0727d = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg1).pathname;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_new_25e89e4c66f17ba3 = function() { return handleError(function (arg0, arg1) {
const ret = new URL(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_get_63177ea11cf74f5a = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg0).get(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_add_0e4449143d6e7625 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).add(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_remove_90cd0eb3c01b4900 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).remove(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_href_fbf5127aa00a8b86 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg1).href;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_value_f232184bd0e27b00 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg1).value;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_setvalue_8efcd1f77232ee9b = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).value = getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_instanceof_Element_4fafc1ceb4cdee77 = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof Element;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_status_3a55bb50e744b834 = function() { return logError(function (arg0) {
var ret = getObject(arg0).status;
_assertNum(ret);
return ret;
imports.wbg.__wbg_namespaceURI_3bb5841c365214c8 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg1).namespaceURI;
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_headers_e4204c6775f7b3b4 = function() { return logError(function (arg0) {
var ret = getObject(arg0).headers;
imports.wbg.__wbg_classList_557a7b717387d03d = function() { return logError(function (arg0) {
const ret = getObject(arg0).classList;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_json_4ab99130d1a5b3a9 = function() { return handleError(function (arg0) {
var ret = getObject(arg0).json();
return addHeapObject(ret);
imports.wbg.__wbg_removeAttribute_8a8f459a4b627ec4 = function() { return handleError(function (arg0, arg1, arg2) {
getObject(arg0).removeAttribute(getStringFromWasm0(arg1, arg2));
}, arguments) };
imports.wbg.__wbg_text_aeba5a5bbfef7f15 = function() { return handleError(function (arg0) {
var ret = getObject(arg0).text();
return addHeapObject(ret);
imports.wbg.__wbg_setAttribute_8d90e00d652037be = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
imports.wbg.__wbg_new_16f24b0728c5e67b = function() { return logError(function () {
var ret = new Array();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_push_a72df856079e6930 = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg0).push(getObject(arg1));
_assertNum(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_instanceof_Error_4287ce7d75f0e3a2 = function() { return logError(function (arg0) {
var ret = getObject(arg0) instanceof Error;
imports.wbg.__wbg_instanceof_HtmlElement_806c643943ab20c1 = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof HTMLElement;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_message_1dfe93b595be8811 = function() { return logError(function (arg0) {
var ret = getObject(arg0).message;
return addHeapObject(ret);
imports.wbg.__wbg_focus_42ad8e77a7a0b22a = function() { return handleError(function (arg0) {
getObject(arg0).focus();
}, arguments) };
imports.wbg.__wbg_name_66305ab387468967 = function() { return logError(function (arg0) {
var ret = getObject(arg0).name;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_toString_3e854a6a919f2996 = function() { return logError(function (arg0) {
var ret = getObject(arg0).toString();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newnoargs_f579424187aa1717 = function() { return logError(function (arg0, arg1) {
var ret = new Function(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_call_89558c3e96703ca1 = function() { return handleError(function (arg0, arg1) {
var ret = getObject(arg0).call(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_valueOf_39e0d6bc7e4232b9 = function() { return logError(function (arg0) {
var ret = getObject(arg0).valueOf();
return ret;
}, arguments) };
imports.wbg.__wbg_is_3d73f4d91adacc37 = function() { return logError(function (arg0, arg1) {
var ret = Object.is(getObject(arg0), getObject(arg1));
imports.wbg.__wbg_instanceof_Event_2311550b7d159b6e = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof Event;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_new_d3138911a89329b0 = function() { return logError(function () {
var ret = new Object();
imports.wbg.__wbg_target_46fd3a29f64b0e43 = function() { return logError(function (arg0) {
const ret = getObject(arg0).target;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_cancelBubble_7446704fccad1780 = function() { return logError(function (arg0) {
const ret = getObject(arg0).cancelBubble;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_preventDefault_747982fd5fe3b6d0 = function() { return logError(function (arg0) {
getObject(arg0).preventDefault();
}, arguments) };
imports.wbg.__wbg_instanceof_HtmlInputElement_750fccab172eab35 = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof HTMLInputElement;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_setchecked_e37cbc4fab363e71 = function() { return logError(function (arg0, arg1) {
getObject(arg0).checked = arg1 !== 0;
}, arguments) };
imports.wbg.__wbg_value_14b43f7df5bd6160 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg1).value;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_setvalue_649eb7de76d4a493 = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).value = getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_getClientExtensionResults_8400549e426a9259 = function() { return logError(function (arg0) {
const ret = getObject(arg0).getClientExtensionResults();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_resolve_4f8f547f26b30b27 = function() { return logError(function (arg0) {
var ret = Promise.resolve(getObject(arg0));
imports.wbg.__wbg_addEventListener_be0c061a1359c1dd = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), getObject(arg4));
}, arguments) };
imports.wbg.__wbg_removeEventListener_3e7319b5d7c8be8f = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), arg4 !== 0);
}, arguments) };
imports.wbg.__wbg_credentials_f81f9e33f9789a54 = function() { return logError(function (arg0) {
const ret = getObject(arg0).credentials;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_then_a6860c82b90816ca = function() { return logError(function (arg0, arg1) {
var ret = getObject(arg0).then(getObject(arg1));
imports.wbg.__wbg_instanceof_HtmlDocument_a4a9eb971e2c2b02 = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof HTMLDocument;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_cookie_4b5805da6b19c329 = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg1).cookie;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
imports.wbg.__wbg_parentElement_d078cf0bd5c4b641 = function() { return logError(function (arg0) {
const ret = getObject(arg0).parentElement;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_lastChild_84687239bfef7d2f = function() { return logError(function (arg0) {
const ret = getObject(arg0).lastChild;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_setnodeValue_77a78d32cf9e9152 = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2);
}, arguments) };
imports.wbg.__wbg_appendChild_a86c0da8d152eae4 = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg0).appendChild(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_then_58a04e42527f52c6 = function() { return logError(function (arg0, arg1, arg2) {
var ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
imports.wbg.__wbg_insertBefore_4df558a2aa0435c1 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_globalThis_d61b1f48a57191ae = function() { return handleError(function () {
var ret = globalThis.globalThis;
imports.wbg.__wbg_removeChild_b4ce6c8d6e5d47be = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg0).removeChild(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_self_e23d74ae45fb17d1 = function() { return handleError(function () {
var ret = self.self;
imports.wbg.__wbg_new_94fb1279cf6afea5 = function() { return logError(function () {
const ret = new Array();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_window_b4be7f48b24ac56e = function() { return handleError(function () {
var ret = window.window;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_global_e7669da72fd7f239 = function() { return handleError(function () {
var ret = global.global;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_new_e3b800e570795b3c = function() { return logError(function (arg0) {
var ret = new Uint8Array(getObject(arg0));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newwithbyteoffsetandlength_278ec7532799393a = function() { return logError(function (arg0, arg1, arg2) {
var ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_length_30803400a8f15c59 = function() { return logError(function (arg0) {
var ret = getObject(arg0).length;
imports.wbg.__wbg_push_40c6a90f1805aa90 = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg0).push(getObject(arg1));
_assertNum(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_set_5b8081e9d002f0df = function() { return logError(function (arg0, arg1, arg2) {
imports.wbg.__wbg_instanceof_Error_b074c76f6096db9b = function() { return logError(function (arg0) {
const ret = getObject(arg0) instanceof Error;
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_message_dcca38fbff239fbf = function() { return logError(function (arg0) {
const ret = getObject(arg0).message;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_name_642dd84602f48d65 = function() { return logError(function (arg0) {
const ret = getObject(arg0).name;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_toString_eec28c54c24b830b = function() { return logError(function (arg0) {
const ret = getObject(arg0).toString();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newnoargs_e23b458e372830de = function() { return logError(function (arg0, arg1) {
const ret = new Function(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_call_ae78342adc33730a = function() { return handleError(function (arg0, arg1) {
const ret = getObject(arg0).call(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_valueOf_a08afc4df5d92043 = function() { return logError(function (arg0) {
const ret = getObject(arg0).valueOf();
return ret;
}, arguments) };
imports.wbg.__wbg_is_40969b082b54c84d = function() { return logError(function (arg0, arg1) {
const ret = Object.is(getObject(arg0), getObject(arg1));
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_new_36359baae5a47e27 = function() { return logError(function () {
const ret = new Object();
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_resolve_a9a87bdd64e9e62c = function() { return logError(function (arg0) {
const ret = Promise.resolve(getObject(arg0));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_then_ce526c837d07b68f = function() { return logError(function (arg0, arg1) {
const ret = getObject(arg0).then(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_then_842e65b843962f56 = function() { return logError(function (arg0, arg1, arg2) {
const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_globalThis_8e275ef40caea3a3 = function() { return handleError(function () {
const ret = globalThis.globalThis;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_self_99737b4dcdf6f0d8 = function() { return handleError(function () {
const ret = self.self;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_window_9b61fbbf3564c4fb = function() { return handleError(function () {
const ret = window.window;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_global_5de1e0f82bddcd27 = function() { return handleError(function () {
const ret = global.global;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_new_cc9018bd6f283b6f = function() { return logError(function (arg0) {
const ret = new Uint8Array(getObject(arg0));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_newwithbyteoffsetandlength_ce1e75f0ce5f7974 = function() { return logError(function (arg0, arg1, arg2) {
const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_length_0acb1cf9bbaf8519 = function() { return logError(function (arg0) {
const ret = getObject(arg0).length;
_assertNum(ret);
return ret;
}, arguments) };
imports.wbg.__wbg_set_f25e869e4565d2a2 = function() { return logError(function (arg0, arg1, arg2) {
getObject(arg0).set(getObject(arg1), arg2 >>> 0);
}, arguments) };
imports.wbg.__wbg_buffer_5e74a88a1424a2e0 = function() { return logError(function (arg0) {
var ret = getObject(arg0).buffer;
imports.wbg.__wbg_buffer_7af23f65f6c64548 = function() { return logError(function (arg0) {
const ret = getObject(arg0).buffer;
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_get_8bbb82393651dd9c = function() { return handleError(function (arg0, arg1) {
var ret = Reflect.get(getObject(arg0), getObject(arg1));
imports.wbg.__wbg_get_a9cab131e3152c49 = function() { return handleError(function (arg0, arg1) {
const ret = Reflect.get(getObject(arg0), getObject(arg1));
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbg_set_c42875065132a932 = function() { return handleError(function (arg0, arg1, arg2) {
var ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2));
imports.wbg.__wbg_set_93b1c87ee2af852e = function() { return handleError(function (arg0, arg1, arg2) {
const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2));
_assertBoolean(ret);
return ret;
}, arguments) };
imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
var ret = debugString(getObject(arg1));
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
const ret = debugString(getObject(arg1));
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
@ -859,19 +859,19 @@ async function init(input) {
throw new Error(getStringFromWasm0(arg0, arg1));
};
imports.wbg.__wbindgen_memory = function() {
var ret = wasm.memory;
const ret = wasm.memory;
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper12230 = function() { return logError(function (arg0, arg1, arg2) {
var ret = makeClosure(arg0, arg1, 856, __wbg_adapter_30);
imports.wbg.__wbindgen_closure_wrapper12105 = function() { return logError(function (arg0, arg1, arg2) {
const ret = makeClosure(arg0, arg1, 848, __wbg_adapter_30);
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbindgen_closure_wrapper15845 = function() { return logError(function (arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 884, __wbg_adapter_33);
imports.wbg.__wbindgen_closure_wrapper15823 = function() { return logError(function (arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 885, __wbg_adapter_33);
return addHeapObject(ret);
}, arguments) };
imports.wbg.__wbindgen_closure_wrapper16308 = function() { return logError(function (arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 913, __wbg_adapter_36);
imports.wbg.__wbindgen_closure_wrapper16232 = function() { return logError(function (arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 904, __wbg_adapter_36);
return addHeapObject(ret);
}, arguments) };

BIN
kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm
View file

Binary file not shown.

6
kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm.d.ts vendored
View file

@ -5,9 +5,9 @@ export function run_app(a: number): void;
export function __wbindgen_malloc(a: number): number;
export function __wbindgen_realloc(a: number, b: number, c: number): number;
export const __wbindgen_export_2: WebAssembly.Table;
export function _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f(a: number, b: number, c: number): void;
export function __wbindgen_add_to_stack_pointer(a: number): number;
export function __wbindgen_free(a: number, b: number): void;
export function __wbindgen_exn_store(a: number): void;

41
orca/Cargo.toml
View file

@ -16,35 +16,34 @@ path = "src/main.rs"
[dependencies]
jemallocator = { version = "0.3.0", optional = true }
tracing = "0.1"
tracing-subscriber = "0.3"
tracing = "^0.1.34"
tracing-subscriber = "^0.3.11"
structopt = { version = "0.3", default-features = false }
structopt = { version = "^0.3.26", default-features = false }
uuid = { version = "0.8", features = ["serde", "v4" ] }
csv = "1.1"
serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
uuid = { version = "^1.0.0", features = ["serde", "v4" ] }
csv = "1.1.6"
serde = { version = "^1.0.136", features = ["derive"] }
serde_json = "^1.0.79"
rand = "0.8"
toml = "0.5"
rand = "^0.8.5"
toml = "^0.5.9"
kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" }
kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha" }
kanidm_proto = { path = "../kanidm_proto" }
kanidm_client = { path = "../kanidm_client" }
tokio = { version = "1", features = ["full"] }
tokio-util = { version = "0.6", features = ["codec"] }
tokio-openssl = "0.6"
futures-util = "0.3"
openssl = "0.10"
tokio = { version = "^1.17.0", features = ["rt-multi-thread"] }
tokio-util = { version = "^0.7.1", features = ["codec"] }
tokio-openssl = "^0.6.3"
futures-util = { version = "^0.3.21", features = ["sink"] }
openssl = "^0.10.38"
ldap3_server = "^0.1.7"
# ldap3_server = { version = "0.1", path = "../../ldap3_server" }
ldap3_proto = "^0.2.3"
crossbeam = "0.8"
async-std = { version = "1.6", features = ["tokio1"] }
crossbeam = "0.8.1"
async-std = { version = "^1.11.0", features = ["tokio1"] }
mathru = "0.11"
mathru = "^0.12.0"
[build-dependencies]
profiles = { path = "../profiles" }

2
orca/src/ds.rs
View file

@ -2,7 +2,7 @@ use crate::data::*;
use crate::ldap::{LdapClient, LdapSchema};
use crate::profile::DsConfig;
use crate::{TargetServer, TargetServerBuilder};
use ldap3_server::proto::*;
use ldap3_proto::proto::*;
use std::collections::{HashMap, HashSet};
use std::time::{Duration, Instant};
use uuid::Uuid;

4
orca/src/ldap.rs
View file

@ -11,8 +11,8 @@ use tokio::sync::Mutex;
use tokio_openssl::SslStream;
use tokio_util::codec::Framed;
use ldap3_server::proto::*;
use ldap3_server::LdapCodec;
use ldap3_proto::proto::*;
use ldap3_proto::LdapCodec;
struct LdapInner {
pub framed: Framed<SslStream<TcpStream>, LdapCodec>,

9
profiles/Cargo.toml
View file

@ -15,10 +15,9 @@ name = "profiles"
path = "src/lib.rs"
[dependencies]
serde = { version = "1", features = ["derive"] }
toml = "0.5"
base64 = "0.13"
rustc_version = "0.4.0"
serde = { version = "^1.0.136", features = ["derive"] }
toml = "^0.5.9"
base64 = "^0.13.0"
[build-dependencies]
base64 = "0.13"
base64 = "^0.13.0"