privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Platform Unstable #97

Merged
max merged 34 commits from platform-unstable into master 2024-06-07 00:17:36 +03:00
Conversation 38 Commits 34 Files changed 268 +10 -10
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 55f1180bb5 - Show all commits

20
patches/base/kanidm/unixd-authenticated.patch
View file

@ -1,16 +1,16 @@
diff --git a/unix_integration/src/idprovider/kanidm.rs b/unix_integration/src/idprovider/kanidm.rs diff --git a/unix_integration/src/idprovider/kanidm.rs b/unix_integration/src/idprovider/kanidm.rs
index d1b02de0f..599dec6d5 100644 index 6fc015756..31593f03e 100644
--- a/unix_integration/src/idprovider/kanidm.rs --- a/unix_integration/src/idprovider/kanidm.rs
+++ b/unix_integration/src/idprovider/kanidm.rs +++ b/unix_integration/src/idprovider/kanidm.rs
@@ -2,6 +2,7 @@ use async_trait::async_trait; @@ -4,6 +4,7 @@ use kanidm_client::{ClientError, KanidmClient, StatusCode};
use kanidm_client::{ClientError, KanidmClient, StatusCode}; use kanidm_proto::internal::OperationError;
use kanidm_proto::v1::{OperationError, UnixGroupToken, UnixUserToken}; use kanidm_proto::v1::{UnixGroupToken, UnixUserToken};
use tokio::sync::RwLock; use tokio::sync::{broadcast, RwLock};
+use std::env; +use std::env;
use super::interface::{ use super::interface::{
AuthCacheAction, AuthCredHandler, AuthRequest, AuthResult, GroupToken, Id, IdProvider, // KeyStore,
@@ -11,12 +12,28 @@ use crate::unix_proto::PamAuthRequest; @@ -25,12 +26,28 @@ const TAG_IDKEY: &str = "idkey";
pub struct KanidmProvider { pub struct KanidmProvider {
client: RwLock<KanidmClient>, client: RwLock<KanidmClient>,
@ -39,10 +39,10 @@ index d1b02de0f..599dec6d5 100644
} }
} }
} }
@@ -73,7 +90,11 @@ impl From<UnixGroupToken> for GroupToken { @@ -118,7 +135,11 @@ impl IdProvider for KanidmProvider {
impl IdProvider for KanidmProvider {
// Needs .read on all types except re-auth. // Needs .read on all types except re-auth.
async fn provider_authenticate(&self) -> Result<(), IdpError> { async fn provider_authenticate(&self, _tpm: &mut tpm::BoxedDynTpm) -> Result<(), IdpError> {
- match self.client.write().await.auth_anonymous().await { - match self.client.write().await.auth_anonymous().await {
+ let auth_method = match (&self.auth_name, &self.auth_password) { + let auth_method = match (&self.auth_name, &self.auth_password) {
+ (Some(name), Some(password)) => self.client.write().await.auth_simple_password(name, password).await, + (Some(name), Some(password)) => self.client.write().await.auth_simple_password(name, password).await,