mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
feat: build and publish Windows NSH packages with verified updates
This commit is contained in:
105 files changed
+6606
-798
No files matched your search
@@ -3,7 +3,6 @@ use std::{
|
||||
io::ErrorKind,
|
||||
os::unix::fs::{DirBuilderExt, FileTypeExt, MetadataExt, OpenOptionsExt, PermissionsExt},
|
||||
path::{Path, PathBuf},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use anyhow::{Context, bail};
|
||||
@@ -14,16 +13,9 @@ use tokio::{
|
||||
time::timeout,
|
||||
};
|
||||
|
||||
const CALLBACK_SCHEME: &str = "globalprotectcallback";
|
||||
const PROTOCOL_MAGIC: &[u8; 4] = b"GPAC";
|
||||
const PROTOCOL_VERSION: u8 = 1;
|
||||
const MAX_CALLBACK_SIZE: usize = 1024 * 1024;
|
||||
const IO_TIMEOUT: Duration = Duration::from_secs(5);
|
||||
|
||||
// Acceptance acknowledges delivery, including an authentication failure.
|
||||
const STATUS_ACCEPTED: u8 = 0;
|
||||
const STATUS_INVALID_CALLBACK: u8 = 1;
|
||||
const STATUS_UNSUPPORTED_VERSION: u8 = 2;
|
||||
mod protocol;
|
||||
pub use protocol::validate_auth_callback;
|
||||
use protocol::*;
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
mod macos;
|
||||
@@ -232,62 +224,9 @@ fn remove_stale_socket(socket_path: &Path) -> anyhow::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn validate_auth_callback(callback: &str) -> anyhow::Result<()> {
|
||||
if callback.len() > MAX_CALLBACK_SIZE {
|
||||
bail!("Authentication callback exceeds the maximum supported size");
|
||||
}
|
||||
|
||||
let Some((scheme, data)) = callback.split_once(':') else {
|
||||
bail!("Authentication callback URL is invalid");
|
||||
};
|
||||
if scheme != CALLBACK_SCHEME || data.is_empty() {
|
||||
bail!("Authentication callback URL is invalid");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
enum CallbackReadError {
|
||||
UnsupportedVersion,
|
||||
Invalid,
|
||||
Io,
|
||||
}
|
||||
|
||||
async fn read_callback(stream: &mut UnixStream) -> Result<String, CallbackReadError> {
|
||||
let mut magic = [0_u8; 4];
|
||||
stream.read_exact(&mut magic).await.map_err(|_| CallbackReadError::Io)?;
|
||||
if &magic != PROTOCOL_MAGIC {
|
||||
return Err(CallbackReadError::Invalid);
|
||||
}
|
||||
|
||||
let version = stream.read_u8().await.map_err(|_| CallbackReadError::Io)?;
|
||||
if version != PROTOCOL_VERSION {
|
||||
return Err(CallbackReadError::UnsupportedVersion);
|
||||
}
|
||||
|
||||
let length = stream.read_u32().await.map_err(|_| CallbackReadError::Io)? as usize;
|
||||
if length == 0 || length > MAX_CALLBACK_SIZE {
|
||||
return Err(CallbackReadError::Invalid);
|
||||
}
|
||||
|
||||
let mut payload = vec![0; length];
|
||||
stream
|
||||
.read_exact(&mut payload)
|
||||
.await
|
||||
.map_err(|_| CallbackReadError::Io)?;
|
||||
let callback = String::from_utf8(payload).map_err(|_| CallbackReadError::Invalid)?;
|
||||
validate_auth_callback(&callback).map_err(|_| CallbackReadError::Invalid)?;
|
||||
Ok(callback)
|
||||
}
|
||||
|
||||
async fn write_response(stream: &mut UnixStream, status: u8) -> anyhow::Result<()> {
|
||||
stream.write_u8(PROTOCOL_VERSION).await?;
|
||||
stream.write_u8(status).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::time::Duration;
|
||||
use tempfile::tempdir;
|
||||
|
||||
use super::*;
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
//! Bounded authentication callback wire format, shared by local transports.
|
||||
use anyhow::bail;
|
||||
use std::time::Duration;
|
||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||
pub(super) const CALLBACK_SCHEME: &str = "globalprotectcallback";
|
||||
pub(super) const PROTOCOL_MAGIC: &[u8; 4] = b"GPAC";
|
||||
pub(super) const PROTOCOL_VERSION: u8 = 1;
|
||||
pub(super) const MAX_CALLBACK_SIZE: usize = 1024 * 1024;
|
||||
pub(super) const IO_TIMEOUT: Duration = Duration::from_secs(5);
|
||||
|
||||
// Acceptance acknowledges delivery, including an authentication failure.
|
||||
pub(super) const STATUS_ACCEPTED: u8 = 0;
|
||||
pub(super) const STATUS_INVALID_CALLBACK: u8 = 1;
|
||||
pub(super) const STATUS_UNSUPPORTED_VERSION: u8 = 2;
|
||||
|
||||
pub fn validate_auth_callback(callback: &str) -> anyhow::Result<()> {
|
||||
if callback.len() > MAX_CALLBACK_SIZE {
|
||||
bail!("Authentication callback exceeds the maximum supported size");
|
||||
}
|
||||
|
||||
let Some((scheme, data)) = callback.split_once(':') else {
|
||||
bail!("Authentication callback URL is invalid");
|
||||
};
|
||||
if scheme != CALLBACK_SCHEME || data.is_empty() {
|
||||
bail!("Authentication callback URL is invalid");
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(super) enum CallbackReadError {
|
||||
UnsupportedVersion,
|
||||
Invalid,
|
||||
Io,
|
||||
}
|
||||
|
||||
pub(super) async fn read_callback(
|
||||
stream: &mut (impl tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin),
|
||||
) -> Result<String, CallbackReadError> {
|
||||
let mut magic = [0_u8; 4];
|
||||
stream.read_exact(&mut magic).await.map_err(|_| CallbackReadError::Io)?;
|
||||
if &magic != PROTOCOL_MAGIC {
|
||||
return Err(CallbackReadError::Invalid);
|
||||
}
|
||||
|
||||
let version = stream.read_u8().await.map_err(|_| CallbackReadError::Io)?;
|
||||
if version != PROTOCOL_VERSION {
|
||||
return Err(CallbackReadError::UnsupportedVersion);
|
||||
}
|
||||
|
||||
let length = stream.read_u32().await.map_err(|_| CallbackReadError::Io)? as usize;
|
||||
if length == 0 || length > MAX_CALLBACK_SIZE {
|
||||
return Err(CallbackReadError::Invalid);
|
||||
}
|
||||
|
||||
let mut payload = vec![0; length];
|
||||
stream
|
||||
.read_exact(&mut payload)
|
||||
.await
|
||||
.map_err(|_| CallbackReadError::Io)?;
|
||||
let callback = String::from_utf8(payload).map_err(|_| CallbackReadError::Invalid)?;
|
||||
validate_auth_callback(&callback).map_err(|_| CallbackReadError::Invalid)?;
|
||||
Ok(callback)
|
||||
}
|
||||
|
||||
pub(super) async fn write_response(
|
||||
stream: &mut (impl tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin),
|
||||
status: u8,
|
||||
) -> anyhow::Result<()> {
|
||||
stream.write_u8(PROTOCOL_VERSION).await?;
|
||||
stream.write_u8(status).await?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
//! Per-user Windows named pipe for browser authentication callbacks.
|
||||
use anyhow::{Context, bail};
|
||||
use gpapi::{auth::SamlAuthData, error::AuthDataParseError};
|
||||
use tokio::{
|
||||
io::{AsyncReadExt, AsyncWriteExt},
|
||||
net::windows::named_pipe::{ClientOptions, NamedPipeServer},
|
||||
time::timeout,
|
||||
};
|
||||
#[path = "protocol.rs"]
|
||||
mod protocol;
|
||||
pub use protocol::validate_auth_callback;
|
||||
use protocol::*;
|
||||
|
||||
pub struct AuthCallbackReceiver {
|
||||
listener: NamedPipeServer,
|
||||
}
|
||||
impl AuthCallbackReceiver {
|
||||
pub fn bind() -> anyhow::Result<Self> {
|
||||
Ok(Self {
|
||||
listener: gpapi::windows::create_user_pipe(&pipe_name()?, true)
|
||||
.context("Another browser authentication is already waiting")?,
|
||||
})
|
||||
}
|
||||
pub async fn receive(mut self) -> anyhow::Result<SamlAuthData> {
|
||||
loop {
|
||||
self.listener.connect().await?;
|
||||
let mut stream = &mut self.listener;
|
||||
let callback = timeout(IO_TIMEOUT, read_callback(&mut stream)).await;
|
||||
let result = match callback {
|
||||
Ok(Ok(callback)) => match SamlAuthData::from_gpcallback(&callback) {
|
||||
Ok(data) => {
|
||||
let _ = write_response(&mut stream, STATUS_ACCEPTED).await;
|
||||
Some(Ok(data))
|
||||
}
|
||||
Err(error @ AuthDataParseError::AuthenticationFailed(_)) => {
|
||||
let _ = write_response(&mut stream, STATUS_ACCEPTED).await;
|
||||
Some(Err(error.into()))
|
||||
}
|
||||
Err(_) => {
|
||||
let _ = write_response(&mut stream, STATUS_INVALID_CALLBACK).await;
|
||||
None
|
||||
}
|
||||
},
|
||||
Ok(Err(CallbackReadError::UnsupportedVersion)) => {
|
||||
let _ = write_response(&mut stream, STATUS_UNSUPPORTED_VERSION).await;
|
||||
None
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
// DisconnectNamedPipe discards unread response bytes. Wait for the client
|
||||
// to confirm it consumed the response before disconnecting this instance.
|
||||
let _ = timeout(IO_TIMEOUT, stream.read_u8()).await;
|
||||
self.listener.disconnect()?;
|
||||
if let Some(result) = result {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
fn pipe_name() -> anyhow::Result<String> {
|
||||
Ok(format!(
|
||||
r"\\.\pipe\GPConnect.Auth.{}",
|
||||
gpapi::windows::current_user_sid()?
|
||||
))
|
||||
}
|
||||
|
||||
pub async fn forward_auth_callback(callback: &str) -> anyhow::Result<()> {
|
||||
validate_auth_callback(callback)?;
|
||||
timeout(IO_TIMEOUT, async {
|
||||
let mut stream = ClientOptions::new()
|
||||
.open(pipe_name()?)
|
||||
.context("No external-browser authentication is waiting for a callback")?;
|
||||
stream.write_all(PROTOCOL_MAGIC).await?;
|
||||
stream.write_u8(PROTOCOL_VERSION).await?;
|
||||
stream.write_u32(callback.len() as u32).await?;
|
||||
stream.write_all(callback.as_bytes()).await?;
|
||||
let version = stream.read_u8().await?;
|
||||
let status = stream.read_u8().await?;
|
||||
stream.write_u8(status).await?;
|
||||
anyhow::ensure!(
|
||||
version == PROTOCOL_VERSION,
|
||||
"Authentication callback protocol version mismatch"
|
||||
);
|
||||
match status {
|
||||
STATUS_ACCEPTED => Ok(()),
|
||||
STATUS_INVALID_CALLBACK => bail!("Authentication callback was rejected"),
|
||||
_ => bail!("Authentication callback protocol is unsupported"),
|
||||
}
|
||||
})
|
||||
.await
|
||||
.context("Timed out forwarding the authentication callback")?
|
||||
}
|
||||
|
||||
pub fn ensure_auth_callback_handler() -> anyhow::Result<()> {
|
||||
use winreg::{RegKey, enums::HKEY_CURRENT_USER};
|
||||
let executable = common::binary_paths::gpauth();
|
||||
anyhow::ensure!(executable.is_file(), "The authentication helper is missing");
|
||||
let root = RegKey::predef(HKEY_CURRENT_USER);
|
||||
let (scheme, _) = root.create_subkey(r"Software\Classes\globalprotectcallback")?;
|
||||
scheme.set_value("", &"URL:GlobalProtect authentication callback")?;
|
||||
scheme.set_value("URL Protocol", &"")?;
|
||||
let (command, _) = scheme.create_subkey(r"shell\open\command")?;
|
||||
// URL association activation requires a shell path, not Rust's verbatim
|
||||
// canonical path (\\?\C:\...), even though CreateProcess accepts both.
|
||||
let executable = dunce::simplified(&executable);
|
||||
command.set_value("", &format!("\"{}\" auth-callback \"%1\"", executable.display()))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[tokio::test]
|
||||
async fn forwards_browser_callback_over_private_windows_pipe() {
|
||||
let receiver = AuthCallbackReceiver::bind().unwrap();
|
||||
// The first-instance flag preserves one pending browser authentication per user.
|
||||
assert!(AuthCallbackReceiver::bind().is_err());
|
||||
let sender = tokio::spawn(async {
|
||||
forward_auth_callback("globalprotectcallback:cas-as=1&[email protected]&token=test-token").await
|
||||
});
|
||||
let data = timeout(std::time::Duration::from_secs(5), receiver.receive())
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
sender.await.unwrap().unwrap();
|
||||
assert_eq!(data.username(), "[email protected]");
|
||||
assert_eq!(data.token(), Some("test-token"));
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ use gpapi::{
|
||||
mod browser;
|
||||
|
||||
#[cfg(feature = "browser-auth")]
|
||||
#[cfg_attr(windows, path = "callback/windows.rs")]
|
||||
mod callback;
|
||||
|
||||
#[cfg(feature = "browser-auth")]
|
||||
|
||||
@@ -12,12 +12,17 @@ mod platform_impl;
|
||||
#[path = "webview/macos.rs"]
|
||||
mod platform_impl;
|
||||
|
||||
#[cfg(windows)]
|
||||
#[path = "webview/windows.rs"]
|
||||
mod platform_impl;
|
||||
|
||||
#[cfg(not(any(
|
||||
windows,
|
||||
target_os = "macos",
|
||||
target_os = "linux",
|
||||
target_os = "freebsd",
|
||||
target_os = "openbsd"
|
||||
)))]
|
||||
compile_error!("webview-auth is only supported on macOS and GTK/WebKitGTK Unix targets");
|
||||
compile_error!("webview-auth is only supported on Windows, macOS and GTK/WebKitGTK Unix targets");
|
||||
|
||||
pub use webview_auth::{WebviewAuthenticator, apply_auth_theme};
|
||||
@@ -9,7 +9,7 @@ use tokio_util::sync::CancellationToken;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) enum AuthDataLocation {
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
Headers,
|
||||
Body,
|
||||
}
|
||||
@@ -155,7 +155,7 @@ impl AuthMessenger {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
pub fn read_from_response(&self, auth_response: &impl super::webview_auth::GetHeader, generation: u64) {
|
||||
use log::warn;
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
use std::{future::Future, pin::Pin, sync::Arc, time::Duration};
|
||||
|
||||
use anyhow::bail;
|
||||
#[cfg(not(windows))]
|
||||
use gpapi::utils::window::get_title_bar_height;
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
use gpapi::utils::window::{WindowTypeHint, set_window_type_hint};
|
||||
use gpapi::{
|
||||
@@ -8,24 +10,51 @@ use gpapi::{
|
||||
error::ServerTlsError,
|
||||
gp_params::GpParams,
|
||||
os_profile::{WebviewUserAgent, WebviewUserAgentTransform},
|
||||
utils::{redact::redact_uri, window::get_title_bar_height},
|
||||
utils::redact::redact_uri,
|
||||
};
|
||||
use log::{info, warn};
|
||||
#[cfg(target_os = "macos")]
|
||||
use tauri::Manager;
|
||||
use tauri::{AppHandle, WebviewUrl, WebviewWindow, WindowEvent};
|
||||
#[cfg(not(windows))]
|
||||
use tauri::WebviewUrl;
|
||||
use tauri::{AppHandle, WindowEvent};
|
||||
use tokio::{sync::oneshot, time};
|
||||
|
||||
use crate::auth_prelogin;
|
||||
|
||||
#[cfg(not(windows))]
|
||||
use super::address_bar::TOOLBAR_HEIGHT;
|
||||
use super::auth_messenger::{AuthError, AuthEvent, AuthMessenger};
|
||||
use super::recovery::{Recovery, RecoveryStatus, RetryPlan, RetrySource, RetryTiming};
|
||||
|
||||
#[cfg(not(windows))]
|
||||
type AuthWindow = tauri::WebviewWindow;
|
||||
#[cfg(windows)]
|
||||
use super::platform_impl::{AuthWindow, create_auth_window};
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn create_auth_window(app: &AppHandle, title: &str, theme: Option<tauri::Theme>) -> anyhow::Result<AuthWindow> {
|
||||
let builder = AuthWindow::builder(app, "auth_window", WebviewUrl::default())
|
||||
.title(title)
|
||||
.theme(theme)
|
||||
.devtools(cfg!(any(debug_assertions, feature = "release-devtools")));
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
let builder = builder.on_navigation(super::platform_impl::open_okta_verify);
|
||||
Ok(
|
||||
builder
|
||||
.inner_size(900.0, 650.0 + get_title_bar_height() + TOOLBAR_HEIGHT)
|
||||
.min_inner_size(400.0, 300.0)
|
||||
.focused(true)
|
||||
.visible(false)
|
||||
.center()
|
||||
.build()?,
|
||||
)
|
||||
}
|
||||
|
||||
const RESTART_TIMEOUT: Duration = Duration::from_secs(30);
|
||||
|
||||
pub trait PlatformWebviewExt {
|
||||
fn install_auth_controls(&self, window: &WebviewWindow, messenger: Arc<AuthMessenger>) -> anyhow::Result<()>;
|
||||
pub(super) trait PlatformWebviewExt {
|
||||
fn install_auth_controls(&self, window: &AuthWindow, messenger: Arc<AuthMessenger>) -> anyhow::Result<()>;
|
||||
|
||||
fn set_recovery_status(&self, status: RecoveryStatus) -> anyhow::Result<()>;
|
||||
|
||||
@@ -54,7 +83,7 @@ pub trait PlatformWebviewExt {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
#[cfg(any(windows, target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
pub trait GetHeader {
|
||||
fn get_header(&self, key: &str) -> Option<String>;
|
||||
}
|
||||
@@ -125,19 +154,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
|
||||
pub async fn authenticate(&self, app_handle: &AppHandle) -> anyhow::Result<SamlAuthData> {
|
||||
let auth_messenger = Arc::new(AuthMessenger::new());
|
||||
let auth_window_builder = WebviewWindow::builder(app_handle, "auth_window", WebviewUrl::default())
|
||||
.title(self.window_title)
|
||||
.theme(native_theme(self.window_theme))
|
||||
.devtools(cfg!(any(debug_assertions, feature = "release-devtools")));
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
let auth_window_builder = auth_window_builder.on_navigation(super::platform_impl::open_okta_verify);
|
||||
let auth_window = auth_window_builder
|
||||
.inner_size(900.0, 650.0 + get_title_bar_height() + TOOLBAR_HEIGHT)
|
||||
.min_inner_size(400.0, 300.0)
|
||||
.focused(true)
|
||||
.visible(false)
|
||||
.center()
|
||||
.build()?;
|
||||
let auth_window = create_auth_window(app_handle, self.window_title, native_theme(self.window_theme))?;
|
||||
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
|
||||
set_window_type_hint(&auth_window, WindowTypeHint::Dialog)?;
|
||||
@@ -170,7 +187,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
|
||||
async fn wait_for_auth(
|
||||
&self,
|
||||
auth_window: &WebviewWindow,
|
||||
auth_window: &AuthWindow,
|
||||
auth_messenger: Arc<AuthMessenger>,
|
||||
) -> anyhow::Result<SamlAuthData> {
|
||||
let mut recovery = Recovery::default();
|
||||
@@ -310,13 +327,16 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
|
||||
async fn setup_auth_window(
|
||||
&self,
|
||||
auth_window: &WebviewWindow,
|
||||
auth_window: &AuthWindow,
|
||||
auth_messenger: Arc<AuthMessenger>,
|
||||
) -> anyhow::Result<()> {
|
||||
info!("Setting up auth window...");
|
||||
|
||||
if self.clean {
|
||||
info!("Clearing all browsing data...");
|
||||
#[cfg(windows)]
|
||||
super::platform_impl::clear_browsing_data(auth_window).await?;
|
||||
#[cfg(not(windows))]
|
||||
auth_window.clear_all_browsing_data()?;
|
||||
}
|
||||
|
||||
@@ -361,7 +381,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_not_found(&self, auth_window: &WebviewWindow, auth_messenger: &Arc<AuthMessenger>) {
|
||||
fn handle_not_found(&self, auth_window: &AuthWindow, auth_messenger: &Arc<AuthMessenger>) {
|
||||
let visible = auth_window.is_visible().unwrap_or(false);
|
||||
if visible {
|
||||
return;
|
||||
@@ -370,7 +390,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
auth_messenger.schedule_raise_window(2);
|
||||
}
|
||||
|
||||
fn update_recovery(&self, auth_window: &WebviewWindow, status: RecoveryStatus) -> anyhow::Result<()> {
|
||||
fn update_recovery(&self, auth_window: &AuthWindow, status: RecoveryStatus) -> anyhow::Result<()> {
|
||||
if status != RecoveryStatus::Hidden {
|
||||
self.raise_window(auth_window);
|
||||
}
|
||||
@@ -397,7 +417,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
|
||||
fn load_restarted_sign_in(
|
||||
&self,
|
||||
auth_window: &WebviewWindow,
|
||||
auth_window: &AuthWindow,
|
||||
messenger: &Arc<AuthMessenger>,
|
||||
auth_request: String,
|
||||
) -> anyhow::Result<()> {
|
||||
@@ -415,7 +435,7 @@ impl<'a> WebviewAuthenticator<'a> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn raise_window(&self, auth_window: &WebviewWindow) {
|
||||
fn raise_window(&self, auth_window: &AuthWindow) {
|
||||
let visible = auth_window.is_visible().unwrap_or(false);
|
||||
if visible {
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,380 @@
|
||||
//! WebView2 authentication. All COM objects and native controls stay on the UI thread.
|
||||
use std::{
|
||||
cell::{Cell, RefCell},
|
||||
collections::HashMap,
|
||||
rc::Rc,
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use super::{
|
||||
auth_messenger::{AuthDataLocation, AuthError, AuthEvent, AuthMessenger},
|
||||
recovery::RecoveryStatus,
|
||||
webview_auth::{GetHeader, PlatformWebviewExt},
|
||||
};
|
||||
use anyhow::{Context, bail};
|
||||
use gpapi::auth::SamlAuthData;
|
||||
use tauri::{
|
||||
AppHandle, LogicalPosition, Webview, WebviewBuilder, WebviewUrl, Window, WindowBuilder, webview::PlatformWebview,
|
||||
};
|
||||
use webview2_com::{
|
||||
ClearBrowsingDataCompletedHandler, CoTaskMemPWSTR, DOMContentLoadedEventHandler, ExecuteScriptCompletedHandler,
|
||||
Microsoft::Web::WebView2::Win32::*, NavigationCompletedEventHandler, NavigationStartingEventHandler,
|
||||
SourceChangedEventHandler, WebResourceResponseReceivedEventHandler,
|
||||
};
|
||||
use windows::core::{BOOL, HSTRING, Interface, PWSTR};
|
||||
|
||||
#[path = "windows/controls.rs"]
|
||||
mod controls;
|
||||
#[path = "windows/tls.rs"]
|
||||
mod tls;
|
||||
|
||||
/// Windows hosts native chrome and a manually sized child webview in one window.
|
||||
/// Host-owned child bounds keep the page surface below the native controls
|
||||
/// throughout live resizing.
|
||||
#[derive(Clone)]
|
||||
pub(super) struct AuthWindow {
|
||||
window: Window,
|
||||
webview: Webview,
|
||||
}
|
||||
|
||||
impl std::ops::Deref for AuthWindow {
|
||||
type Target = Window;
|
||||
fn deref(&self) -> &Window {
|
||||
&self.window
|
||||
}
|
||||
}
|
||||
|
||||
impl AuthWindow {
|
||||
pub(super) fn with_webview(&self, callback: impl FnOnce(PlatformWebview) + Send + 'static) -> tauri::Result<()> {
|
||||
self.webview.with_webview(callback)
|
||||
}
|
||||
}
|
||||
|
||||
impl gpapi::utils::window::WindowExt for AuthWindow {
|
||||
fn raise(&self) -> anyhow::Result<()> {
|
||||
self.window.show()?;
|
||||
self.window.set_focus()?;
|
||||
self.webview.set_focus()?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn create_auth_window(
|
||||
app: &AppHandle,
|
||||
title: &str,
|
||||
theme: Option<tauri::Theme>,
|
||||
) -> anyhow::Result<AuthWindow> {
|
||||
let window = WindowBuilder::new(app, "auth_window")
|
||||
.title(title)
|
||||
.theme(theme)
|
||||
.inner_size(900.0, 650.0 + super::address_bar::TOOLBAR_HEIGHT)
|
||||
.min_inner_size(400.0, 300.0)
|
||||
.focused(true)
|
||||
.visible(false)
|
||||
.center()
|
||||
.build()?;
|
||||
let webview = window.add_child(
|
||||
WebviewBuilder::new("auth_webview", WebviewUrl::default())
|
||||
.devtools(cfg!(any(debug_assertions, feature = "release-devtools"))),
|
||||
LogicalPosition::new(0.0, 0.0),
|
||||
window.inner_size()?,
|
||||
)?;
|
||||
Ok(AuthWindow { window, webview })
|
||||
}
|
||||
|
||||
thread_local! {
|
||||
static STATES: RefCell<HashMap<usize, Rc<State>>> = RefCell::default();
|
||||
}
|
||||
|
||||
struct State {
|
||||
core: ICoreWebView2,
|
||||
controller: ICoreWebView2Controller,
|
||||
messenger: Arc<AuthMessenger>,
|
||||
controls: controls::Controls,
|
||||
pending: Cell<Option<u64>>,
|
||||
navigations: RefCell<HashMap<u64, u64>>,
|
||||
document: RefCell<(String, u64)>,
|
||||
tls: RefCell<tls::Policy>,
|
||||
}
|
||||
|
||||
fn text(get: impl FnOnce(*mut PWSTR) -> windows::core::Result<()>) -> windows::core::Result<String> {
|
||||
let mut value = PWSTR::null();
|
||||
let result = get(&mut value);
|
||||
let value = CoTaskMemPWSTR::from(value);
|
||||
result?;
|
||||
Ok(value.to_string())
|
||||
}
|
||||
|
||||
fn state(webview: &PlatformWebview) -> anyhow::Result<Rc<State>> {
|
||||
let core = unsafe { webview.controller().CoreWebView2()? };
|
||||
STATES
|
||||
.with_borrow(|states| states.get(&(core.as_raw() as usize)).cloned())
|
||||
.context("Authentication controls are unavailable")
|
||||
}
|
||||
|
||||
impl State {
|
||||
fn read_html(&self, generation: u64) -> windows::core::Result<()> {
|
||||
if generation != self.messenger.generation() {
|
||||
return Ok(());
|
||||
}
|
||||
let messenger = Arc::clone(&self.messenger);
|
||||
unsafe {
|
||||
self.core.ExecuteScript(
|
||||
&HSTRING::from("document.documentElement.outerHTML"),
|
||||
&ExecuteScriptCompletedHandler::create(Box::new(move |result, json| {
|
||||
result?;
|
||||
if let Ok(html) = serde_json::from_str::<String>(&json) {
|
||||
messenger.read_from_html(&html, generation);
|
||||
}
|
||||
Ok(())
|
||||
})),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fn listen(self: &Rc<Self>) -> windows::core::Result<()> {
|
||||
let mut token = 0;
|
||||
let weak = Rc::downgrade(self);
|
||||
let starting = NavigationStartingEventHandler::create(Box::new(move |_, args| {
|
||||
let (Some(state), Some(args)) = (weak.upgrade(), args) else {
|
||||
return Ok(());
|
||||
};
|
||||
unsafe {
|
||||
let mut id = 0;
|
||||
args.NavigationId(&mut id)?;
|
||||
let generation = *state
|
||||
.navigations
|
||||
.borrow_mut()
|
||||
.entry(id)
|
||||
.or_insert_with(|| state.pending.take().unwrap_or_else(|| state.messenger.generation()));
|
||||
let uri = text(|p| args.Uri(p))?;
|
||||
if uri.starts_with("globalprotectcallback:") {
|
||||
args.SetCancel(true)?;
|
||||
match SamlAuthData::from_gpcallback(&uri) {
|
||||
Ok(data) => state
|
||||
.messenger
|
||||
.send_auth_event(AuthEvent::Data(generation, data, AuthDataLocation::Body)),
|
||||
Err(error) => state
|
||||
.messenger
|
||||
.send_auth_event(AuthEvent::Error(generation, AuthError::invalid_from_body(error.into()))),
|
||||
}
|
||||
} else if generation == state.messenger.generation() {
|
||||
*state.document.borrow_mut() = (uri, generation);
|
||||
state.messenger.cancel_raise_window();
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
unsafe {
|
||||
self.core.add_NavigationStarting(&starting, &mut token)?;
|
||||
}
|
||||
|
||||
let weak = Rc::downgrade(self);
|
||||
let loaded = DOMContentLoadedEventHandler::create(Box::new(move |_, args| {
|
||||
let (Some(state), Some(args)) = (weak.upgrade(), args) else {
|
||||
return Ok(());
|
||||
};
|
||||
let mut id = 0;
|
||||
unsafe {
|
||||
args.NavigationId(&mut id)?;
|
||||
}
|
||||
let generation = state.navigations.borrow().get(&id).copied();
|
||||
if let Some(generation) = generation {
|
||||
state.read_html(generation)?;
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
unsafe {
|
||||
self
|
||||
.core
|
||||
.cast::<ICoreWebView2_2>()?
|
||||
.add_DOMContentLoaded(&loaded, &mut token)?;
|
||||
}
|
||||
|
||||
let weak = Rc::downgrade(self);
|
||||
let completed = NavigationCompletedEventHandler::create(Box::new(move |_, args| {
|
||||
let (Some(state), Some(args)) = (weak.upgrade(), args) else {
|
||||
return Ok(());
|
||||
};
|
||||
unsafe {
|
||||
let mut id = 0;
|
||||
args.NavigationId(&mut id)?;
|
||||
let Some(generation) = state.navigations.borrow_mut().remove(&id) else {
|
||||
return Ok(());
|
||||
};
|
||||
let mut success = BOOL(0);
|
||||
args.IsSuccess(&mut success)?;
|
||||
if success.as_bool() {
|
||||
state.read_html(generation)?;
|
||||
state.messenger.send_auth_event(AuthEvent::PageLoaded(generation));
|
||||
} else {
|
||||
let mut error = COREWEBVIEW2_WEB_ERROR_STATUS_UNKNOWN;
|
||||
args.WebErrorStatus(&mut error)?;
|
||||
if error != COREWEBVIEW2_WEB_ERROR_STATUS_OPERATION_CANCELED {
|
||||
state.messenger.send_auth_event(AuthEvent::Error(
|
||||
generation,
|
||||
AuthError::LoadFailed(anyhow::anyhow!("WebView2 navigation failed ({})", error.0)),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
unsafe {
|
||||
self.core.add_NavigationCompleted(&completed, &mut token)?;
|
||||
}
|
||||
|
||||
let weak = Rc::downgrade(self);
|
||||
let source = SourceChangedEventHandler::create(Box::new(move |_, _| {
|
||||
if let Some(state) = weak.upgrade() {
|
||||
let uri = unsafe { text(|p| state.core.Source(p))? };
|
||||
state.controls.set_address(&uri)?;
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
unsafe {
|
||||
self.core.add_SourceChanged(&source, &mut token)?;
|
||||
}
|
||||
|
||||
let weak = Rc::downgrade(self);
|
||||
let response = WebResourceResponseReceivedEventHandler::create(Box::new(move |_, args| {
|
||||
let (Some(state), Some(args)) = (weak.upgrade(), args) else {
|
||||
return Ok(());
|
||||
};
|
||||
unsafe {
|
||||
let uri = text(|p| args.Request()?.Uri(p))?;
|
||||
let (document, generation) = state.document.borrow().clone();
|
||||
// Subresources must not supply authentication credentials for the page.
|
||||
if uri == document && generation == state.messenger.generation() {
|
||||
state
|
||||
.messenger
|
||||
.read_from_response(&Headers(args.Response()?.Headers()?), generation);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
unsafe {
|
||||
self
|
||||
.core
|
||||
.cast::<ICoreWebView2_2>()?
|
||||
.add_WebResourceResponseReceived(&response, &mut token)?;
|
||||
}
|
||||
tls::install(self)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
struct Headers(ICoreWebView2HttpResponseHeaders);
|
||||
impl GetHeader for Headers {
|
||||
fn get_header(&self, key: &str) -> Option<String> {
|
||||
unsafe { text(|p| self.0.GetHeader(&HSTRING::from(key), p)).ok() }
|
||||
}
|
||||
}
|
||||
|
||||
impl PlatformWebviewExt for PlatformWebview {
|
||||
fn install_auth_controls(&self, window: &AuthWindow, messenger: Arc<AuthMessenger>) -> anyhow::Result<()> {
|
||||
let controller = self.controller();
|
||||
let core = unsafe { controller.CoreWebView2()? };
|
||||
let key = core.as_raw() as usize;
|
||||
let controls = controls::Controls::new(window, &controller, key)?;
|
||||
let state = Rc::new(State {
|
||||
core,
|
||||
controller,
|
||||
messenger,
|
||||
controls,
|
||||
pending: Cell::new(None),
|
||||
navigations: RefCell::default(),
|
||||
document: RefCell::new((String::new(), 0)),
|
||||
tls: RefCell::default(),
|
||||
});
|
||||
STATES.with_borrow_mut(|states| states.insert(key, Rc::clone(&state)));
|
||||
state.listen()?;
|
||||
state.controls.layout(&state)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_recovery_status(&self, status: RecoveryStatus) -> anyhow::Result<()> {
|
||||
let state = state(self)?;
|
||||
state.controls.update(&state, status)?;
|
||||
Ok(())
|
||||
}
|
||||
fn stop_loading(&self) {
|
||||
let _ = unsafe { self.controller().CoreWebView2().and_then(|wv| wv.Stop()) };
|
||||
}
|
||||
fn confirm_tls_exception(&self) -> anyhow::Result<()> {
|
||||
tls::confirm(state(self)?.as_ref())
|
||||
}
|
||||
fn ignore_tls_errors(&self) -> anyhow::Result<()> {
|
||||
state(self)?.tls.borrow_mut().ignore_errors = true;
|
||||
Ok(())
|
||||
}
|
||||
fn user_agent(&self) -> anyhow::Result<String> {
|
||||
unsafe {
|
||||
Ok(text(|p| {
|
||||
self
|
||||
.controller()
|
||||
.CoreWebView2()?
|
||||
.Settings()?
|
||||
.cast::<ICoreWebView2Settings2>()?
|
||||
.UserAgent(p)
|
||||
})?)
|
||||
}
|
||||
}
|
||||
fn set_user_agent(&self, user_agent: &str) -> anyhow::Result<()> {
|
||||
unsafe {
|
||||
self
|
||||
.controller()
|
||||
.CoreWebView2()?
|
||||
.Settings()?
|
||||
.cast::<ICoreWebView2Settings2>()?
|
||||
.SetUserAgent(&HSTRING::from(user_agent))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn load_url(&self, url: &str) -> anyhow::Result<()> {
|
||||
let state = state(self)?;
|
||||
state.pending.set(Some(state.messenger.generation()));
|
||||
unsafe {
|
||||
state.core.Navigate(&HSTRING::from(url))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn load_html(&self, html: &str) -> anyhow::Result<()> {
|
||||
let state = state(self)?;
|
||||
state.pending.set(Some(state.messenger.generation()));
|
||||
unsafe {
|
||||
state.core.NavigateToString(&HSTRING::from(html))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// WebView2 clears profiles asynchronously; do not navigate until cookies are gone.
|
||||
pub(super) async fn clear_browsing_data(window: &AuthWindow) -> anyhow::Result<()> {
|
||||
let (tx, rx) = tokio::sync::oneshot::channel();
|
||||
window.with_webview(move |wv| {
|
||||
let tx = Rc::new(RefCell::new(Some(tx)));
|
||||
let complete = Rc::clone(&tx);
|
||||
let callback = ClearBrowsingDataCompletedHandler::create(Box::new(move |result| {
|
||||
if let Some(tx) = complete.borrow_mut().take() {
|
||||
let _ = tx.send(result);
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
let result = (|| unsafe {
|
||||
wv.controller()
|
||||
.CoreWebView2()?
|
||||
.cast::<ICoreWebView2_13>()?
|
||||
.Profile()?
|
||||
.cast::<ICoreWebView2Profile2>()?
|
||||
.ClearBrowsingDataAll(&callback)
|
||||
})();
|
||||
if let Err(error) = result {
|
||||
if let Some(tx) = tx.borrow_mut().take() {
|
||||
let _ = tx.send(Err(error));
|
||||
}
|
||||
}
|
||||
})?;
|
||||
rx.await.context("Could not clear sign-in data")??;
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,334 @@
|
||||
//! Native controls remain outside the identity provider's document.
|
||||
use super::*;
|
||||
use windows::{
|
||||
Win32::{
|
||||
Foundation::{COLORREF, HWND, LPARAM, LRESULT, RECT, WPARAM},
|
||||
Graphics::Gdi::*,
|
||||
UI::{
|
||||
Controls::EM_SETRECT,
|
||||
HiDpi::{GetDpiForWindow, SystemParametersInfoForDpi},
|
||||
Shell::{DefSubclassProc, RemoveWindowSubclass, SetWindowSubclass},
|
||||
WindowsAndMessaging::*,
|
||||
},
|
||||
},
|
||||
core::{PCWSTR, w},
|
||||
};
|
||||
|
||||
const SUBCLASS: usize = 0x47504155;
|
||||
const ADDRESS_SUBCLASS: usize = 0x47504156;
|
||||
const ADDRESS_HEIGHT: i32 = 24;
|
||||
const TOOLBAR_HEIGHT: i32 = 34;
|
||||
const RETRY: usize = 101;
|
||||
const PROCEED: usize = 102;
|
||||
const CANCEL: usize = 103;
|
||||
|
||||
pub(super) struct Controls {
|
||||
pub(super) parent: HWND,
|
||||
webview_host: HWND,
|
||||
address: HWND,
|
||||
message: HWND,
|
||||
retry: HWND,
|
||||
proceed: HWND,
|
||||
cancel: HWND,
|
||||
status: Cell<RecoveryStatus>,
|
||||
font: Cell<Option<(u32, HFONT)>>,
|
||||
}
|
||||
|
||||
impl Controls {
|
||||
pub(super) fn new(window: &AuthWindow, controller: &ICoreWebView2Controller, key: usize) -> anyhow::Result<Self> {
|
||||
// The host owns both the toolbar and the child webview's remaining area.
|
||||
let parent = HWND(window.hwnd()?.0);
|
||||
let mut webview_host = HWND::default();
|
||||
unsafe {
|
||||
controller.ParentWindow(&mut webview_host)?;
|
||||
}
|
||||
let child = |class: PCWSTR, title: &str, style: WINDOW_STYLE, id: usize| -> windows::core::Result<HWND> {
|
||||
unsafe {
|
||||
let hwnd = CreateWindowExW(
|
||||
WINDOW_EX_STYLE::default(),
|
||||
class,
|
||||
&HSTRING::from(title),
|
||||
WS_CHILD | style,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
Some(parent),
|
||||
Some(HMENU(id as *mut _)),
|
||||
None,
|
||||
None,
|
||||
)?;
|
||||
Ok(hwnd)
|
||||
}
|
||||
};
|
||||
let controls = Self {
|
||||
parent,
|
||||
webview_host,
|
||||
address: child(
|
||||
w!("EDIT"),
|
||||
super::super::address_bar::LOADING_ADDRESS,
|
||||
WS_VISIBLE | WS_BORDER | WINDOW_STYLE(ES_READONLY as u32 | ES_MULTILINE as u32 | ES_AUTOHSCROLL as u32),
|
||||
0,
|
||||
)?,
|
||||
message: child(w!("STATIC"), "", WINDOW_STYLE::default(), 0)?,
|
||||
retry: child(w!("BUTTON"), "Try Again", WS_TABSTOP, RETRY)?,
|
||||
proceed: child(w!("BUTTON"), "Continue Anyway…", WS_TABSTOP, PROCEED)?,
|
||||
cancel: child(w!("BUTTON"), "Cancel", WS_TABSTOP, CANCEL)?,
|
||||
status: Cell::new(RecoveryStatus::Hidden),
|
||||
font: Cell::new(None),
|
||||
};
|
||||
unsafe {
|
||||
anyhow::ensure!(
|
||||
SetWindowSubclass(controls.address, Some(address_proc), ADDRESS_SUBCLASS, 0).as_bool(),
|
||||
"Could not style the sign-in address"
|
||||
);
|
||||
anyhow::ensure!(
|
||||
SetWindowSubclass(parent, Some(window_proc), SUBCLASS, key).as_bool(),
|
||||
"Could not install sign-in controls"
|
||||
);
|
||||
}
|
||||
Ok(controls)
|
||||
}
|
||||
|
||||
pub(super) fn set_address(&self, uri: &str) -> windows::core::Result<()> {
|
||||
unsafe {
|
||||
SetWindowTextW(
|
||||
self.address,
|
||||
&HSTRING::from(super::super::address_bar::display_address(Some(uri))),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn update(&self, state: &State, status: RecoveryStatus) -> windows::core::Result<()> {
|
||||
self.status.set(status);
|
||||
let message = if status.detail().is_empty() {
|
||||
status.message().to_owned()
|
||||
} else {
|
||||
format!("{}\r\n{}", status.message(), status.detail())
|
||||
};
|
||||
unsafe {
|
||||
SetWindowTextW(self.message, &HSTRING::from(message))?;
|
||||
for (hwnd, visible) in [
|
||||
(self.message, status != RecoveryStatus::Hidden),
|
||||
(self.retry, status.can_retry()),
|
||||
(self.proceed, status.can_continue()),
|
||||
(self.cancel, status.blocks_page()),
|
||||
] {
|
||||
let _ = ShowWindow(hwnd, if visible { SW_SHOW } else { SW_HIDE });
|
||||
}
|
||||
state.controller.SetIsVisible(!status.blocks_page())?;
|
||||
}
|
||||
self.layout(state)
|
||||
}
|
||||
|
||||
pub(super) fn layout(&self, state: &State) -> windows::core::Result<()> {
|
||||
unsafe {
|
||||
let dpi = GetDpiForWindow(self.parent);
|
||||
let scale = dpi as f64 / 96.0;
|
||||
let px = |value: i32| (value as f64 * scale).round() as i32;
|
||||
let mut bounds = RECT::default();
|
||||
GetClientRect(self.parent, &mut bounds)?;
|
||||
let width = bounds.right;
|
||||
if self.font.get().is_none_or(|(current_dpi, _)| current_dpi != dpi) {
|
||||
let mut metrics = NONCLIENTMETRICSW {
|
||||
cbSize: std::mem::size_of::<NONCLIENTMETRICSW>() as u32,
|
||||
..Default::default()
|
||||
};
|
||||
SystemParametersInfoForDpi(
|
||||
SPI_GETNONCLIENTMETRICS.0,
|
||||
metrics.cbSize,
|
||||
Some(&mut metrics as *mut _ as *mut _),
|
||||
0,
|
||||
dpi,
|
||||
)?;
|
||||
metrics.lfMessageFont.lfHeight = -px(13);
|
||||
let font = CreateFontIndirectW(&metrics.lfMessageFont);
|
||||
if font.is_invalid() {
|
||||
return Err(windows::core::Error::from_thread());
|
||||
}
|
||||
for control in [self.address, self.message, self.retry, self.proceed, self.cancel] {
|
||||
SendMessageW(control, WM_SETFONT, Some(WPARAM(font.0 as usize)), Some(LPARAM(1)));
|
||||
}
|
||||
if let Some((_, old)) = self.font.replace(Some((dpi, font))) {
|
||||
let _ = DeleteObject(old.into());
|
||||
}
|
||||
}
|
||||
MoveWindow(
|
||||
self.address,
|
||||
px(8),
|
||||
px(5),
|
||||
(width - px(16)).max(0),
|
||||
px(ADDRESS_HEIGHT),
|
||||
true,
|
||||
)?;
|
||||
// A one-line formatting rectangle centers the native read-only edit text.
|
||||
// ES_AUTOHSCROLL keeps long URLs on one line and lets users select/copy them.
|
||||
let mut client = RECT::default();
|
||||
GetClientRect(self.address, &mut client)?;
|
||||
let dc = GetDC(Some(self.address));
|
||||
let previous = SelectObject(dc, self.font.get().expect("font initialized").1.into());
|
||||
let mut text_metrics = TEXTMETRICW::default();
|
||||
let measured = GetTextMetricsW(dc, &mut text_metrics);
|
||||
SelectObject(dc, previous);
|
||||
ReleaseDC(Some(self.address), dc);
|
||||
measured.ok()?;
|
||||
let top = ((client.bottom - text_metrics.tmHeight) / 2).max(0);
|
||||
let text = RECT {
|
||||
left: px(6),
|
||||
top,
|
||||
right: client.right - px(6),
|
||||
bottom: top + text_metrics.tmHeight,
|
||||
};
|
||||
SendMessageW(
|
||||
self.address,
|
||||
EM_SETRECT,
|
||||
Some(WPARAM(0)),
|
||||
Some(LPARAM(&text as *const _ as isize)),
|
||||
);
|
||||
let status = self.status.get();
|
||||
let header = if status == RecoveryStatus::Hidden {
|
||||
TOOLBAR_HEIGHT
|
||||
} else {
|
||||
TOOLBAR_HEIGHT + 68
|
||||
};
|
||||
MoveWindow(
|
||||
self.message,
|
||||
px(8),
|
||||
px(TOOLBAR_HEIGHT + 2),
|
||||
(width - px(16)).max(0),
|
||||
px(38),
|
||||
true,
|
||||
)?;
|
||||
let mut right = width - px(8);
|
||||
for (hwnd, visible, size) in [
|
||||
(self.cancel, status.blocks_page(), 70),
|
||||
(self.proceed, status.can_continue(), 136),
|
||||
(self.retry, status.can_retry(), 84),
|
||||
] {
|
||||
if visible {
|
||||
right -= px(size);
|
||||
MoveWindow(hwnd, right, px(TOOLBAR_HEIGHT + 38), px(size), px(28), true)?;
|
||||
right -= px(6);
|
||||
}
|
||||
}
|
||||
let content_height = (bounds.bottom - px(header)).max(0);
|
||||
MoveWindow(self.webview_host, 0, px(header), width, content_height, true)?;
|
||||
state.controller.SetBounds(RECT {
|
||||
left: 0,
|
||||
top: 0,
|
||||
right: width,
|
||||
bottom: content_height,
|
||||
})?;
|
||||
let _ = InvalidateRect(Some(self.parent), None, true);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Controls {
|
||||
fn drop(&mut self) {
|
||||
if let Some((_, font)) = self.font.get() {
|
||||
unsafe {
|
||||
let _ = DeleteObject(font.into());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Keep the native edit's selection and accessibility, with a quiet, flat frame.
|
||||
unsafe extern "system" fn address_proc(
|
||||
hwnd: HWND,
|
||||
msg: u32,
|
||||
wparam: WPARAM,
|
||||
lparam: LPARAM,
|
||||
id: usize,
|
||||
_: usize,
|
||||
) -> LRESULT {
|
||||
if msg == WM_NCDESTROY {
|
||||
unsafe {
|
||||
let _ = RemoveWindowSubclass(hwnd, Some(address_proc), id);
|
||||
}
|
||||
}
|
||||
let result = unsafe { DefSubclassProc(hwnd, msg, wparam, lparam) };
|
||||
// EDIT also repaints its frame during WM_PAINT, so style it after native drawing.
|
||||
if matches!(msg, WM_NCPAINT | WM_PAINT) {
|
||||
unsafe {
|
||||
let dc = GetWindowDC(Some(hwnd));
|
||||
let mut bounds = RECT::default();
|
||||
if !dc.is_invalid() && GetWindowRect(hwnd, &mut bounds).is_ok() {
|
||||
let background = GetSysColor(COLOR_3DFACE);
|
||||
let foreground = GetSysColor(COLOR_WINDOWTEXT);
|
||||
let mut border = 0;
|
||||
for shift in [0, 8, 16] {
|
||||
let channel = (((background >> shift) & 255) * 82 + ((foreground >> shift) & 255) * 18) / 100;
|
||||
border |= channel << shift;
|
||||
}
|
||||
let brush = CreateSolidBrush(COLORREF(border));
|
||||
FrameRect(
|
||||
dc,
|
||||
&RECT {
|
||||
left: 0,
|
||||
top: 0,
|
||||
right: bounds.right - bounds.left,
|
||||
bottom: bounds.bottom - bounds.top,
|
||||
},
|
||||
brush,
|
||||
);
|
||||
let _ = DeleteObject(brush.into());
|
||||
}
|
||||
ReleaseDC(Some(hwnd), dc);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
unsafe extern "system" fn window_proc(
|
||||
hwnd: HWND,
|
||||
msg: u32,
|
||||
wparam: WPARAM,
|
||||
lparam: LPARAM,
|
||||
id: usize,
|
||||
key: usize,
|
||||
) -> LRESULT {
|
||||
let state = STATES.with_borrow(|states| states.get(&key).cloned());
|
||||
// Paint the native toolbar and recovery surface outside the child webview.
|
||||
if msg == WM_ERASEBKGND {
|
||||
unsafe {
|
||||
let mut bounds = RECT::default();
|
||||
if GetClientRect(hwnd, &mut bounds).is_ok() {
|
||||
FillRect(HDC(wparam.0 as *mut _), &bounds, GetSysColorBrush(COLOR_WINDOW));
|
||||
}
|
||||
}
|
||||
return LRESULT(1);
|
||||
}
|
||||
if let Some(state) = &state {
|
||||
if msg == WM_COMMAND && (wparam.0 >> 16) == BN_CLICKED as usize {
|
||||
let event = match wparam.0 & 0xffff {
|
||||
RETRY => Some(AuthEvent::Retry),
|
||||
PROCEED => Some(AuthEvent::RequestTlsException),
|
||||
CANCEL => Some(AuthEvent::Close),
|
||||
_ => None,
|
||||
};
|
||||
if let Some(event) = event {
|
||||
state.messenger.send_auth_event(event);
|
||||
return LRESULT(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
let result = unsafe { DefSubclassProc(hwnd, msg, wparam, lparam) };
|
||||
if msg == WM_SIZE || msg == WM_DPICHANGED {
|
||||
if let Some(state) = &state {
|
||||
let _ = state.controls.layout(state);
|
||||
}
|
||||
}
|
||||
if msg == WM_NCDESTROY {
|
||||
unsafe {
|
||||
let _ = RemoveWindowSubclass(hwnd, Some(window_proc), id);
|
||||
}
|
||||
STATES.with_borrow_mut(|states| states.remove(&key));
|
||||
if let Some(state) = state {
|
||||
super::tls::clear_exceptions(&state.core);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
use super::super::tls::{TlsFailure, TlsFailureReason};
|
||||
use super::*;
|
||||
use std::collections::HashSet;
|
||||
use webview2_com::{ClearServerCertificateErrorActionsCompletedHandler, ServerCertificateErrorDetectedEventHandler};
|
||||
use windows::Win32::UI::WindowsAndMessaging::{IDYES, MB_DEFBUTTON2, MB_ICONWARNING, MB_YESNO, MessageBoxW};
|
||||
|
||||
#[derive(Default)]
|
||||
pub(super) struct Policy {
|
||||
pub ignore_errors: bool,
|
||||
approved: HashSet<(String, String)>,
|
||||
pending: Option<Failure>,
|
||||
}
|
||||
#[derive(Clone)]
|
||||
struct Failure {
|
||||
identity: (String, String),
|
||||
failure: TlsFailure,
|
||||
generation: u64,
|
||||
}
|
||||
|
||||
fn reason(error: COREWEBVIEW2_WEB_ERROR_STATUS) -> TlsFailureReason {
|
||||
match error {
|
||||
COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_COMMON_NAME_IS_INCORRECT => TlsFailureReason::HostnameMismatch,
|
||||
COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_EXPIRED => TlsFailureReason::Expired,
|
||||
_ => TlsFailureReason::InvalidCertificate,
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn install(state: &Rc<State>) -> windows::core::Result<()> {
|
||||
let weak = Rc::downgrade(state);
|
||||
let handler = ServerCertificateErrorDetectedEventHandler::create(Box::new(move |_, args| {
|
||||
let (Some(state), Some(args)) = (weak.upgrade(), args) else {
|
||||
return Ok(());
|
||||
};
|
||||
unsafe {
|
||||
let uri = text(|p| args.RequestUri(p))?;
|
||||
let host = url::Url::parse(&uri)
|
||||
.ok()
|
||||
.and_then(|url| url.host_str().map(str::to_owned))
|
||||
.unwrap_or_default();
|
||||
let pem = text(|p| args.ServerCertificate()?.ToPemEncoding(p))?;
|
||||
let mut error = COREWEBVIEW2_WEB_ERROR_STATUS_UNKNOWN;
|
||||
args.ErrorStatus(&mut error)?;
|
||||
let identity = (host.clone(), pem);
|
||||
let mut policy = state.tls.borrow_mut();
|
||||
if policy.ignore_errors || policy.approved.contains(&identity) {
|
||||
args.SetAction(COREWEBVIEW2_SERVER_CERTIFICATE_ERROR_ACTION_ALWAYS_ALLOW)?;
|
||||
} else {
|
||||
args.SetAction(COREWEBVIEW2_SERVER_CERTIFICATE_ERROR_ACTION_CANCEL)?;
|
||||
let generation = state.document.borrow().1;
|
||||
let failure = TlsFailure {
|
||||
host,
|
||||
reason: reason(error),
|
||||
can_continue: error != COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_REVOKED,
|
||||
};
|
||||
state
|
||||
.messenger
|
||||
.send_auth_event(AuthEvent::Error(generation, AuthError::Tls(failure.clone())));
|
||||
policy.pending = Some(Failure {
|
||||
identity,
|
||||
failure,
|
||||
generation,
|
||||
});
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}));
|
||||
let mut token = 0;
|
||||
unsafe {
|
||||
state
|
||||
.core
|
||||
.cast::<ICoreWebView2_14>()?
|
||||
.add_ServerCertificateErrorDetected(&handler, &mut token)
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn confirm(state: &State) -> anyhow::Result<()> {
|
||||
let pending = state
|
||||
.tls
|
||||
.borrow()
|
||||
.pending
|
||||
.clone()
|
||||
.context("No certificate error to confirm")?;
|
||||
if !pending.failure.can_continue || pending.generation != state.messenger.generation() {
|
||||
bail!("This certificate exception is no longer available");
|
||||
}
|
||||
let answer = unsafe {
|
||||
MessageBoxW(
|
||||
Some(state.controls.parent),
|
||||
&HSTRING::from(pending.failure.confirmation_message()),
|
||||
&HSTRING::from(pending.failure.confirmation_title()),
|
||||
MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2,
|
||||
)
|
||||
};
|
||||
if answer == IDYES {
|
||||
let identity = pending.identity.clone();
|
||||
let generation = pending.generation;
|
||||
state.tls.borrow_mut().approved.insert(identity);
|
||||
state.messenger.send_auth_event(AuthEvent::TlsAccepted(generation));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
// WebView2 caches approvals in the session. Do not leave them for another sign-in window.
|
||||
pub(super) fn clear_exceptions(core: &ICoreWebView2) {
|
||||
if let Ok(core) = core.cast::<ICoreWebView2_14>() {
|
||||
let _ = unsafe {
|
||||
core.ClearServerCertificateErrorActions(&ClearServerCertificateErrorActionsCompletedHandler::create(Box::new(
|
||||
|_| Ok(()),
|
||||
)))
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn maps_certificate_failure_reasons() {
|
||||
assert_eq!(
|
||||
reason(COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_COMMON_NAME_IS_INCORRECT),
|
||||
TlsFailureReason::HostnameMismatch
|
||||
);
|
||||
assert_eq!(
|
||||
reason(COREWEBVIEW2_WEB_ERROR_STATUS_CERTIFICATE_EXPIRED),
|
||||
TlsFailureReason::Expired
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user