fix: complete 2.6.1 release updates

This commit is contained in:
Kevin Yue committed 2026-06-22 11:46:26 +08:00
1 parent 40739739b5
commit 6746cf64c3
8 files changed
+171 -54

No files matched your search

+45
View File
@@ -16,6 +16,9 @@ pub struct SamlAuthLauncher<'a> {
os: Option<&'a str>,
host_id: Option<&'a str>,
client_version: Option<&'a str>,
certificate: Option<&'a str>,
sslkey: Option<&'a str>,
key_password: Option<&'a str>,
fix_openssl: bool,
ignore_tls_errors: bool,
#[cfg(feature = "webview-auth")]
@@ -38,6 +41,9 @@ impl<'a> SamlAuthLauncher<'a> {
os: None,
host_id: None,
client_version: None,
certificate: None,
sslkey: None,
key_password: None,
fix_openssl: false,
ignore_tls_errors: false,
#[cfg(feature = "webview-auth")]
@@ -83,6 +89,21 @@ impl<'a> SamlAuthLauncher<'a> {
self
}
pub fn certificate(mut self, certificate: Option<&'a str>) -> Self {
self.certificate = certificate;
self
}
pub fn sslkey(mut self, sslkey: Option<&'a str>) -> Self {
self.sslkey = sslkey;
self
}
pub fn key_password(mut self, key_password: Option<&'a str>) -> Self {
self.key_password = key_password;
self
}
#[cfg(feature = "webview-auth")]
pub fn hidpi(mut self, hidpi: bool) -> Self {
self.hidpi = hidpi;
@@ -148,6 +169,18 @@ impl<'a> SamlAuthLauncher<'a> {
auth_cmd.arg("--ignore-tls-errors");
}
if let Some(certificate) = self.certificate {
auth_cmd.arg("--certificate").arg(certificate);
}
if let Some(sslkey) = self.sslkey {
auth_cmd.arg("--sslkey").arg(sslkey);
}
if let Some(key_password) = self.key_password {
auth_cmd.arg("--key-password").arg(key_password);
}
#[cfg(feature = "webview-auth")]
{
if self.hidpi {
@@ -222,4 +255,16 @@ mod tests {
assert_eq!(launcher.client_version, Some("6.0.0"));
}
#[test]
fn client_certificate_options_are_stored() {
let launcher = SamlAuthLauncher::new("portal.example.com")
.certificate(Some("/tmp/client.pem"))
.sslkey(Some("/tmp/client.key"))
.key_password(Some("secret"));
assert_eq!(launcher.certificate, Some("/tmp/client.pem"));
assert_eq!(launcher.sslkey, Some("/tmp/client.key"));
assert_eq!(launcher.key_password, Some("secret"));
}
}