Restore SEBPatch

SafeExamBrowser.Browser/BrowserApplication.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -116,18 +116,10 @@ namespace SafeExamBrowser.Browser
 
 			if (success)
 			{
+				InitializeCookies();
+				InitializeDownAndUploadDirectory();
 				InitializeIntegrityKeys();
 
-				if (settings.DeleteCookiesOnStartup)
-				{
-					DeleteCookies();
-				}
-
-				if (settings.UseTemporaryDownAndUploadDirectory)
-				{
-					CreateTemporaryDownAndUploadDirectory();
-				}
-
 				logger.Info("Initialized browser.");
 			}
 			else
@@ -144,36 +136,23 @@ namespace SafeExamBrowser.Browser
 		public void Terminate()
 		{
 			logger.Info("Initiating termination...");
+
 			AwaitReady();
 
 			foreach (var window in windows)
 			{
 				window.Closed -= Window_Closed;
 				window.Close();
+
 				logger.Info($"Closed browser window #{window.Id}.");
 			}
 
-			if (settings.UseTemporaryDownAndUploadDirectory)
-			{
-				DeleteTemporaryDownAndUploadDirectory();
-			}
-
-			if (settings.DeleteCookiesOnShutdown)
-			{
-				DeleteCookies();
-			}
-
+			FinalizeCookies();
+			FinalizeDownAndUploadDirectory();
 			Cef.Shutdown();
-			logger.Info("Terminated browser.");
+			FinalizeCache();
 
-			if (settings.DeleteCacheOnShutdown && settings.DeleteCookiesOnShutdown)
-			{
-				DeleteCache();
-			}
-			else
-			{
-				logger.Info("Retained browser cache.");
-			}
+			logger.Info("Terminated browser.");
 		}
 
 		private void AwaitReady()
@@ -231,46 +210,6 @@ namespace SafeExamBrowser.Browser
 			WindowsChanged?.Invoke();
 		}
 
-		private void CreateTemporaryDownAndUploadDirectory()
-		{
-			try
-			{
-				settings.DownAndUploadDirectory = Path.Combine(appConfig.TemporaryDirectory, Path.GetRandomFileName());
-				Directory.CreateDirectory(settings.DownAndUploadDirectory);
-				logger.Info($"Created temporary down- and upload directory.");
-			}
-			catch (Exception e)
-			{
-				logger.Error("Failed to create temporary down- and upload directory!", e);
-			}
-		}
-
-		private void DeleteTemporaryDownAndUploadDirectory()
-		{
-			try
-			{
-				Directory.Delete(settings.DownAndUploadDirectory, true);
-				logger.Info("Deleted temporary down- and upload directory.");
-			}
-			catch (Exception e)
-			{
-				logger.Error("Failed to delete temporary down- and upload directory!", e);
-			}
-		}
-
-		private void DeleteCache()
-		{
-			try
-			{
-				Directory.Delete(appConfig.BrowserCachePath, true);
-				logger.Info("Deleted browser cache.");
-			}
-			catch (Exception e)
-			{
-				logger.Error("Failed to delete browser cache!", e);
-			}
-		}
-
 		private void DeleteCookies()
 		{
 			var callback = new TaskDeleteCookiesCallback();
@@ -297,6 +236,50 @@ namespace SafeExamBrowser.Browser
 			}
 		}
 
+		private void FinalizeCache()
+		{
+			if (settings.DeleteCacheOnShutdown && settings.DeleteCookiesOnShutdown)
+			{
+				try
+				{
+					Directory.Delete(appConfig.BrowserCachePath, true);
+					logger.Info("Deleted browser cache.");
+				}
+				catch (Exception e)
+				{
+					logger.Error("Failed to delete browser cache!", e);
+				}
+			}
+			else
+			{
+				logger.Info("Retained browser cache.");
+			}
+		}
+
+		private void FinalizeCookies()
+		{
+			if (settings.DeleteCookiesOnShutdown)
+			{
+				DeleteCookies();
+			}
+		}
+
+		private void FinalizeDownAndUploadDirectory()
+		{
+			if (settings.UseTemporaryDownAndUploadDirectory)
+			{
+				try
+				{
+					Directory.Delete(settings.DownAndUploadDirectory, true);
+					logger.Info("Deleted temporary down- and upload directory.");
+				}
+				catch (Exception e)
+				{
+					logger.Error("Failed to delete temporary down- and upload directory!", e);
+				}
+			}
+		}
+
 		private string GenerateStartUrl()
 		{
 			var url = settings.StartUrl;
@@ -371,6 +354,53 @@ namespace SafeExamBrowser.Browser
 			return cefSettings;
 		}
 
