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

Update to 12 dev (#1356)

Browse source
This commit is contained in:
Firstyear 2023-02-01 16:21:00 +10:00 committed by GitHub
parent d3a2a6b39a
commit 965423d2ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 48 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -1161,7 +1161,7 @@ dependencies = [
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"clap", "clap",
"clap_complete", "clap_complete",
@ -2250,7 +2250,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ipa-sync" name = "kanidm-ipa-sync"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"base64urlsafedata", "base64urlsafedata",
"chrono", "chrono",
@ -2274,7 +2274,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_client" name = "kanidm_client"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"kanidm_proto", "kanidm_proto",
"reqwest", "reqwest",
@ -2291,7 +2291,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_proto" name = "kanidm_proto"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"base32", "base32",
"base64urlsafedata", "base64urlsafedata",
@ -2310,7 +2310,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_tools" name = "kanidm_tools"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"clap", "clap",
"clap_complete", "clap_complete",
@ -2337,7 +2337,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_unix_int" name = "kanidm_unix_int"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"bytes", "bytes",
"clap", "clap",
@ -2369,7 +2369,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_core" name = "kanidmd_core"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"chrono", "chrono",
@ -2402,7 +2402,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib" name = "kanidmd_lib"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-trait", "async-trait",
@ -2471,7 +2471,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_testkit" name = "kanidmd_testkit"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"compact_jwt", "compact_jwt",
"futures", "futures",
@ -2493,7 +2493,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui" name = "kanidmd_web_ui"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"compact_jwt", "compact_jwt",
"gloo", "gloo",
@ -2884,7 +2884,7 @@ dependencies = [
[[package]] [[package]]
name = "nss_kanidm" name = "nss_kanidm"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"lazy_static", "lazy_static",
@ -3091,7 +3091,7 @@ dependencies = [
[[package]] [[package]]
name = "orca" name = "orca"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"clap", "clap",
"crossbeam", "crossbeam",
@ -3131,7 +3131,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "pam_kanidm" name = "pam_kanidm"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"libc", "libc",
@ -3420,7 +3420,7 @@ dependencies = [
[[package]] [[package]]
name = "profiles" name = "profiles"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"base64 0.13.1", "base64 0.13.1",
"serde", "serde",
@ -4126,7 +4126,7 @@ dependencies = [
[[package]] [[package]]
name = "sketching" name = "sketching"
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"num_enum", "num_enum",

4
Cargo.toml
View file

@ -25,7 +25,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "1.1.0-alpha.11" version = "1.1.0-alpha.12-dev"
authors = [ authors = [
"William Brown <william@blackhats.net.au>", "William Brown <william@blackhats.net.au>",
"James Hodgkinson <james@terminaloutcomes.com>", "James Hodgkinson <james@terminaloutcomes.com>",
@ -47,7 +47,7 @@ clap = { version = "^3.2", features = ["derive"] }
clap_complete = "^3.2.5" clap_complete = "^3.2.5"
# Forced by saffron/cron # Forced by saffron/cron
chrono = "^0.4.23" chrono = "^0.4.23"
compact_jwt = "^0.2.3" compact_jwt = { version = "^0.2.3", default-features = false }
# compact_jwt = { path = "../compact_jwt" } # compact_jwt = { path = "../compact_jwt" }
concread = "^0.4.1" concread = "^0.4.1"
# concread = { path = "../concread" } # concread = { path = "../concread" }

2
kanidmd/lib/Cargo.toml
View file

@ -24,7 +24,7 @@ async-std.workspace = true
async-trait.workspace = true async-trait.workspace = true
base64.workspace = true base64.workspace = true
base64urlsafedata.workspace = true base64urlsafedata.workspace = true
compact_jwt.workspace = true compact_jwt = { workspace = true, features = ["openssl"] }
concread.workspace = true concread.workspace = true
dyn-clone.workspace = true dyn-clone.workspace = true
fernet = { workspace = true, features = ["fernet_danger_timestamps"] } fernet = { workspace = true, features = ["fernet_danger_timestamps"] }

43
kanidmd_web_ui/Cargo.toml
View file

@ -2,7 +2,8 @@
name = "kanidmd_web_ui" name = "kanidmd_web_ui"
description = "Kanidm Server Web User Interface" description = "Kanidm Server Web User Interface"
documentation = "https://docs.rs/kanidm/latest/kanidm/" documentation = "https://docs.rs/kanidm/latest/kanidm/"
version = "1.1.0-alpha.11"
version = "1.1.0-alpha.12-dev"
authors = [ authors = [
"William Brown <william@blackhats.net.au>", "William Brown <william@blackhats.net.au>",
"James Hodgkinson <james@terminaloutcomes.com>", "James Hodgkinson <james@terminaloutcomes.com>",
@ -13,6 +14,13 @@ license = "MPL-2.0"
homepage = "https://github.com/kanidm/kanidm/" homepage = "https://github.com/kanidm/kanidm/"
repository = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/"
# version.workspace = true
# authors.workspace = true
# rust-version.workspace = true
# edition.workspace = true
# license.workspace = true
# homepage.workspace = true
# repository.workspace = true
# These are ignored because the crate is in a workspace # These are ignored because the crate is in a workspace
#[profile.release] #[profile.release]
@ -22,26 +30,27 @@ repository = "https://github.com/kanidm/kanidm/"
crate-type = ["cdylib", "rlib"] crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
compact_jwt = { version = "^0.2.3", default-features = false, features = ["unsafe_release_without_verify"] } compact_jwt = { workspace = true, default-features = false, features = ["unsafe_release_without_verify"] }
gloo = "^0.8.0" # gloo = "^0.8.0"
gloo-net = "0.2.6" gloo.workspace = true
js-sys = "^0.3.58" gloo-net.workspace = true
js-sys.workspace = true
kanidm_proto = { path = "../kanidm_proto", features = ["wasm"] } kanidm_proto = { path = "../kanidm_proto", features = ["wasm"] }
qrcode = { version = "^0.12.0", default-features = false, features = ["svg"] } qrcode = { workspace = true, default-features = false, features = ["svg"] }
serde = { version = "^1.0.152", features = ["derive"] } serde = { workspace = true, features = ["derive"] }
serde_json = "^1.0.91" serde_json.workspace = true
serde-wasm-bindgen = "0.4" serde-wasm-bindgen.workspace = true
uuid = "^1.2.1" wasm-bindgen.workspace = true
wasm-bindgen = { version = "^0.2.81" } wasm-bindgen-futures.workspace = true
wasm-bindgen-futures = { version = "^0.4.30" } wasm-bindgen-test.workspace = true
wasm-bindgen-test = "0.3.33" url.workspace = true
url = "^2.3.1" uuid.workspace = true
yew = { version = "0.20.0", features = ["csr"] } yew = { workspace = true, features = ["csr"] }
yew-router = "^0.17.0" yew-router.workspace = true
[dependencies.web-sys] [dependencies.web-sys]
version = "^0.3.60" workspace = true
features = [ features = [
"AuthenticationExtensionsClientOutputs", "AuthenticationExtensionsClientOutputs",
"AuthenticatorResponse", "AuthenticatorResponse",

2
kanidmd_web_ui/pkg/kanidmd_web_ui.js
View file

@ -404,7 +404,7 @@ function getImports() {
const ret = false; const ret = false;
return ret; return ret;
}; };
imports.wbg.__wbg_modalhidebyid_9076f9d79351b537 = function(arg0, arg1) { imports.wbg.__wbg_modalhidebyid_6dd8ae230b194210 = function(arg0, arg1) {
modal_hide_by_id(getStringFromWasm0(arg0, arg1)); modal_hide_by_id(getStringFromWasm0(arg0, arg1));
}; };
imports.wbg.__wbg_subtreeid_e348577f7ef777e3 = function(arg0, arg1) { imports.wbg.__wbg_subtreeid_e348577f7ef777e3 = function(arg0, arg1) {

BIN
kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm
View file

Binary file not shown.

2
kanidmd_web_ui/pkg/package.json
View file

@ -5,7 +5,7 @@
"James Hodgkinson <james@terminaloutcomes.com>" "James Hodgkinson <james@terminaloutcomes.com>"
], ],
"description": "Kanidm Server Web User Interface", "description": "Kanidm Server Web User Interface",
"version": "1.1.0-alpha.11", "version": "1.1.0-alpha.12-dev",
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

4
project_docs/RELEASE_CHECKLIST.md
View file

@ -57,7 +57,8 @@ cargo install cargo-outdated
### Docker ### Docker
- [ ] docker buildx use cluster - [ ] docker buildx use cluster
- [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/radiusd` - [ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd`
- [ ] `IMAGE_VERSION=latest make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/kanidm_tools buildx/radiusd`
- [ ] Update the readme on docker https://hub.docker.com/repository/docker/kanidm/server - [ ] Update the readme on docker https://hub.docker.com/repository/docker/kanidm/server
### Distro ### Distro
@ -71,4 +72,3 @@ cargo install cargo-outdated
- [ ] git branch YYYYMMDD-dev-version - [ ] git branch YYYYMMDD-dev-version
- [ ] update version in ./kanidmd\_web\_ui/Cargo.toml - [ ] update version in ./kanidmd\_web\_ui/Cargo.toml
- [ ] update version in ./Cargo.toml - [ ] update version in ./Cargo.toml
- [ ] build wasm components with debug profile