mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
refactor(auth): expose callback validation for desktop core
This commit is contained in:
1 file changed
+8
-8
@@ -98,7 +98,7 @@ impl Drop for AuthCallbackReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn forward_auth_callback(callback: &str) -> anyhow::Result<()> {
|
pub async fn forward_auth_callback(callback: &str) -> anyhow::Result<()> {
|
||||||
validate_callback(callback)?;
|
validate_auth_callback(callback)?;
|
||||||
forward_auth_callback_to(callback, &callback_socket_path()).await
|
forward_auth_callback_to(callback, &callback_socket_path()).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ pub fn ensure_auth_callback_handler() -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn forward_auth_callback_to(callback: &str, socket_path: &Path) -> anyhow::Result<()> {
|
async fn forward_auth_callback_to(callback: &str, socket_path: &Path) -> anyhow::Result<()> {
|
||||||
validate_callback(callback)?;
|
validate_auth_callback(callback)?;
|
||||||
|
|
||||||
let (version, status) = timeout(IO_TIMEOUT, async {
|
let (version, status) = timeout(IO_TIMEOUT, async {
|
||||||
let mut stream = UnixStream::connect(socket_path)
|
let mut stream = UnixStream::connect(socket_path)
|
||||||
@@ -232,7 +232,7 @@ fn remove_stale_socket(socket_path: &Path) -> anyhow::Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn validate_callback(callback: &str) -> anyhow::Result<()> {
|
pub fn validate_auth_callback(callback: &str) -> anyhow::Result<()> {
|
||||||
if callback.len() > MAX_CALLBACK_SIZE {
|
if callback.len() > MAX_CALLBACK_SIZE {
|
||||||
bail!("Authentication callback exceeds the maximum supported size");
|
bail!("Authentication callback exceeds the maximum supported size");
|
||||||
}
|
}
|
||||||
@@ -276,7 +276,7 @@ async fn read_callback(stream: &mut UnixStream) -> Result<String, CallbackReadEr
|
|||||||
.await
|
.await
|
||||||
.map_err(|_| CallbackReadError::Io)?;
|
.map_err(|_| CallbackReadError::Io)?;
|
||||||
let callback = String::from_utf8(payload).map_err(|_| CallbackReadError::Invalid)?;
|
let callback = String::from_utf8(payload).map_err(|_| CallbackReadError::Invalid)?;
|
||||||
validate_callback(&callback).map_err(|_| CallbackReadError::Invalid)?;
|
validate_auth_callback(&callback).map_err(|_| CallbackReadError::Invalid)?;
|
||||||
Ok(callback)
|
Ok(callback)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -296,10 +296,10 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn validates_supported_callback_scheme() {
|
fn validates_supported_callback_scheme() {
|
||||||
assert!(validate_callback(VALID_CALLBACK).is_ok());
|
assert!(validate_auth_callback(VALID_CALLBACK).is_ok());
|
||||||
assert!(validate_callback("https://example.com").is_err());
|
assert!(validate_auth_callback("https://example.com").is_err());
|
||||||
assert!(validate_callback("globalprotectcallback:").is_err());
|
assert!(validate_auth_callback("globalprotectcallback:").is_err());
|
||||||
assert!(validate_callback(&format!("globalprotectcallback:{}", "x".repeat(MAX_CALLBACK_SIZE))).is_err());
|
assert!(validate_auth_callback(&format!("globalprotectcallback:{}", "x".repeat(MAX_CALLBACK_SIZE))).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
Reference in new issue
Block a user