+		private void InitializeCookies()
+		{
+			if (settings.DeleteCookiesOnStartup)
+			{
+				DeleteCookies();
+			}
+		}
+
+		private void InitializeDownAndUploadDirectory()
+		{
+			if (settings.UseTemporaryDownAndUploadDirectory)
+			{
+				InitializeTemporaryDownAndUploadDirectory();
+			}
+			else if (!string.IsNullOrEmpty(settings.DownAndUploadDirectory))
+			{
+				InitializeCustomDownAndUploadDirectory();
+			}
+		}
+
+		private void InitializeCustomDownAndUploadDirectory()
+		{
+			if (!Directory.Exists(Environment.ExpandEnvironmentVariables(settings.DownAndUploadDirectory)))
+			{
+				logger.Warn("The configured down- and upload directory does not exist! Falling back to the default directory...");
+				settings.DownAndUploadDirectory = default;
+			}
+			else
+			{
+				logger.Debug("Using custom down- and upload directory as defined in the active configuration.");
+			}
+		}
+
+		private void InitializeTemporaryDownAndUploadDirectory()
+		{
+			try
+			{
+				settings.DownAndUploadDirectory = Path.Combine(appConfig.TemporaryDirectory, Path.GetRandomFileName());
+				Directory.CreateDirectory(settings.DownAndUploadDirectory);
+				logger.Info($"Created temporary down- and upload directory.");
+			}
+			catch (Exception e)
+			{
+				logger.Error("Failed to create temporary down- and upload directory!", e);
+			}
+		}
+
 		private void InitializeIntegrityKeys()
 		{
 			logger.Debug($"Browser Exam Key (BEK) transmission is {(settings.SendBrowserExamKey ? "enabled" : "disabled")}.");

SafeExamBrowser.Browser/BrowserControl.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26,6 +26,9 @@ namespace SafeExamBrowser.Browser
 		private readonly IDialogHandler dialogHandler;
 		private readonly IDisplayHandler displayHandler;
 		private readonly IDownloadHandler downloadHandler;
+		private readonly IDragHandler dragHandler;
+		private readonly IFocusHandler focusHandler;
+		private readonly IJsDialogHandler javaScriptDialogHandler;
 		private readonly IKeyboardHandler keyboardHandler;
 		private readonly ILogger logger;
 		private readonly IRenderProcessMessageHandler renderProcessMessageHandler;
@@ -47,6 +50,9 @@ namespace SafeExamBrowser.Browser
 			IDialogHandler dialogHandler,
 			IDisplayHandler displayHandler,
 			IDownloadHandler downloadHandler,
+			IDragHandler dragHandler,
+			IFocusHandler focusHandler,
+			IJsDialogHandler javaScriptDialogHandler,
 			IKeyboardHandler keyboardHandler,
 			ILogger logger,
 			IRenderProcessMessageHandler renderProcessMessageHandler,
@@ -57,6 +63,9 @@ namespace SafeExamBrowser.Browser
 			this.dialogHandler = dialogHandler;
 			this.displayHandler = displayHandler;
 			this.downloadHandler = downloadHandler;
+			this.dragHandler = dragHandler;
+			this.focusHandler = focusHandler;
+			this.javaScriptDialogHandler = javaScriptDialogHandler;
 			this.keyboardHandler = keyboardHandler;
 			this.logger = logger;
 			this.renderProcessMessageHandler = renderProcessMessageHandler;
@@ -67,6 +76,7 @@ namespace SafeExamBrowser.Browser
 		{
 			if (!control.IsDisposed)
 			{
+				control.CloseDevTools();
 				control.Dispose(true);
 			}
 		}
@@ -119,22 +129,31 @@ namespace SafeExamBrowser.Browser
 			control.AddressChanged += (o, e) => AddressChanged?.Invoke(e.Address);
 			control.AuthCredentialsRequired += (w, b, o, i, h, p, r, s, c, a) => a.Value = requestHandler.GetAuthCredentials(w, b, o, i, h, p, r, s, c);
 			control.BeforeBrowse += (w, b, f, r, u, i, a) => a.Value = requestHandler.OnBeforeBrowse(w, b, f, r, u, i);
-			control.BeforeDownload += (w, b, d, c) => downloadHandler.OnBeforeDownload(w, b, d, c);
+			control.BeforeDownload += (w, b, d, c, a) => a.Value = a.Value = downloadHandler.OnBeforeDownload(w, b, d, c);
+			control.BeforeUnloadDialog += (w, b, m, r, c, a) => a.Value = javaScriptDialogHandler.OnBeforeUnloadDialog(w, b, m, r, c);
 			control.CanDownload += (w, b, u, r, a) => a.Value = downloadHandler.CanDownload(w, b, u, r);
 			control.ContextCreated += (w, b, f) => renderProcessMessageHandler.OnContextCreated(w, b, f);
 			control.ContextReleased += (w, b, f) => renderProcessMessageHandler.OnContextReleased(w, b, f);
+			control.DialogClosed += (w, b) => javaScriptDialogHandler.OnDialogClosed(w, b);
 			control.DownloadUpdated += (w, b, d, c) => downloadHandler.OnDownloadUpdated(w, b, d, c);
+			control.DragEnterCefSharp += (w, b, d, m, a) => a.Value = dragHandler.OnDragEnter(w, b, d, m);
+			control.DraggableRegionsChanged += (w, b, f, r) => dragHandler.OnDraggableRegionsChanged(w, b, f, r);
 			control.FaviconUrlChanged += (w, b, u) => displayHandler.OnFaviconUrlChange(w, b, u);
-			control.FileDialogRequested += (w, b, m, t, d, f, c) => dialogHandler.OnFileDialog(w, b, m, t, d, f, c);
+			control.FileDialogRequested += (w, b, m, t, p, f, e, d, c) => dialogHandler.OnFileDialog(w, b, m, t, p, f, e, d, c);
 			control.FocusedNodeChanged += (w, b, f, n) => renderProcessMessageHandler.OnFocusedNodeChanged(w, b, f, n);
+			control.GotFocusCefSharp += (w, b) => focusHandler.OnGotFocus(w, b);
 			control.IsBrowserInitializedChanged += Control_IsBrowserInitializedChanged;
+			control.JavaScriptDialog += (IWebBrowser w, IBrowser b, string u, CefJsDialogType t, string m, string p, IJsDialogCallback c, ref bool s, GenericEventArgs a) => a.Value = javaScriptDialogHandler.OnJSDialog(w, b, u, t, m, p, c, ref s);
 			control.KeyEvent += (w, b, t, k, n, m, s) => keyboardHandler.OnKeyEvent(w, b, t, k, n, m, s);
 			control.LoadError += (o, e) => LoadFailed?.Invoke((int) e.ErrorCode, e.ErrorText, e.Frame.IsMain, e.FailedUrl);
 			control.LoadingProgressChanged += (w, b, p) => displayHandler.OnLoadingProgressChange(w, b, p);
 			control.LoadingStateChanged += (o, e) => LoadingStateChanged?.Invoke(e.IsLoading);
 			control.OpenUrlFromTab += (w, b, f, u, t, g, a) => a.Value = requestHandler.OnOpenUrlFromTab(w, b, f, u, t, g);
 			control.PreKeyEvent += (IWebBrowser w, IBrowser b, KeyType t, int k, int n, CefEventFlags m, bool i, ref bool s, GenericEventArgs a) => a.Value = keyboardHandler.OnPreKeyEvent(w, b, t, k, n, m, i, ref s);
+			control.ResetDialogState += (w, b) => javaScriptDialogHandler.OnResetDialogState(w, b);
 			control.ResourceRequestHandlerRequired += (IWebBrowser w, IBrowser b, IFrame f, IRequest r, bool n, bool d, string i, ref bool h, ResourceRequestEventArgs a) => a.Handler = requestHandler.GetResourceRequestHandler(w, b, f, r, n, d, i, ref h);
+			control.SetFocus += (w, b, s, a) => a.Value = focusHandler.OnSetFocus(w, b, s);
+			control.TakeFocus += (w, b, n) => focusHandler.OnTakeFocus(w, b, n);
 			control.TitleChanged += (o, e) => TitleChanged?.Invoke(e.Title);
 			control.UncaughtExceptionEvent += (w, b, f, e) => renderProcessMessageHandler.OnUncaughtException(w, b, f, e);
 

SafeExamBrowser.Browser/BrowserIconResource.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/BrowserWindow.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -157,6 +157,9 @@ namespace SafeExamBrowser.Browser
 			var displayHandler = new DisplayHandler();
 			var downloadLogger = logger.CloneFor($"{nameof(DownloadHandler)} #{Id}");
 			var downloadHandler = new DownloadHandler(appConfig, downloadLogger, settings, WindowSettings);
+			var dragHandler = new DragHandler();
+			var focusHandler = new FocusHandler();
+			var javaScriptDialogHandler = new JavaScriptDialogHandler();
 			var keyboardHandler = new KeyboardHandler();
 			var renderHandler = new RenderProcessMessageHandler(appConfig, clipboard, keyGenerator, settings, text);
 			var requestFilter = new RequestFilter();
@@ -181,6 +184,7 @@ namespace SafeExamBrowser.Browser
 			downloadHandler.ConfigurationDownloadRequested += DownloadHandler_ConfigurationDownloadRequested;
 			downloadHandler.DownloadAborted += DownloadHandler_DownloadAborted;
 			downloadHandler.DownloadUpdated += DownloadHandler_DownloadUpdated;
+			javaScriptDialogHandler.DialogRequested += JavaScriptDialogHandler_DialogRequested;
 			keyboardHandler.FindRequested += KeyboardHandler_FindRequested;
 			keyboardHandler.FocusAddressBarRequested += KeyboardHandler_FocusAddressBarRequested;
 			keyboardHandler.HomeNavigationRequested += HomeNavigationRequested;
@@ -195,7 +199,19 @@ namespace SafeExamBrowser.Browser
 
 			InitializeRequestFilter(requestFilter);
 
-			Control = new BrowserControl(clipboard, cefSharpControl, dialogHandler, displayHandler, downloadHandler, keyboardHandler, controlLogger, renderHandler, requestHandler);
+			Control = new BrowserControl(
+				clipboard,
+				cefSharpControl,
+				dialogHandler,
+				displayHandler,
+				downloadHandler,
+				dragHandler,
+				focusHandler,
+				javaScriptDialogHandler,
+				keyboardHandler,
+				controlLogger,
+				renderHandler,
+				requestHandler);
 			Control.AddressChanged += Control_AddressChanged;
 			Control.LoadFailed += Control_LoadFailed;
 			Control.LoadingStateChanged += Control_LoadingStateChanged;
@@ -488,6 +504,20 @@ namespace SafeExamBrowser.Browser
 			}
 		}
 
