refactor
This commit is contained in:
parent
6b8b7784f8
commit
145a1dc1ee
1 changed files with 9 additions and 17 deletions
|
|
@ -10,26 +10,18 @@ pub(super) fn check_client_authentication(
|
||||||
client_certs: Option<&[Certificate]>,
|
client_certs: Option<&[Certificate]>,
|
||||||
client_ca_keyids_set_for_sni: Option<&HashSet<Vec<u8>>>,
|
client_ca_keyids_set_for_sni: Option<&HashSet<Vec<u8>>>,
|
||||||
) -> std::result::Result<(), ClientCertsError> {
|
) -> std::result::Result<(), ClientCertsError> {
|
||||||
let client_ca_keyids_set = match client_ca_keyids_set_for_sni {
|
let Some(client_ca_keyids_set) = client_ca_keyids_set_for_sni else {
|
||||||
Some(c) => c,
|
// No client cert settings for given server name
|
||||||
None => {
|
return Ok(());
|
||||||
// No client cert settings for given server name
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let client_certs = match client_certs {
|
let Some(client_certs) = client_certs else {
|
||||||
Some(c) => {
|
error!("Client certificate is needed for given server name");
|
||||||
debug!("Incoming TLS client is (temporarily) authenticated via client cert");
|
return Err(ClientCertsError::ClientCertRequired(
|
||||||
c
|
"Client certificate is needed for given server name".to_string(),
|
||||||
}
|
));
|
||||||
None => {
|
|
||||||
error!("Client certificate is needed for given server name");
|
|
||||||
return Err(ClientCertsError::ClientCertRequired(
|
|
||||||
"Client certificate is needed for given server name".to_string(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
debug!("Incoming TLS client is (temporarily) authenticated via client cert");
|
||||||
|
|
||||||
// Check client certificate key ids
|
// Check client certificate key ids
|
||||||
let mut client_certs_parsed_iter = client_certs.iter().filter_map(|d| parse_x509_certificate(&d.0).ok());
|
let mut client_certs_parsed_iter = client_certs.iter().filter_map(|d| parse_x509_certificate(&d.0).ok());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue