JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kanidm: 1.1.0-rc.15 -> 1.1.0-rc.16

Browse Source 
Release notes: https://github.com/kanidm/kanidm/releases/tag/v1.1.0-rc.16
This commit is contained in:
Tom Hubrecht 2024-02-07 09:24:52 +01:00
parent fb13cdcf93
commit ad67485526
4 changed files with 1010 additions and 874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/security/kanidm.nix
View File

@ -165,10 +165,17 @@ in
type = lib.types.submodule {
freeformType = settingsFormat.type;
options.pam_allowed_login_groups = lib.mkOption {
description = lib.mdDoc "Kanidm groups that are allowed to login using PAM.";
example = "my_pam_group";
type = lib.types.listOf lib.types.str;
options = {
pam_allowed_login_groups = lib.mkOption {
description = lib.mdDoc "Kanidm groups that are allowed to login using PAM.";
example = "my_pam_group";
type = lib.types.listOf lib.types.str;
};
hsm_pin_path = lib.mkOption {
description = lib.mdDoc "Path to a HSM pin.";
default = "/var/cache/kanidm-unixd/hsm-pin";
type = lib.types.path;
};
};
};
description = lib.mdDoc ''

80
pkgs/servers/kanidm/0001-fix-warnings-for-rust-v1.75.patch
View File

@ -1,80 +0,0 @@
From de330efaf02ed66d6641ab3bb55eed4bcfad430b Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 14 Jan 2024 23:53:12 +0200
Subject: [PATCH] fix warnings for rust v1.75
---
server/lib/src/idm/authsession.rs | 4 ++--
server/testkit/tests/integration.rs | 5 ++---
server/web_ui/login_flows/src/oauth2.rs | 3 +--
unix_integration/nss_kanidm/src/lib.rs | 3 +--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/lib/src/idm/authsession.rs b/server/lib/src/idm/authsession.rs
index 734864f0d..c65b88494 100644
--- a/server/lib/src/idm/authsession.rs
+++ b/server/lib/src/idm/authsession.rs
@@ -3,7 +3,7 @@
//! factor to assert that the user is legitimate. This also contains some
//! support code for asynchronous task execution.
use std::collections::BTreeMap;
-pub use std::collections::BTreeSet as Set;
+
use std::convert::TryFrom;
use std::fmt;
use std::time::Duration;
@@ -1237,7 +1237,7 @@ impl AuthSession {
#[cfg(test)]
mod tests {
- pub use std::collections::BTreeSet as Set;
+
use std::str::FromStr;
use std::time::Duration;
diff --git a/server/testkit/tests/integration.rs b/server/testkit/tests/integration.rs
index e6879b44b..472022892 100644
--- a/server/testkit/tests/integration.rs
+++ b/server/testkit/tests/integration.rs
@@ -2,12 +2,11 @@
use std::process::Output;
-use tempfile::tempdir;
+
use kanidm_client::KanidmClient;
use kanidmd_testkit::{
- login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_USER,
- NOT_ADMIN_TEST_USERNAME,
+ login_put_admin_idm_admins, ADMIN_TEST_PASSWORD, IDM_ADMIN_TEST_PASSWORD,
};
use testkit_macros::cli_kanidm;
diff --git a/server/web_ui/login_flows/src/oauth2.rs b/server/web_ui/login_flows/src/oauth2.rs
index a41e3083f..d735a7b4d 100644
--- a/server/web_ui/login_flows/src/oauth2.rs
+++ b/server/web_ui/login_flows/src/oauth2.rs
@@ -2,8 +2,7 @@ use gloo::console;
use kanidm_proto::constants::uri::{OAUTH2_AUTHORISE, OAUTH2_AUTHORISE_PERMIT};
use kanidm_proto::constants::{APPLICATION_JSON, KOPID};
pub use kanidm_proto::oauth2::{
- AccessTokenRequest, AccessTokenResponse, AuthorisationRequest, AuthorisationResponse,
- CodeChallengeMethod, ErrorResponse,
+ AuthorisationRequest, AuthorisationResponse,
};
use kanidmd_web_ui_shared::constants::{CONTENT_TYPE, CSS_ALERT_DANGER, URL_OAUTH2};
use kanidmd_web_ui_shared::utils::{do_alert_error, do_footer, window};
diff --git a/unix_integration/nss_kanidm/src/lib.rs b/unix_integration/nss_kanidm/src/lib.rs
index ef13192b9..27e3321a8 100644
--- a/unix_integration/nss_kanidm/src/lib.rs
+++ b/unix_integration/nss_kanidm/src/lib.rs
@@ -20,5 +20,4 @@ extern crate lazy_static;
#[cfg(target_family = "unix")]
mod implementation;
-#[cfg(target_family = "unix")]
-pub use implementation::*;
+
--
2.42.0

1773
pkgs/servers/kanidm/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

16
pkgs/servers/kanidm/default.nix
View File

@ -19,27 +19,19 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "kanidm";
version = "1.1.0-rc.15";
version = "1.1.0-rc.16";
src = fetchFromGitHub {
owner = pname;
repo = pname;
# Latest 1.1.0-rc.15 tip
rev = "4d250f817dbd24d77f72427bb93ef3a367a553c6";
hash = "sha256-cXPqTIDHMWcsRFi1/u8lIpwk2m6rh4C70IwVky7B2qs=";
rev = version;
hash = "sha256-UavMiHe91UrCZfmG6b+yhdduOY2eKMev9HSjtXq1Tlw=";
};
patches = [
# TODO: Remove in the next update
# or when https://github.com/kanidm/kanidm/commit/dbf476fe5ea2c120dff9a85e552be9f898c69ce7 is backported
./0001-fix-warnings-for-rust-v1.75.patch
];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"base64urlsafedata-0.1.3" = "sha256-JLUxLQCwZgxCmXt636baZYo8nQW/ZfHZOqnOIrIks2s=";
"base64urlsafedata-0.1.3" = "sha256-lYVWuKqF4c34LpFmTIg98TEXIlP4dHen0XkGnLOiq8Q=";
"sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM=";
};
};