diff --git a/README.md b/README.md index 0e4b0e7a7..091463545 100644 --- a/README.md +++ b/README.md @@ -66,10 +66,10 @@ all backgrounds. * CLI for administration * WebUI for self-service with wifi enrollment, claim management and more. * RBAC/Claims/Policy (limited by time and credential scope) +* OIDC/Oauth ### Upcoming Focus Areas -* OIDC/Oauth * Replication (async multiple active write servers, read-only servers) ### Future diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2e1431801..9403d0e35 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -18,7 +18,7 @@ can help. If you find a bug or issue, we'd love you to report it to our ## 2022-05-01 - Kanidm 1.1.0-alpha8 -This is the eigth alpha series release of the Kanidm Identity Management +This is the eighth alpha series release of the Kanidm Identity Management project. Alpha releases are to help get feedback and ideas from the community on how we can continue to make this project better for a future supported release. diff --git a/kanidm_client/Cargo.toml b/kanidm_client/Cargo.toml index 3e537777d..806cc808c 100644 --- a/kanidm_client/Cargo.toml +++ b/kanidm_client/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/kanidm/kanidm/" [dependencies] tracing = "^0.1.34" reqwest = { version = "^0.11.10", features=["cookies", "json", "native-tls"] } -kanidm_proto = { path = "../kanidm_proto" } +kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha.8" } serde = { version = "^1.0.136", features = ["derive"] } serde_json = "^1.0.79" toml = "^0.5.9" diff --git a/kanidm_rlm_python/Dockerfile b/kanidm_rlm_python/Dockerfile index 82f1a6f78..78e050581 100644 --- a/kanidm_rlm_python/Dockerfile +++ b/kanidm_rlm_python/Dockerfile @@ -3,6 +3,9 @@ LABEL org.opencontainers.image.authors="william@blackhats.net.au" EXPOSE 1812 1813 +RUN sed -i -E 's/https?:\/\/download.opensuse.org/http:\/\/dl.suse.blackhats.net.au:8080/g' /etc/zypp/repos.d/*.repo && \ + zypper --gpg-auto-import-keys ref --force + RUN zypper install -y timezone freeradius-client freeradius-server freeradius-server-ldap \ freeradius-server-python3 openldap2-client freeradius-server-utils hostname \ python3 python3-requests python3-devel && \ diff --git a/kanidm_tools/Cargo.toml b/kanidm_tools/Cargo.toml index dc2fe297a..2433b8b14 100644 --- a/kanidm_tools/Cargo.toml +++ b/kanidm_tools/Cargo.toml @@ -29,8 +29,8 @@ name = "kanidm_badlist_preprocess" path = "src/badlist_preprocess.rs" [dependencies] -kanidm_client = { path = "../kanidm_client" } -kanidm_proto = { path = "../kanidm_proto" } +kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha.8" } +kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha.8" } tracing = "^0.1.34" tracing-subscriber = { version = "^0.3.11", features = ["env-filter", "fmt"] } rpassword = "^6.0.1" diff --git a/kanidmd/Dockerfile b/kanidmd/Dockerfile index f289c2f57..ff7c9eb96 100644 --- a/kanidmd/Dockerfile +++ b/kanidmd/Dockerfile @@ -3,7 +3,7 @@ FROM ${BASE_IMAGE} AS builder LABEL mantainer william@blackhats.net.au RUN zypper ar obs://devel:languages:rust devel:languages:rust && \ - sed -i -E 's/https?:\/\/download.opensuse.org/https:\/\/mirrorcache.firstyear.id.au/g' /etc/zypp/repos.d/*.repo && \ + sed -i -E 's/https?:\/\/download.opensuse.org/http:\/\/dl.suse.blackhats.net.au:8080/g' /etc/zypp/repos.d/*.repo && \ zypper --gpg-auto-import-keys ref --force && \ zypper dup -y && \ zypper install -y \ diff --git a/project_docs/RELEASE_CHECKLIST.md b/project_docs/RELEASE_CHECKLIST.md index c14b9e37c..1eae38208 100644 --- a/project_docs/RELEASE_CHECKLIST.md +++ b/project_docs/RELEASE_CHECKLIST.md @@ -1,40 +1,59 @@ -// cargo install cargo-audit -// cargo install cargo-outdated -// cargo install cargo-release +## Pre-Reqs -* upgrade crypto policy values if requires -* bump index version in constants -* check for breaking db entry changes. + cargo install cargo-audit + cargo install cargo-outdated + cargo install cargo-release -* cargo outdated -R -* cargo audit +## Check List -* cargo test +### Code Changes -* Update `RELEASE_NOTES.md` -* git commit +[ ] upgrade crypto policy values if requires +[ ] bump index version in constants +[ ] check for breaking db entry changes. +[ ] build wasm components with release -* cargo release --no-dev-version --no-push --no-publish --no-tag 1.1.0-alpha.X -* git rebase -i HEAD~X -* git tag v1.1.0-alpha.x -* git branch v1.1.0-alpha.x -* git checkout v1.1.0-alpha.x +### Cargo Tasks -// Check it +[ ] cargo outdated -R +[ ] cargo audit +[ ] cargo test -* git push origin v1.1.0-alpha.x -* git push origin master +### Administration -* release `kanidm_proto` -* release `kanidmd/kanidm` -* release `kanidm_client` -* release `kanidm_tools` +[ ] Update `RELEASE_NOTES.md` +[ ] git commit +[ ] Update the readme on docker https://hub.docker.com/repository/docker/kanidm/server -* build `kanidmd` docker -* build `kanidm_radisud` docker +### Git Management -* vendor and release to build.opensuse.org - osc service ra; osc ci +[ ] cargo release --no-dev-version --no-push --no-publish --no-tag 1.1.0-alpha.X +[ ] git rebase -i HEAD~X +[ ] git tag v1.1.0-alpha.x +[ ] git branch 1.1.0-alpha.x (Note no v to prevent ref conflict) +[ ] git checkout v1.1.0-alpha.x +[ ] Inspect the branch + +[ ] git push origin 1.1.0-alpha.x +[ ] git push origin 1.1.0-alpha.x --tags +[ ] git push origin master +[ ] git push origin master --tags + +### Cargo publish + +[ ] publish `kanidm_proto` +[ ] publish `kanidmd/kanidm` +[ ] publish `kanidm_client` +[ ] publish `kanidm_tools` + +### Docker + +[ ] docker buildx use cluster +[ ] `make buildx/kanidmd/x86_64_v3 buildx/kanidmd buildx/radiusd` + +### Distro + +[ ] vendor and release to build.opensuse.org