mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-05-16 22:13:54 +02:00
Code Issues Actions6 Packages Projects Releases Wiki Activity

Return sshkey label to cli fields ()

Browse source 
* Return ssh label to cli fields
This commit is contained in:
Firstyear 2024-01-20 17:17:57 +10:00 committed by GitHub
parent b1e7cb13a5
commit 86916a3d87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 19 additions and 13 deletions
libs/client/src
lib.rs
server/lib/src
server
mod.rs
valueset
ssh.rs
tools/cli/src/cli
person.rsserviceaccount.rs

2
libs/client/src/lib.rs
View file

@ -1871,6 +1871,8 @@ impl KanidmClient {
}
// == generic ssh key handlers
// These return the ssh keys in their "authorized keys" form rather than a format that
// shows labels and can be easily updated.
pub async fn idm_account_get_ssh_pubkey(
&self,
id: &str,

10
server/lib/src/server/mod.rs
View file

@ -781,13 +781,11 @@ pub trait QueryServerTransaction<'a> {
})
.collect();
v
/*
// We previously special cased sshkeys here, but proto string now yields
// these as the proper string keys that ldap expects.
} else if let Some(k_set) = value.as_sshkey_map() {
let v: Vec<_> = k_set.values().cloned().map(|s| s.into_bytes()).collect();
// We have to special case ssh keys here as the proto form isn't valid for
// sss_ssh_authorized_keys to consume.
} else if let Some(key_iter) = value.as_sshpubkey_string_iter() {
let v: Vec<_> = key_iter.map(|s| s.into_bytes()).collect();
Ok(v)
*/
} else {
let v: Vec<_> = value
.to_proto_string_clone_iter()

2
server/lib/src/valueset/ssh.rs
View file

@ -138,7 +138,7 @@ impl ValueSetT for ValueSetSshKey {
}
fn to_proto_string_clone_iter(&self) -> Box<dyn Iterator<Item = String> + '_> {
Box::new(self.map.values().map(|pk| pk.to_string()))
Box::new(self.map.iter().map(|(tag, pk)| format!("{}: {}", tag, pk)))
}
fn to_db_valueset_v2(&self) -> DbValueSetV2 {

9
tools/cli/src/cli/person.rs
View file

@ -6,7 +6,7 @@ use dialoguer::theme::ColorfulTheme;
use dialoguer::{Confirm, Input, Password, Select};
use kanidm_client::ClientError::Http as ClientErrorHttp;
use kanidm_client::KanidmClient;
use kanidm_proto::constants::{ATTR_ACCOUNT_EXPIRE, ATTR_ACCOUNT_VALID_FROM};
use kanidm_proto::constants::{ATTR_ACCOUNT_EXPIRE, ATTR_ACCOUNT_VALID_FROM, ATTR_SSH_PUBLICKEY};
use kanidm_proto::messages::{AccountChangeMessage, ConsoleOutputMode, MessageStatus};
use kanidm_proto::v1::OperationError::PasswordQuality;
use kanidm_proto::v1::{
@ -215,10 +215,13 @@ impl PersonOpt {
let client = aopt.copt.to_client(OpType::Read).await;
match client
.idm_account_get_ssh_pubkeys(aopt.aopts.account_id.as_str())
.idm_person_account_get_attr(
aopt.aopts.account_id.as_str(),
ATTR_SSH_PUBLICKEY,
)
.await
{
Ok(pkeys) => pkeys.iter().for_each(|pkey| println!("{}", pkey)),
Ok(pkeys) => pkeys.iter().flatten().for_each(|pkey| println!("{}", pkey)),
Err(e) => handle_client_error(e, aopt.copt.output_mode),
}
}

9
tools/cli/src/cli/serviceaccount.rs
View file

@ -1,5 +1,5 @@
use crate::common::{try_expire_at_from_string, OpType};
use kanidm_proto::constants::{ATTR_ACCOUNT_EXPIRE, ATTR_ACCOUNT_VALID_FROM};
use kanidm_proto::constants::{ATTR_ACCOUNT_EXPIRE, ATTR_ACCOUNT_VALID_FROM, ATTR_SSH_PUBLICKEY};
use kanidm_proto::messages::{AccountChangeMessage, ConsoleOutputMode, MessageStatus};
use time::OffsetDateTime;
@ -254,10 +254,13 @@ impl ServiceAccountOpt {
let client = aopt.copt.to_client(OpType::Read).await;
match client
.idm_account_get_ssh_pubkeys(aopt.aopts.account_id.as_str())
.idm_service_account_get_attr(
aopt.aopts.account_id.as_str(),
ATTR_SSH_PUBLICKEY,
)
.await
{
Ok(pkeys) => pkeys.iter().for_each(|pkey| println!("{}", pkey)),
Ok(pkeys) => pkeys.iter().flatten().for_each(|pkey| println!("{}", pkey)),
Err(e) => handle_client_error(e, aopt.copt.output_mode),
}
}