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 Packages Projects Releases Wiki Activity

Improve spans in unixd (#3397)

Browse source 
Some areas of the code were emitting 0 uuids, rather than associating
a client/connection uuid. This improves the startup and client handling
code so that we have stable uuids present during operation.
This commit is contained in:
Firstyear 2025-02-05 11:33:30 +10:00 committed by GitHub
parent 9505b5a732
commit 9c2825b9dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
unix_integration/resolver/src/bin/kanidm_unixd.rs
View file

@ -197,7 +197,10 @@ async fn handle_client(
cachelayer: Arc<Resolver>, cachelayer: Arc<Resolver>,
task_channel_tx: &Sender<AsyncTaskRequest>, task_channel_tx: &Sender<AsyncTaskRequest>,
) -> Result<(), Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
debug!("Accepted connection"); let conn_id = uuid::Uuid::new_v4();
let span = span!(Level::DEBUG, "accepted connection", uuid = %conn_id);
let _enter = span.enter();
let Ok(ucred) = sock.peer_cred() else { let Ok(ucred) = sock.peer_cred() else {
return Err(Box::new(IoError::new( return Err(Box::new(IoError::new(
@ -206,6 +209,8 @@ async fn handle_client(
))); )));
}; };
debug!(uid = ?ucred.uid(), gid = ?ucred.gid(), pid = ?ucred.pid());
let mut reqs = Framed::new(sock, ClientCodec); let mut reqs = Framed::new(sock, ClientCodec);
let mut pam_auth_session_state = None; let mut pam_auth_session_state = None;
@ -213,9 +218,12 @@ async fn handle_client(
// tell consumers to stop work. // tell consumers to stop work.
let (shutdown_tx, _shutdown_rx) = broadcast::channel(1); let (shutdown_tx, _shutdown_rx) = broadcast::channel(1);
trace!("Waiting for requests ..."); debug!("Waiting for requests ...");
// Drop the span here so that there are no parent spans during the request loop.
drop(_enter);
while let Some(Ok(req)) = reqs.next().await { while let Some(Ok(req)) = reqs.next().await {
let span = span!(Level::DEBUG, "client_request"); let span = span!(Level::INFO, "client request", uuid = %conn_id);
let _enter = span.enter(); let _enter = span.enter();
let resp = match req { let resp = match req {
@ -405,7 +413,10 @@ async fn handle_client(
} }
// Disconnect them // Disconnect them
debug!("Disconnecting client ..."); let span = span!(Level::DEBUG, "disconnecting client", uuid = %conn_id);
let _enter = span.enter();
debug!(uid = ?ucred.uid(), gid = ?ucred.gid(), pid = ?ucred.pid());
Ok(()) Ok(())
} }
@ -595,6 +606,9 @@ async fn main() -> ExitCode {
) )
) )
.on(async { .on(async {
let span = span!(Level::DEBUG, "starting resolver");
let _enter = span.enter();
if clap_args.get_flag("skip-root-check") { if clap_args.get_flag("skip-root-check") {
warn!("Skipping root user check, if you're running this for testing, ensure you clean up temporary files.") warn!("Skipping root user check, if you're running this for testing, ensure you clean up temporary files.")
// TODO: this wording is not great m'kay. // TODO: this wording is not great m'kay.
@ -1165,6 +1179,9 @@ async fn main() -> ExitCode {
info!("Server started ..."); info!("Server started ...");
// End the startup span, we can now proceed.
drop(_enter);
// On linux, notify systemd. // On linux, notify systemd.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]); let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);