+		private void JavaScriptDialogHandler_DialogRequested(JavaScriptDialogRequestedEventArgs args)
+		{
+			logger.Debug($"A JavaScript dialog of type '{args.Type}' has been requested...");
+
+			if (args.Type == JavaScriptDialogType.LeavePage)
+			{
+				args.Success = RequestPageLeave();
+			}
+			else
+			{
+				args.Success = RequestPageReload();
+			}
+		}
+
 		private void KeyboardHandler_FindRequested()
 		{
 			if (settings.AllowFind)
@@ -642,29 +672,61 @@ namespace SafeExamBrowser.Browser
 
 		private void ReloadRequested()
 		{
+			logger.Debug("A reload of the current page has been requested...");
+
+			if (RequestPageReload())
+			{
+				Control.Reload();
+			}
+		}
+
+		private bool RequestPageLeave()
+		{
+			var allow = false;
+			var result = messageBox.Show(TextKey.MessageBox_PageLeaveConfirmation, TextKey.MessageBox_PageLeaveConfirmationTitle, MessageBoxAction.YesNo, MessageBoxIcon.Question, window);
+
+			if (result == MessageBoxResult.Yes)
+			{
+				allow = true;
+				logger.Debug("The page leave has been granted by the user.");
+			}
+			else
+			{
+				logger.Debug("The page leave has been aborted by the user.");
+			}
+
+			return allow;
+		}
+
+		private bool RequestPageReload()
+		{
+			var allow = false;
+
 			if (WindowSettings.AllowReloading && WindowSettings.ShowReloadWarning)
 			{
-				var result = messageBox.Show(TextKey.MessageBox_ReloadConfirmation, TextKey.MessageBox_ReloadConfirmationTitle, MessageBoxAction.YesNo, MessageBoxIcon.Question, window);
+				var result = messageBox.Show(TextKey.MessageBox_PageReloadConfirmation, TextKey.MessageBox_PageReloadConfirmationTitle, MessageBoxAction.YesNo, MessageBoxIcon.Question, window);
 
 				if (result == MessageBoxResult.Yes)
 				{
-					logger.Debug("The user confirmed reloading the current page...");
-					Control.Reload();
+					allow = true;
+					logger.Debug("The page reload has been granted by the user.");
 				}
 				else
 				{
-					logger.Debug("The user aborted reloading the current page.");
+					logger.Debug("The page reload has been aborted by the user.");
 				}
 			}
 			else if (WindowSettings.AllowReloading)
 			{
-				logger.Debug("Reloading current page...");
-				Control.Reload();
+				allow = true;
+				logger.Debug("The page reload has been automatically granted.");
 			}
 			else
 			{
-				logger.Debug("Blocked reload attempt, as the user is not allowed to reload web pages.");
+				logger.Debug("The page reload has been blocked, as the user is not allowed to reload web pages.");
 			}
+
+			return allow;
 		}
 
 		private void ShowDownUploadNotAllowedMessage(bool isDownload = true)

SafeExamBrowser.Browser/Clipboard.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32,7 +32,22 @@ namespace SafeExamBrowser.Browser
 
 		internal void Process(JavascriptMessageReceivedEventArgs message)
 		{
-			
+			if (settings.UseIsolatedClipboard)
+			{
+				try
+				{
+					var data = message.ConvertMessageTo<Data>();
+
+					if (data != default && data.Type == "Clipboard" && TrySetContent(data.Content))
+					{
+						Task.Run(() => Changed?.Invoke(data.Id));
+					}
+				}
+				catch (Exception e)
+				{
+					logger.Error($"Failed to process browser message '{message}'!", e);
+				}
+			}
 		}
 
 		private bool TrySetContent(object value)

SafeExamBrowser.Browser/Content/Api.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Content/Clipboard.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Z<>rich, IT Services
+ * Copyright (c) 2025 ETH Z<>rich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Content/ContentLoader.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Content/PageZoom.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Z<>rich, IT Services
+ * Copyright (c) 2025 ETH Z<>rich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/ClipboardChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/DialogRequestedEventArgs.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/DialogRequestedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/DownloadAbortedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/DownloadUpdatedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/FaviconChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/PopupRequestedEventArgs.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/PopupRequestedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/ProgressChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/ResetRequestedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/UrlEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Events/WindowClosedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Filters/RequestFilter.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Filters/RuleFactory.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Filters/Rules/RegexRule.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Filters/Rules/SimplifiedRule.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/ContextMenuHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/DialogHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,7 +18,16 @@ namespace SafeExamBrowser.Browser.Handlers
 	{
 		internal event DialogRequestedEventHandler DialogRequested;
 
-		public bool OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback)
+		public bool OnFileDialog(
+			IWebBrowser webBrowser,
+			IBrowser browser,
+			CefFileDialogMode mode,
+			string title,
+			string defaultFilePath,
+			IReadOnlyCollection<string> acceptFilters,
+			IReadOnlyCollection<string> acceptExtensions,
+			IReadOnlyCollection<string> acceptDescriptions,
+			IFileDialogCallback callback)
 		{
 			var args = new DialogRequestedEventArgs
 			{

SafeExamBrowser.Browser/Handlers/DisplayHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/DownloadHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -50,7 +50,7 @@ namespace SafeExamBrowser.Browser.Handlers
 			return true;
 		}
 
-		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
+		public bool OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
 		{
 			var fileExtension = Path.GetExtension(downloadItem.SuggestedFileName);
 			var isConfigurationFile = false;
@@ -86,6 +86,8 @@ namespace SafeExamBrowser.Browser.Handlers
 				logger.Info($"Aborted download request{(windowSettings.UrlPolicy.CanLog() ? $" for '{url}'" : "")}, as downloading is not allowed.");
 				Task.Run(() => DownloadAborted?.Invoke());
 			}
+
+			return true;
 		}
 
 		public void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)
