Update Safe Exam Browser Patch to 3.10.0.826
This commit is contained in:
@@ -10,7 +10,6 @@ using System.Collections.Generic;
|
||||
using CefSharp;
|
||||
using CefSharp.Enums;
|
||||
using CefSharp.WinForms;
|
||||
using SafeExamBrowser.Browser.Handlers;
|
||||
using SafeExamBrowser.Browser.Wrapper.Events;
|
||||
using SafeExamBrowser.Browser.Wrapper.Handlers;
|
||||
|
||||
@@ -20,10 +19,13 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
{
|
||||
public event AuthCredentialsEventHandler AuthCredentialsRequired;
|
||||
public event BeforeBrowseEventHandler BeforeBrowse;
|
||||
public event BeforeContextMenuEventHandler BeforeContextMenu;
|
||||
public event BeforeDownloadEventHandler BeforeDownload;
|
||||
public event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
|
||||
public event CanDownloadEventHandler CanDownload;
|
||||
public event ContextCreatedEventHandler ContextCreated;
|
||||
public event ContextMenuCommandEventHandler ContextMenuCommand;
|
||||
public event ContextMenuDismissedEventHandler ContextMenuDismissed;
|
||||
public event ContextReleasedEventHandler ContextReleased;
|
||||
public event DialogClosedEventHandler DialogClosed;
|
||||
public event DownloadUpdatedEventHandler DownloadUpdated;
|
||||
@@ -40,6 +42,7 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
public event PreKeyEventHandler PreKeyEvent;
|
||||
public event ResetDialogStateEventHandler ResetDialogState;
|
||||
public event ResourceRequestEventHandler ResourceRequestHandlerRequired;
|
||||
public event RunContextMenuEventHandler RunContextMenu;
|
||||
public event SetFocusEventHandler SetFocus;
|
||||
public event TakeFocusEventHandler TakeFocus;
|
||||
public event UncaughtExceptionEventHandler UncaughtExceptionEvent;
|
||||
@@ -54,7 +57,7 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
JsDialogHandler = new JavaScriptDialogHandlerSwitch();
|
||||
KeyboardHandler = new KeyboardHandlerSwitch();
|
||||
LifeSpanHandler = lifeSpanHandler;
|
||||
MenuHandler = new ContextMenuHandler();
|
||||
MenuHandler = new ContextMenuHandlerSwitch();
|
||||
RenderProcessMessageHandler = new RenderProcessMessageHandlerSwitch();
|
||||
RequestHandler = new RequestHandlerSwitch();
|
||||
}
|
||||
@@ -79,6 +82,11 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
BeforeBrowse?.Invoke(webBrowser, browser, frame, request, userGesture, isRedirect, args);
|
||||
}
|
||||
|
||||
public void OnBeforeContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model)
|
||||
{
|
||||
BeforeContextMenu?.Invoke(webBrowser, browser, frame, parameters, model);
|
||||
}
|
||||
|
||||
public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args)
|
||||
{
|
||||
BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback, args);
|
||||
@@ -99,6 +107,16 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
ContextCreated?.Invoke(webBrowser, browser, frame);
|
||||
}
|
||||
|
||||
public void OnContextMenuCommand(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags, GenericEventArgs args)
|
||||
{
|
||||
ContextMenuCommand?.Invoke(webBrowser, browser, frame, parameters, commandId, eventFlags, args);
|
||||
}
|
||||
|
||||
public void OnContextMenuDismissed(IWebBrowser webBrowser, IBrowser browser, IFrame frame)
|
||||
{
|
||||
ContextMenuDismissed?.Invoke(webBrowser, browser, frame);
|
||||
}
|
||||
|
||||
public void OnContextReleased(IWebBrowser webBrowser, IBrowser browser, IFrame frame)
|
||||
{
|
||||
ContextReleased?.Invoke(webBrowser, browser, frame);
|
||||
@@ -174,6 +192,11 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
ResetDialogState?.Invoke(webBrowser, browser);
|
||||
}
|
||||
|
||||
public void OnRunContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback, GenericEventArgs args)
|
||||
{
|
||||
RunContextMenu?.Invoke(webBrowser, browser, frame, parameters, model, callback, args);
|
||||
}
|
||||
|
||||
public void OnSetFocus(IWebBrowser webBrowser, IBrowser browser, CefFocusSource source, GenericEventArgs args)
|
||||
{
|
||||
SetFocus?.Invoke(webBrowser, browser, source, args);
|
||||
|
@@ -18,10 +18,13 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
{
|
||||
public event AuthCredentialsEventHandler AuthCredentialsRequired;
|
||||
public event BeforeBrowseEventHandler BeforeBrowse;
|
||||
public event BeforeContextMenuEventHandler BeforeContextMenu;
|
||||
public event BeforeDownloadEventHandler BeforeDownload;
|
||||
public event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
|
||||
public event CanDownloadEventHandler CanDownload;
|
||||
public event ContextCreatedEventHandler ContextCreated;
|
||||
public event ContextMenuCommandEventHandler ContextMenuCommand;
|
||||
public event ContextMenuDismissedEventHandler ContextMenuDismissed;
|
||||
public event ContextReleasedEventHandler ContextReleased;
|
||||
public event DialogClosedEventHandler DialogClosed;
|
||||
public event DownloadUpdatedEventHandler DownloadUpdated;
|
||||
@@ -38,6 +41,7 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
public event PreKeyEventHandler PreKeyEvent;
|
||||
public event ResetDialogStateEventHandler ResetDialogState;
|
||||
public event ResourceRequestEventHandler ResourceRequestHandlerRequired;
|
||||
public event RunContextMenuEventHandler RunContextMenu;
|
||||
public event SetFocusEventHandler SetFocus;
|
||||
public event TakeFocusEventHandler TakeFocus;
|
||||
public event UncaughtExceptionEventHandler UncaughtExceptionEvent;
|
||||
@@ -70,6 +74,11 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
BeforeBrowse?.Invoke(webBrowser, browser, frame, request, userGesture, isRedirect, args);
|
||||
}
|
||||
|
||||
public void OnBeforeContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model)
|
||||
{
|
||||
BeforeContextMenu?.Invoke(webBrowser, browser, frame, parameters, model);
|
||||
}
|
||||
|
||||
public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback, GenericEventArgs args)
|
||||
{
|
||||
BeforeDownload?.Invoke(webBrowser, browser, downloadItem, callback, args);
|
||||
@@ -90,6 +99,16 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
ContextCreated?.Invoke(webBrowser, browser, frame);
|
||||
}
|
||||
|
||||
public void OnContextMenuCommand(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags, GenericEventArgs args)
|
||||
{
|
||||
ContextMenuCommand?.Invoke(webBrowser, browser, frame, parameters, commandId, eventFlags, args);
|
||||
}
|
||||
|
||||
public void OnContextMenuDismissed(IWebBrowser webBrowser, IBrowser browser, IFrame frame)
|
||||
{
|
||||
ContextMenuDismissed?.Invoke(webBrowser, browser, frame);
|
||||
}
|
||||
|
||||
public void OnContextReleased(IWebBrowser webBrowser, IBrowser browser, IFrame frame)
|
||||
{
|
||||
ContextReleased?.Invoke(webBrowser, browser, frame);
|
||||
@@ -165,6 +184,11 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
ResetDialogState?.Invoke(webBrowser, browser);
|
||||
}
|
||||
|
||||
public void OnRunContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback, GenericEventArgs args)
|
||||
{
|
||||
RunContextMenu?.Invoke(webBrowser, browser, frame, parameters, model, callback, args);
|
||||
}
|
||||
|
||||
public void OnSetFocus(IWebBrowser webBrowser, IBrowser browser, CefFocusSource source, GenericEventArgs args)
|
||||
{
|
||||
SetFocus?.Invoke(webBrowser, browser, source, args);
|
||||
|
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* 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
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
using CefSharp;
|
||||
|
||||
namespace SafeExamBrowser.Browser.Wrapper.Events
|
||||
{
|
||||
internal delegate void BeforeContextMenuEventHandler(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model);
|
||||
}
|
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* 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
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
using CefSharp;
|
||||
|
||||
namespace SafeExamBrowser.Browser.Wrapper.Events
|
||||
{
|
||||
internal delegate void ContextMenuCommandEventHandler(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags, GenericEventArgs args);
|
||||
}
|
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* 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
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
using CefSharp;
|
||||
|
||||
namespace SafeExamBrowser.Browser.Wrapper.Events
|
||||
{
|
||||
internal delegate void ContextMenuDismissedEventHandler(IWebBrowser webBrowser, IBrowser browser, IFrame frame);
|
||||
}
|
@@ -0,0 +1,14 @@
|
||||
/*
|
||||
* 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
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
using CefSharp;
|
||||
|
||||
namespace SafeExamBrowser.Browser.Wrapper.Events
|
||||
{
|
||||
internal delegate void RunContextMenuEventHandler(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback, GenericEventArgs args);
|
||||
}
|
@@ -0,0 +1,88 @@
|
||||
/*
|
||||
* 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
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
using CefSharp;
|
||||
using CefSharp.WinForms;
|
||||
using CefSharp.WinForms.Host;
|
||||
using SafeExamBrowser.Browser.Wrapper.Events;
|
||||
|
||||
namespace SafeExamBrowser.Browser.Wrapper.Handlers
|
||||
{
|
||||
internal class ContextMenuHandlerSwitch : IContextMenuHandler
|
||||
{
|
||||
public void OnBeforeContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model)
|
||||
{
|
||||
var control = default(ICefSharpControl);
|
||||
|
||||
if (browser.IsPopup)
|
||||
{
|
||||
control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
|
||||
}
|
||||
else
|
||||
{
|
||||
control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
|
||||
}
|
||||
|
||||
control?.OnBeforeContextMenu(webBrowser, browser, frame, parameters, model);
|
||||
}
|
||||
|
||||
public bool OnContextMenuCommand(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags)
|
||||
{
|
||||
var args = new GenericEventArgs();
|
||||
var control = default(ICefSharpControl);
|
||||
|
||||
if (browser.IsPopup)
|
||||
{
|
||||
control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
|
||||
}
|
||||
else
|
||||
{
|
||||
control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
|
||||
}
|
||||
|
||||
control?.OnContextMenuCommand(webBrowser, browser, frame, parameters, commandId, eventFlags, args);
|
||||
|
||||
return args.Value;
|
||||
}
|
||||
|
||||
public void OnContextMenuDismissed(IWebBrowser webBrowser, IBrowser browser, IFrame frame)
|
||||
{
|
||||
var control = default(ICefSharpControl);
|
||||
|
||||
if (browser.IsPopup)
|
||||
{
|
||||
control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
|
||||
}
|
||||
else
|
||||
{
|
||||
control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
|
||||
}
|
||||
|
||||
control?.OnContextMenuDismissed(webBrowser, browser, frame);
|
||||
}
|
||||
|
||||
public bool RunContextMenu(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback)
|
||||
{
|
||||
var args = new GenericEventArgs();
|
||||
var control = default(ICefSharpControl);
|
||||
|
||||
if (browser.IsPopup)
|
||||
{
|
||||
control = ChromiumHostControl.FromBrowser(browser) as CefSharpPopupControl;
|
||||
}
|
||||
else
|
||||
{
|
||||
control = ChromiumWebBrowser.FromBrowser(browser) as CefSharpBrowserControl;
|
||||
}
|
||||
|
||||
control?.OnRunContextMenu(webBrowser, browser, frame, parameters, model, callback, args);
|
||||
|
||||
return args.Value;
|
||||
}
|
||||
}
|
||||
}
|
@@ -21,10 +21,13 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
{
|
||||
event AuthCredentialsEventHandler AuthCredentialsRequired;
|
||||
event BeforeBrowseEventHandler BeforeBrowse;
|
||||
event BeforeContextMenuEventHandler BeforeContextMenu;
|
||||
event BeforeDownloadEventHandler BeforeDownload;
|
||||
event BeforeUnloadDialogEventHandler BeforeUnloadDialog;
|
||||
event CanDownloadEventHandler CanDownload;
|
||||
event ContextCreatedEventHandler ContextCreated;
|
||||
event ContextMenuCommandEventHandler ContextMenuCommand;
|
||||
event ContextMenuDismissedEventHandler ContextMenuDismissed;
|
||||
event ContextReleasedEventHandler ContextReleased;
|
||||
event DialogClosedEventHandler DialogClosed;
|
||||
event DownloadUpdatedEventHandler DownloadUpdated;
|
||||
@@ -41,6 +44,7 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
event PreKeyEventHandler PreKeyEvent;
|
||||
event ResetDialogStateEventHandler ResetDialogState;
|
||||
event ResourceRequestEventHandler ResourceRequestHandlerRequired;
|
||||
event RunContextMenuEventHandler RunContextMenu;
|
||||
event SetFocusEventHandler SetFocus;
|
||||
event TakeFocusEventHandler TakeFocus;
|
||||
event UncaughtExceptionEventHandler UncaughtExceptionEvent;
|
||||
@@ -50,10 +54,13 @@ 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 OnBeforeContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model);
|
||||
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 OnContextMenuCommand(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags, GenericEventArgs args);
|
||||
void OnContextMenuDismissed(IWebBrowser chromiumWebBrowser, 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);
|
||||
@@ -69,6 +76,7 @@ namespace SafeExamBrowser.Browser.Wrapper
|
||||
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 OnRunContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback, GenericEventArgs args);
|
||||
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);
|
||||
|
Reference in New Issue
Block a user