@@ -100,6 +102,8 @@ namespace SafeExamBrowser.Browser.Handlers
 					FullPath = downloadItem.FullPath,
 					IsCancelled = downloadItem.IsCancelled,
 					IsComplete = downloadItem.IsComplete,
+					IsIndeterminate = downloadItem.PercentComplete < 0,
+					Size = downloadItem.ReceivedBytes,
 					Url = downloadItem.Url
 				};
 

SafeExamBrowser.Browser/Handlers/KeyboardHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/RenderProcessMessageHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/RequestHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Handlers/ResourceHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("Safe Exam Browser")]
 [assembly: AssemblyCompany("ETH Zürich")]
 [assembly: AssemblyProduct("SafeExamBrowser.Browser")]
-[assembly: AssemblyCopyright("Copyright © 2024 ETH Zürich, IT Services")]
+[assembly: AssemblyCopyright("Copyright © 2025 ETH Zürich, IT Services")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.props')" />
-  <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.121.3.13\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.121.3.13\build\chromiumembeddedframework.runtime.win-x86.props')" />
-  <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.121.3.13\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.121.3.13\build\chromiumembeddedframework.runtime.win-x64.props')" />
+  <Import Project="..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.props')" />
+  <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.131.3.5\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.131.3.5\build\chromiumembeddedframework.runtime.win-x86.props')" />
+  <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.131.3.5\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.131.3.5\build\chromiumembeddedframework.runtime.win-x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -53,14 +53,14 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CefSharp, Version=121.3.130.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.Common.121.3.130\lib\net462\CefSharp.dll</HintPath>
+    <Reference Include="CefSharp, Version=131.3.50.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.Common.131.3.50\lib\net462\CefSharp.dll</HintPath>
     </Reference>
-    <Reference Include="CefSharp.Core, Version=121.3.130.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.Common.121.3.130\lib\net462\CefSharp.Core.dll</HintPath>
+    <Reference Include="CefSharp.Core, Version=131.3.50.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.Common.131.3.50\lib\net462\CefSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="CefSharp.WinForms, Version=121.3.130.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.WinForms.121.3.130\lib\net462\CefSharp.WinForms.dll</HintPath>
+    <Reference Include="CefSharp.WinForms, Version=131.3.50.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\packages\CefSharp.WinForms.131.3.50\lib\net462\CefSharp.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -87,6 +87,9 @@
     <Compile Include="Events\DownloadAbortedEventHandler.cs" />
     <Compile Include="Events\DownloadUpdatedEventHandler.cs" />
     <Compile Include="Events\FaviconChangedEventHandler.cs" />
+    <Compile Include="Events\JavaScriptDialogRequestedEventArgs.cs" />
+    <Compile Include="Events\JavaScriptDialogRequestedEventHandler.cs" />
+    <Compile Include="Events\JavaScriptDialogType.cs" />
     <Compile Include="Events\WindowClosedEventHandler.cs" />
     <Compile Include="Events\PopupRequestedEventArgs.cs" />
     <Compile Include="Events\PopupRequestedEventHandler.cs" />
@@ -103,6 +106,8 @@
     <Compile Include="Handlers\DialogHandler.cs" />
     <Compile Include="Handlers\DisplayHandler.cs" />
     <Compile Include="Handlers\DownloadHandler.cs" />
+    <Compile Include="Handlers\DragHandler.cs" />
+    <Compile Include="Handlers\FocusHandler.cs" />
     <Compile Include="Handlers\KeyboardHandler.cs" />
     <Compile Include="Handlers\RenderProcessMessageHandler.cs" />
     <Compile Include="Handlers\RequestHandler.cs" />
@@ -118,25 +123,38 @@
     <Compile Include="Wrapper\Events\AuthCredentialsEventHandler.cs" />
     <Compile Include="Wrapper\Events\BeforeBrowseEventHandler.cs" />
     <Compile Include="Wrapper\Events\BeforeDownloadEventHandler.cs" />
+    <Compile Include="Wrapper\Events\BeforeUnloadDialogEventHandler.cs" />
     <Compile Include="Wrapper\Events\CanDownloadEventHandler.cs" />
     <Compile Include="Wrapper\Events\ContextCreatedEventHandler.cs" />
     <Compile Include="Wrapper\Events\ContextReleasedEventHandler.cs" />
+    <Compile Include="Wrapper\Events\DialogClosedEventHandler.cs" />
     <Compile Include="Wrapper\Events\DownloadUpdatedEventHandler.cs" />
+    <Compile Include="Wrapper\Events\DragEnterEventHandler.cs" />
+    <Compile Include="Wrapper\Events\DraggableRegionsChangedEventHandler.cs" />
     <Compile Include="Wrapper\Events\FaviconUrlChangedEventHandler.cs" />
     <Compile Include="Wrapper\Events\FileDialogRequestedEventHandler.cs" />
     <Compile Include="Wrapper\Events\FocusedNodeChangedEventHandler.cs" />
+    <Compile Include="Wrapper\Events\GotFocusEventHandler.cs" />
+    <Compile Include="Wrapper\Events\JavaScriptDialogEventHandler.cs" />
     <Compile Include="Wrapper\Events\KeyEventHandler.cs" />
     <Compile Include="Wrapper\Events\LoadingProgressChangedEventHandler.cs" />
     <Compile Include="Wrapper\Events\GenericEventArgs.cs" />
     <Compile Include="Wrapper\Events\OpenUrlFromTabEventHandler.cs" />
     <Compile Include="Wrapper\Events\PreKeyEventHandler.cs" />
+    <Compile Include="Wrapper\Events\ResetDialogStateEventHandler.cs" />
     <Compile Include="Wrapper\Events\ResourceRequestEventArgs.cs" />
     <Compile Include="Wrapper\Events\ResourceRequestEventHandler.cs" />
+    <Compile Include="Wrapper\Events\SetFocusEventHandler.cs" />
+    <Compile Include="Wrapper\Events\TakeFocusEventHandler.cs" />
     <Compile Include="Wrapper\Events\UncaughtExceptionEventHandler.cs" />
     <Compile Include="Wrapper\Extensions.cs" />
     <Compile Include="Wrapper\Handlers\DialogHandlerSwitch.cs" />
     <Compile Include="Wrapper\Handlers\DisplayHandlerSwitch.cs" />
     <Compile Include="Wrapper\Handlers\DownloadHandlerSwitch.cs" />
+    <Compile Include="Wrapper\Handlers\DragHandlerSwitch.cs" />
+    <Compile Include="Wrapper\Handlers\FocusHandlerSwitch.cs" />
+    <Compile Include="Handlers\JavaScriptDialogHandler.cs" />
+    <Compile Include="Wrapper\Handlers\JavaScriptDialogHandlerSwitch.cs" />
     <Compile Include="Wrapper\Handlers\KeyboardHandlerSwitch.cs" />
     <Compile Include="Wrapper\Handlers\RenderProcessMessageHandlerSwitch.cs" />
     <Compile Include="Wrapper\Handlers\RequestHandlerSwitch.cs" />
@@ -209,10 +227,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.121.3.13\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.121.3.13\build\chromiumembeddedframework.runtime.win-x64.props'))" />
-    <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.121.3.13\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.121.3.13\build\chromiumembeddedframework.runtime.win-x86.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.131.3.5\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.131.3.5\build\chromiumembeddedframework.runtime.win-x64.props'))" />
+    <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.131.3.5\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.131.3.5\build\chromiumembeddedframework.runtime.win-x86.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.targets'))" />
   </Target>
-  <Import Project="..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.121.3.130\build\CefSharp.Common.targets')" />
+  <Import Project="..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.131.3.50\build\CefSharp.Common.targets')" />
 </Project>

SafeExamBrowser.Browser/Wrapper/CefSharpBrowserControl.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +8,7 @@
 
 using System.Collections.Generic;
 using CefSharp;
+using CefSharp.Enums;
 using CefSharp.WinForms;
 using SafeExamBrowser.Browser.Handlers;
 using SafeExamBrowser.Browser.Wrapper.Events;
@@ -20,18 +21,27 @@ namespace SafeExamBrowser.Browser.Wrapper
 		public event AuthCredentialsEventHandler AuthCredentialsRequired;
 		public event BeforeBrowseEventHandler BeforeBrowse;
 		public event BeforeDownloadEventHandler BeforeDownload;
+		public event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
 		public event CanDownloadEventHandler CanDownload;
 		public event ContextCreatedEventHandler ContextCreated;
 		public event ContextReleasedEventHandler ContextReleased;
+		public event DialogClosedEventHandler DialogClosed;
 		public event DownloadUpdatedEventHandler DownloadUpdated;
+		public event DragEnterEventHandler DragEnterCefSharp;
+		public event DraggableRegionsChangedEventHandler DraggableRegionsChanged;
 		public event FaviconUrlChangedEventHandler FaviconUrlChanged;
 		public event FileDialogRequestedEventHandler FileDialogRequested;
 		public event FocusedNodeChangedEventHandler FocusedNodeChanged;
+		public event GotFocusEventHandler GotFocusCefSharp;
+		public event JavaScriptDialogEventHandler JavaScriptDialog;
 		public event KeyEventHandler KeyEvent;
 		public event LoadingProgressChangedEventHandler LoadingProgressChanged;
 		public event OpenUrlFromTabEventHandler OpenUrlFromTab;
 		public event PreKeyEventHandler PreKeyEvent;
+		public event ResetDialogStateEventHandler ResetDialogState;
 		public event ResourceRequestEventHandler ResourceRequestHandlerRequired;
+		public event SetFocusEventHandler SetFocus;
+		public event TakeFocusEventHandler TakeFocus;
 		public event UncaughtExceptionEventHandler UncaughtExceptionEvent;
 
 		public CefSharpBrowserControl(ILifeSpanHandler lifeSpanHandler, string url) : base(url)
@@ -39,6 +49,9 @@ namespace SafeExamBrowser.Browser.Wrapper
 			DialogHandler = new DialogHandlerSwitch();
 			DisplayHandler = new DisplayHandlerSwitch();
 			DownloadHandler = new DownloadHandlerSwitch();
+			DragHandler = new DragHandlerSwitch();
+			FocusHandler = new FocusHandlerSwitch();
+			JsDialogHandler = new JavaScriptDialogHandlerSwitch();
 			KeyboardHandler = new KeyboardHandlerSwitch();
 			LifeSpanHandler = lifeSpanHandler;
 			MenuHandler = new ContextMenuHandler();
@@ -66,9 +79,14 @@ namespace SafeExamBrowser.Browser.Wrapper
 			BeforeBrowse?.Invoke(webBrowser, browser, frame, request, userGesture, isRedirect, args);
 		}
 
-		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
+		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args)
 		{
-			BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback);
+			BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback, args);
+		}
+
+		public void OnBeforeUnloadDialog(IWebBrowser webBrowser, IBrowser browser, string message, bool isReload, IJsDialogCallback callback, GenericEventArgs args)
+		{
+			BeforeUnloadDialog?.Invoke(webBrowser, browser, message, isReload, callback, args);
 		}
 
 		public void OnCanDownload(IWebBrowser webBrowser, IBrowser browser, string url, string requestMethod, GenericEventArgs args)
@@ -86,19 +104,34 @@ namespace SafeExamBrowser.Browser.Wrapper
 			ContextReleased?.Invoke(webBrowser, browser, frame);
 		}
 
+		public void OnDialogClosed(IWebBrowser webBrowser, IBrowser browser)
+		{
+			DialogClosed?.Invoke(webBrowser, browser);
+		}
+
 		public void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)
 		{
 			DownloadUpdated?.Invoke(webBrowser, browser, downloadItem, callback);
 		}
 
+		public void OnDragEnter(IWebBrowser webBrowser, IBrowser browser, IDragData dragData, DragOperationsMask mask, GenericEventArgs args)
+		{
+			DragEnterCefSharp?.Invoke(webBrowser, browser, dragData, mask, args);
+		}
+
+		public void OnDraggableRegionsChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IList<DraggableRegion> regions)
+		{
+			DraggableRegionsChanged?.Invoke(webBrowser, browser, frame, regions);
+		}
+
 		public void OnFaviconUrlChange(IWebBrowser webBrowser, IBrowser browser, IList<string> urls)
 		{
 			FaviconUrlChanged?.Invoke(webBrowser, browser, urls);
 		}
 
-		public void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback)
+		public void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, IReadOnlyCollection<string> acceptFilters, IReadOnlyCollection<string> acceptExtensions, IReadOnlyCollection<string> acceptDescriptions, IFileDialogCallback callback)
 		{
-			FileDialogRequested?.Invoke(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, callback);
+			FileDialogRequested?.Invoke(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, acceptExtensions, acceptDescriptions, callback);
 		}
 
 		public void OnFocusedNodeChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IDomNode node)
@@ -106,6 +139,16 @@ namespace SafeExamBrowser.Browser.Wrapper
 			FocusedNodeChanged?.Invoke(webBrowser, browser, frame, node);
 		}
 
+		public void OnGotFocus(IWebBrowser webBrowser, IBrowser browser)
+		{
+			GotFocusCefSharp?.Invoke(webBrowser, browser);
+		}
+
+		public void OnJavaScriptDialog(IWebBrowser webBrowser, IBrowser browser, string originUrl, CefJsDialogType type, string message, string promptText, IJsDialogCallback callback, ref bool suppress, GenericEventArgs args)
+		{
+			JavaScriptDialog?.Invoke(webBrowser, browser, originUrl, type, message, promptText, callback, ref suppress, args);
+		}
+
 		public void OnKeyEvent(IWebBrowser webBrowser, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey)
 		{
 			KeyEvent?.Invoke(webBrowser, browser, type, windowsKeyCode, nativeKeyCode, modifiers, isSystemKey);
@@ -126,6 +169,21 @@ namespace SafeExamBrowser.Browser.Wrapper
 			PreKeyEvent?.Invoke(webBrowser, browser, type, windowsKeyCode, nativeKeyCode, modifiers, isSystemKey, ref isKeyboardShortcut, args);
 		}
 
+		public void OnResetDialogState(IWebBrowser webBrowser, IBrowser browser)
+		{
+			ResetDialogState?.Invoke(webBrowser, browser);
+		}
+
+		public void OnSetFocus(IWebBrowser webBrowser, IBrowser browser, CefFocusSource source, GenericEventArgs args)
+		{
+			SetFocus?.Invoke(webBrowser, browser, source, args);
+		}
+
+		public void OnTakeFocus(IWebBrowser webBrowser, IBrowser browser, bool next)
+		{
+			TakeFocus?.Invoke(webBrowser, browser, next);
+		}
+
 		public void OnUncaughtException(IWebBrowser webBrowser, IBrowser browser, IFrame frame, JavascriptException exception)
 		{
 			UncaughtExceptionEvent?.Invoke(webBrowser, browser, frame, exception);

SafeExamBrowser.Browser/Wrapper/CefSharpPopupControl.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +8,7 @@
 
 using System.Collections.Generic;
 using CefSharp;
+using CefSharp.Enums;
 using CefSharp.WinForms.Host;
 using SafeExamBrowser.Browser.Wrapper.Events;
 
@@ -18,18 +19,27 @@ namespace SafeExamBrowser.Browser.Wrapper
 		public event AuthCredentialsEventHandler AuthCredentialsRequired;
 		public event BeforeBrowseEventHandler BeforeBrowse;
 		public event BeforeDownloadEventHandler BeforeDownload;
+		public event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
 		public event CanDownloadEventHandler CanDownload;
 		public event ContextCreatedEventHandler ContextCreated;
 		public event ContextReleasedEventHandler ContextReleased;
+		public event DialogClosedEventHandler DialogClosed;
 		public event DownloadUpdatedEventHandler DownloadUpdated;
+		public event DragEnterEventHandler DragEnterCefSharp;
+		public event DraggableRegionsChangedEventHandler DraggableRegionsChanged;
 		public event FaviconUrlChangedEventHandler FaviconUrlChanged;
 		public event FileDialogRequestedEventHandler FileDialogRequested;
 		public event FocusedNodeChangedEventHandler FocusedNodeChanged;
+		public event GotFocusEventHandler GotFocusCefSharp;
+		public event JavaScriptDialogEventHandler JavaScriptDialog;
 		public event KeyEventHandler KeyEvent;
 		public event LoadingProgressChangedEventHandler LoadingProgressChanged;
 		public event OpenUrlFromTabEventHandler OpenUrlFromTab;
 		public event PreKeyEventHandler PreKeyEvent;
+		public event ResetDialogStateEventHandler ResetDialogState;
 		public event ResourceRequestEventHandler ResourceRequestHandlerRequired;
+		public event SetFocusEventHandler SetFocus;
+		public event TakeFocusEventHandler TakeFocus;
 		public event UncaughtExceptionEventHandler UncaughtExceptionEvent;
 
 		void ICefSharpControl.Dispose(bool disposing)
@@ -60,9 +70,14 @@ namespace SafeExamBrowser.Browser.Wrapper
 			BeforeBrowse?.Invoke(webBrowser, browser, frame, request, userGesture, isRedirect, args);
 		}
 
-		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
+		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args)
 		{
-			BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback);
+			BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback, args);
+		}
+
+		public void OnBeforeUnloadDialog(IWebBrowser webBrowser, IBrowser browser, string message, bool isReload, IJsDialogCallback callback, GenericEventArgs args)
+		{
+			BeforeUnloadDialog?.Invoke(webBrowser, browser, message, isReload, callback, args);
 		}
 
 		public void OnCanDownload(IWebBrowser webBrowser, IBrowser browser, string url, string requestMethod, GenericEventArgs args)
@@ -80,19 +95,34 @@ namespace SafeExamBrowser.Browser.Wrapper
 			ContextReleased?.Invoke(webBrowser, browser, frame);
 		}
 
+		public void OnDialogClosed(IWebBrowser webBrowser, IBrowser browser)
+		{
+			DialogClosed?.Invoke(webBrowser, browser);
+		}
+
 		public void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)
 		{
 			DownloadUpdated?.Invoke(webBrowser, browser, downloadItem, callback);
 		}
 
+		public void OnDragEnter(IWebBrowser webBrowser, IBrowser browser, IDragData dragData, DragOperationsMask mask, GenericEventArgs args)
+		{
+			DragEnterCefSharp?.Invoke(webBrowser, browser, dragData, mask, args);
+		}
+
+		public void OnDraggableRegionsChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IList<DraggableRegion> regions)
+		{
+			DraggableRegionsChanged?.Invoke(webBrowser, browser, frame, regions);
+		}
+
 		public void OnFaviconUrlChange(IWebBrowser webBrowser, IBrowser browser, IList<string> urls)
 		{
 			FaviconUrlChanged?.Invoke(webBrowser, browser, urls);
 		}
 
-		public void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback)
+		public void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, IReadOnlyCollection<string> acceptFilters, IReadOnlyCollection<string> acceptExtensions, IReadOnlyCollection<string> acceptDescriptions, IFileDialogCallback callback)
 		{
-			FileDialogRequested?.Invoke(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, callback);
+			FileDialogRequested?.Invoke(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, acceptExtensions, acceptDescriptions, callback);
 		}
 
 		public void OnFocusedNodeChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IDomNode node)
@@ -100,6 +130,16 @@ namespace SafeExamBrowser.Browser.Wrapper
 			FocusedNodeChanged?.Invoke(webBrowser, browser, frame, node);
 		}
 
+		public void OnGotFocus(IWebBrowser webBrowser, IBrowser browser)
+		{
+			GotFocusCefSharp?.Invoke(webBrowser, browser);
+		}
+
+		public void OnJavaScriptDialog(IWebBrowser webBrowser, IBrowser browser, string originUrl, CefJsDialogType type, string message, string promptText, IJsDialogCallback callback, ref bool suppress, GenericEventArgs args)
+		{
+			JavaScriptDialog?.Invoke(webBrowser, browser, originUrl, type, message, promptText, callback, ref suppress, args);
+		}
+
 		public void OnKeyEvent(IWebBrowser webBrowser, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey)
 		{
 			KeyEvent?.Invoke(webBrowser, browser, type, windowsKeyCode, nativeKeyCode, modifiers, isSystemKey);
@@ -120,6 +160,21 @@ namespace SafeExamBrowser.Browser.Wrapper
 			PreKeyEvent?.Invoke(webBrowser, browser, type, windowsKeyCode, nativeKeyCode, modifiers, isSystemKey, ref isKeyboardShortcut, args);
 		}
 
+		public void OnResetDialogState(IWebBrowser webBrowser, IBrowser browser)
+		{
+			ResetDialogState?.Invoke(webBrowser, browser);
+		}
+
+		public void OnSetFocus(IWebBrowser webBrowser, IBrowser browser, CefFocusSource source, GenericEventArgs args)
+		{
+			SetFocus?.Invoke(webBrowser, browser, source, args);
+		}
+
+		public void OnTakeFocus(IWebBrowser webBrowser, IBrowser browser, bool next)
+		{
+			TakeFocus?.Invoke(webBrowser, browser, next);
+		}
+
 		public void OnUncaughtException(IWebBrowser webBrowser, IBrowser browser, IFrame frame, JavascriptException exception)
 		{
 			UncaughtExceptionEvent?.Invoke(webBrowser, browser, frame, exception);

SafeExamBrowser.Browser/Wrapper/Events/AuthCredentialsEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/BeforeBrowseEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/BeforeDownloadEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,5 +10,5 @@ using CefSharp;
 
 namespace SafeExamBrowser.Browser.Wrapper.Events
 {
-	internal delegate void BeforeDownloadEventHandler(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback);
+	internal delegate bool BeforeDownloadEventHandler(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args);
 }

SafeExamBrowser.Browser/Wrapper/Events/CanDownloadEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/ContextCreatedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/ContextReleasedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/DownloadUpdatedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/FaviconUrlChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/FileDialogRequestedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,5 +11,5 @@ using CefSharp;
 
 namespace SafeExamBrowser.Browser.Wrapper.Events
 {
-	internal delegate void FileDialogRequestedEventHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback);
+	internal delegate void FileDialogRequestedEventHandler(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, IReadOnlyCollection<string> acceptFilters, IReadOnlyCollection<string> acceptExtensions, IReadOnlyCollection<string> acceptDescriptions, IFileDialogCallback callback);
 }

SafeExamBrowser.Browser/Wrapper/Events/FocusedNodeChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/GenericEventArgs.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/KeyEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/LoadingProgressChangedEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/OpenUrlFromTabEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/PreKeyEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/ResourceRequestEventArgs.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/ResourceRequestEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Events/UncaughtExceptionEventHandler.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Extensions.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Handlers/DialogHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,19 +15,19 @@ namespace SafeExamBrowser.Browser.Wrapper.Handlers
 {
 	internal class DialogHandlerSwitch : IDialogHandler
 	{
-		public bool OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback)
+		public bool OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, IReadOnlyCollection<string> acceptFilters, IReadOnlyCollection<string> acceptExtensions, IReadOnlyCollection<string> acceptDescriptions, IFileDialogCallback callback)
 		{
 			if (browser.IsPopup)
 			{
 				var control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
 
-				control?.OnFileDialog(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, callback);
+				control?.OnFileDialog(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, acceptExtensions, acceptDescriptions, callback);
 			}
 			else
 			{
 				var control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
 
-				control?.OnFileDialog(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, callback);
+				control?.OnFileDialog(webBrowser, browser, mode, title, defaultFilePath, acceptFilters, acceptExtensions, acceptDescriptions, callback);
 			}
 
 			return true;

SafeExamBrowser.Browser/Wrapper/Handlers/DisplayHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Handlers/DownloadHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -35,20 +35,24 @@ namespace SafeExamBrowser.Browser.Wrapper.Handlers
 			return args.Value;
 		}
 
-		public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
+		public bool OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
 		{
+			var args = new GenericEventArgs();
+
 			if (browser.IsPopup)
 			{
 				var control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
 
-				control?.OnBeforeDownload(webBrowser, browser, downloadItem, callback);
+				control?.OnBeforeDownload(webBrowser, browser, downloadItem, callback, args);
 			}
 			else
 			{
 				var control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
 
-				control?.OnBeforeDownload(webBrowser, browser, downloadItem, callback);
+				control?.OnBeforeDownload(webBrowser, browser, downloadItem, callback, args);
 			}
+
+			return args.Value;
 		}
 
 		public void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)

SafeExamBrowser.Browser/Wrapper/Handlers/KeyboardHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Handlers/RenderProcessMessageHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/Handlers/RequestHandlerSwitch.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

SafeExamBrowser.Browser/Wrapper/ICefSharpControl.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 ETH Zürich, IT Services
+ * Copyright (c) 2025 ETH Zürich, IT Services
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Forms;
 using CefSharp;
+using CefSharp.Enums;
 using CefSharp.WinForms;
 using SafeExamBrowser.Browser.Wrapper.Events;
 using KeyEventHandler = SafeExamBrowser.Browser.Wrapper.Events.KeyEventHandler;
@@ -21,18 +22,27 @@ namespace SafeExamBrowser.Browser.Wrapper
 		event AuthCredentialsEventHandler AuthCredentialsRequired;
 		event BeforeBrowseEventHandler BeforeBrowse;
 		event BeforeDownloadEventHandler BeforeDownload;
+		event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
 		event CanDownloadEventHandler CanDownload;
 		event ContextCreatedEventHandler ContextCreated;
 		event ContextReleasedEventHandler ContextReleased;
+		event DialogClosedEventHandler DialogClosed;
 		event DownloadUpdatedEventHandler DownloadUpdated;
+		event DragEnterEventHandler DragEnterCefSharp;
+		event DraggableRegionsChangedEventHandler DraggableRegionsChanged;
 		event FaviconUrlChangedEventHandler FaviconUrlChanged;
 		event FileDialogRequestedEventHandler FileDialogRequested;
 		event FocusedNodeChangedEventHandler FocusedNodeChanged;
+		event GotFocusEventHandler GotFocusCefSharp;
+		event JavaScriptDialogEventHandler JavaScriptDialog;
 		event KeyEventHandler KeyEvent;
 		event LoadingProgressChangedEventHandler LoadingProgressChanged;
 		event OpenUrlFromTabEventHandler OpenUrlFromTab;
 		event PreKeyEventHandler PreKeyEvent;
+		event ResetDialogStateEventHandler ResetDialogState;
 		event ResourceRequestEventHandler ResourceRequestHandlerRequired;
+		event SetFocusEventHandler SetFocus;
+		event TakeFocusEventHandler TakeFocus;
 		event UncaughtExceptionEventHandler UncaughtExceptionEvent;
 
 		void Dispose(bool disposing);
@@ -40,18 +50,27 @@ namespace SafeExamBrowser.Browser.Wrapper
 		void GetResourceRequestHandler(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling, ResourceRequestEventArgs args);
 		void Load(string address);
 		void OnBeforeBrowse(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect, GenericEventArgs args);
-		void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback);
+		void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args);
+		void OnBeforeUnloadDialog(IWebBrowser webBrowser, IBrowser browser, string message, bool isReload, IJsDialogCallback callback, GenericEventArgs args);
 		void OnCanDownload(IWebBrowser webBrowser, IBrowser browser, string url, string requestMethod, GenericEventArgs args);
 		void OnContextCreated(IWebBrowser webBrowser, IBrowser browser, IFrame frame);
 		void OnContextReleased(IWebBrowser webBrowser, IBrowser browser, IFrame frame);
+		void OnDialogClosed(IWebBrowser webBrowser, IBrowser browser);
 		void OnDownloadUpdated(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback);
+		void OnDragEnter(IWebBrowser webBrowser, IBrowser browser, IDragData dragData, DragOperationsMask mask, GenericEventArgs args);
+		void OnDraggableRegionsChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IList<DraggableRegion> regions);
 		void OnFaviconUrlChange(IWebBrowser webBrowser, IBrowser browser, IList<string> urls);
-		void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback);
+		void OnFileDialog(IWebBrowser webBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, IReadOnlyCollection<string> acceptFilters, IReadOnlyCollection<string> acceptExtensions, IReadOnlyCollection<string> acceptDescriptions, IFileDialogCallback callback);
 		void OnFocusedNodeChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IDomNode node);
+		void OnGotFocus(IWebBrowser webBrowser, IBrowser browser);
+		void OnJavaScriptDialog(IWebBrowser webBrowser, IBrowser browser, string originUrl, CefJsDialogType type, string message, string promptText, IJsDialogCallback callback, ref bool suppress, GenericEventArgs args);
 		void OnKeyEvent(IWebBrowser webBrowser, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey);
 		void OnLoadingProgressChange(IWebBrowser webBrowser, IBrowser browser, double progress);
 		void OnOpenUrlFromTab(IWebBrowser webBrowser, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture, GenericEventArgs args);
 		void OnPreKeyEvent(IWebBrowser webBrowser, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut, GenericEventArgs args);
+		void OnResetDialogState(IWebBrowser webBrowser, IBrowser browser);
+		void OnSetFocus(IWebBrowser webBrowser, IBrowser browser, CefFocusSource source, GenericEventArgs args);
+		void OnTakeFocus(IWebBrowser webBrowser, IBrowser browser, bool next);
 		void OnUncaughtException(IWebBrowser webBrowser, IBrowser browser, IFrame frame, JavascriptException exception);
 	}
 }

SafeExamBrowser.Browser/packages.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CefSharp.Common" version="121.3.130" targetFramework="net48" />
-  <package id="CefSharp.WinForms" version="121.3.130" targetFramework="net48" />
-  <package id="chromiumembeddedframework.runtime.win-x64" version="121.3.13" targetFramework="net48" />
-  <package id="chromiumembeddedframework.runtime.win-x86" version="121.3.13" targetFramework="net48" />
+  <package id="CefSharp.Common" version="131.3.50" targetFramework="net48" />
+  <package id="CefSharp.WinForms" version="131.3.50" targetFramework="net48" />
+  <package id="chromiumembeddedframework.runtime.win-x64" version="131.3.5" targetFramework="net48" />
+  <package id="chromiumembeddedframework.runtime.win-x86" version="131.3.5" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Syroot.Windows.IO.KnownFolders" version="1.3.0" targetFramework="net48" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />