diff --git a/SafeExamBrowser.Browser/BrowserControl.cs b/SafeExamBrowser.Browser/BrowserControl.cs
index 3b569d43..2c9d0879 100644
--- a/SafeExamBrowser.Browser/BrowserControl.cs
+++ b/SafeExamBrowser.Browser/BrowserControl.cs
@@ -78,6 +78,7 @@ namespace SafeExamBrowser.Browser
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.CanDownload += (w, b, u, r, a) => a.Value = downloadHandler.CanDownload(w, b, u, r);
control.DownloadUpdated += (w, b, d, c) => downloadHandler.OnDownloadUpdated(w, b, d, c);
control.FaviconUrlChanged += (w, b, u) => displayHandler.OnFaviconUrlChange(w, b, u);
control.FileDialogRequested += (w, b, m, f, t, d, a, s, c) => dialogHandler.OnFileDialog(w, b, m, f, t, d, a, s, c);
diff --git a/SafeExamBrowser.Browser/BrowserWindow.cs b/SafeExamBrowser.Browser/BrowserWindow.cs
index 89a3823b..0cf5c869 100644
--- a/SafeExamBrowser.Browser/BrowserWindow.cs
+++ b/SafeExamBrowser.Browser/BrowserWindow.cs
@@ -156,6 +156,7 @@ namespace SafeExamBrowser.Browser
displayHandler.FaviconChanged += DisplayHandler_FaviconChanged;
displayHandler.ProgressChanged += DisplayHandler_ProgressChanged;
downloadHandler.ConfigurationDownloadRequested += DownloadHandler_ConfigurationDownloadRequested;
+ downloadHandler.DownloadAborted += DownloadHandler_DownloadAborted;
downloadHandler.DownloadUpdated += DownloadHandler_DownloadUpdated;
keyboardHandler.FindRequested += KeyboardHandler_FindRequested;
keyboardHandler.HomeNavigationRequested += HomeNavigationRequested;
@@ -352,6 +353,7 @@ namespace SafeExamBrowser.Browser
else
{
logger.Info($"Blocked file system dialog to {args.Operation}->{args.Element}, as {(isDownload ? "downloading" : "uploading")} is not allowed.");
+ ShowDownUploadNotAllowedMessage(isDownload);
}
}
@@ -401,6 +403,11 @@ namespace SafeExamBrowser.Browser
}
}
+ private void DownloadHandler_DownloadAborted()
+ {
+ ShowDownUploadNotAllowedMessage();
+ }
+
private void DownloadHandler_DownloadUpdated(DownloadItemState state)
{
window.UpdateDownloadState(state);
@@ -610,6 +617,14 @@ namespace SafeExamBrowser.Browser
}
}
+ private void ShowDownUploadNotAllowedMessage(bool isDownload = true)
+ {
+ var message = isDownload ? TextKey.MessageBox_DownloadNotAllowed : TextKey.MessageBox_UploadNotAllowed;
+ var title = isDownload ? TextKey.MessageBox_DownloadNotAllowedTitle : TextKey.MessageBox_UploadNotAllowedTitle;
+
+ messageBox.Show(message, title, icon: MessageBoxIcon.Warning, parent: window);
+ }
+
private void Window_AddressChanged(string address)
{
var isValid = Uri.TryCreate(address, UriKind.Absolute, out _) || Uri.TryCreate($"https://{address}", UriKind.Absolute, out _);
@@ -704,7 +719,7 @@ namespace SafeExamBrowser.Browser
private void TabPressed(bool shiftPressed)
{
- this.Control.ExecuteJavascript("document.activeElement.tagName", result =>
+ Control.ExecuteJavascript("document.activeElement.tagName", result =>
{
var tagName = result.Result as string;
if (tagName != null)
@@ -718,7 +733,7 @@ namespace SafeExamBrowser.Browser
}
else
{
- this.LoseFocusRequested?.Invoke(true);
+ LoseFocusRequested?.Invoke(true);
}
}
}
@@ -734,8 +749,7 @@ namespace SafeExamBrowser.Browser
else
{
window.FocusBrowser();
-
- this.Activate();
+ Activate();
}
}
diff --git a/SafeExamBrowser.Browser/Events/DownloadAbortedEventHandler.cs b/SafeExamBrowser.Browser/Events/DownloadAbortedEventHandler.cs
new file mode 100644
index 00000000..54466215
--- /dev/null
+++ b/SafeExamBrowser.Browser/Events/DownloadAbortedEventHandler.cs
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET)
+ *
+ * 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/.
+ */
+
+namespace SafeExamBrowser.Browser.Events
+{
+ internal delegate void DownloadAbortedEventHandler();
+}
diff --git a/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs b/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs
index 55ffff5c..bd9547bc 100644
--- a/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs
+++ b/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs
@@ -32,6 +32,7 @@ namespace SafeExamBrowser.Browser.Handlers
private readonly WindowSettings windowSettings;
internal event DownloadRequestedEventHandler ConfigurationDownloadRequested;
+ internal event DownloadAbortedEventHandler DownloadAborted;
internal event DownloadUpdatedEventHandler DownloadUpdated;
internal DownloadHandler(AppConfig appConfig, ILogger logger, BrowserSettings settings, WindowSettings windowSettings)
@@ -73,6 +74,7 @@ namespace SafeExamBrowser.Browser.Handlers
else
{
logger.Info($"Aborted download request{(windowSettings.UrlPolicy.CanLog() ? $" for '{uri}'" : "")}, as downloading is not allowed.");
+ Task.Run(() => DownloadAborted?.Invoke());
}
}
diff --git a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj
index f6ccf5ef..aa606248 100644
--- a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj
+++ b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj
@@ -82,6 +82,7 @@
+
diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs
index b2ce756d..d9487b8f 100644
--- a/SafeExamBrowser.I18n.Contracts/TextKey.cs
+++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs
@@ -94,6 +94,12 @@ namespace SafeExamBrowser.I18n.Contracts
MessageBox_ClientConfigurationQuestionTitle,
MessageBox_ConfigurationDownloadError,
MessageBox_ConfigurationDownloadErrorTitle,
+ MessageBox_DisplayConfigurationError,
+ MessageBox_DisplayConfigurationErrorTitle,
+ MessageBox_DisplayConfigurationInternal,
+ MessageBox_DisplayConfigurationInternalOrExternal,
+ MessageBox_DownloadNotAllowed,
+ MessageBox_DownloadNotAllowedTitle,
MessageBox_InvalidConfigurationData,
MessageBox_InvalidConfigurationDataTitle,
MessageBox_InvalidHomePassword,
@@ -105,10 +111,6 @@ namespace SafeExamBrowser.I18n.Contracts
MessageBox_InvalidUnlockPassword,
MessageBox_InvalidUnlockPasswordTitle,
MessageBox_NoButton,
- MessageBox_DisplayConfigurationError,
- MessageBox_DisplayConfigurationErrorTitle,
- MessageBox_DisplayConfigurationInternal,
- MessageBox_DisplayConfigurationInternalOrExternal,
MessageBox_NotSupportedConfigurationResource,
MessageBox_NotSupportedConfigurationResourceTitle,
MessageBox_OkButton,
@@ -140,6 +142,8 @@ namespace SafeExamBrowser.I18n.Contracts
MessageBox_StartupErrorTitle,
MessageBox_UnexpectedConfigurationError,
MessageBox_UnexpectedConfigurationErrorTitle,
+ MessageBox_UploadNotAllowed,
+ MessageBox_UploadNotAllowedTitle,
MessageBox_VirtualMachineNotAllowed,
MessageBox_VirtualMachineNotAllowedTitle,
MessageBox_YesButton,
diff --git a/SafeExamBrowser.I18n/Data/de.xml b/SafeExamBrowser.I18n/Data/de.xml
index f9f905d8..31b9d6e6 100644
--- a/SafeExamBrowser.I18n/Data/de.xml
+++ b/SafeExamBrowser.I18n/Data/de.xml
@@ -252,6 +252,12 @@
interne(r) oder externe(r)
+
+ Das Herunterladen von Dateien ist in den aktuellen SEB-Einstellungen nicht erlaubt. Bitte melden Sie dies Ihrem Prüfungsanbieter.
+
+
+ Herunterladen nicht erlaubt!
+
Die Konfigurations-Ressource "%%URI%%" enthält ungültige Daten!
@@ -378,6 +384,12 @@
Konfigurations-Fehler
+
+ Das Hochladen von Dateien ist in den aktuellen SEB-Einstellungen nicht erlaubt. Bitte melden Sie dies Ihrem Prüfungsanbieter.
+
+
+ Hochladen nicht erlaubt!
+
Dieser Computer scheint eine virtuelle Maschine zu sein. Die ausgewählte Konfiguration erlaubt es nicht, SEB in einer virtuellen Maschine auszuführen.
diff --git a/SafeExamBrowser.I18n/Data/en.xml b/SafeExamBrowser.I18n/Data/en.xml
index 00fb5b46..12fc3ff5 100644
--- a/SafeExamBrowser.I18n/Data/en.xml
+++ b/SafeExamBrowser.I18n/Data/en.xml
@@ -252,6 +252,12 @@
internal or external
+
+ Downloading files is not allowed in the current SEB settings. Please report this to your exam provider.
+
+
+ Downloading Not Allowed!
+
The configuration resource "%%URI%%" contains invalid data!
@@ -378,6 +384,12 @@
Configuration Error
+
+ Uploading files is not allowed in the current SEB settings. Please report this to your exam provider.
+
+
+ Uploading Not Allowed!
+
This computer appears to be a virtual machine. The selected configuration does not allow SEB to be run in a virtual machine.
diff --git a/SafeExamBrowser.I18n/Data/fr.xml b/SafeExamBrowser.I18n/Data/fr.xml
index f2f89c86..3d46b4d1 100644
--- a/SafeExamBrowser.I18n/Data/fr.xml
+++ b/SafeExamBrowser.I18n/Data/fr.xml
@@ -252,6 +252,12 @@
interne(s) ou externe(s)
+
+ Le téléchargement de fichiers n'est pas autorisé dans les paramètres SEB actuels. Veuillez le signaler à votre fournisseur d'examen.
+
+
+ Téléchargement non autorisé!
+
La ressource de configuration "%%URI%%" contient des données non valides!
@@ -378,6 +384,12 @@
Erreur de configuration
+
+ Le téléchargement de fichiers n'est pas autorisé dans les paramètres SEB actuels. Veuillez le signaler à votre fournisseur d'examen.
+
+
+ Téléchargement non autorisé!
+
Cet ordinateur semble être une machine virtuelle. La configuration sélectionnée ne permet pas à SEB de fonctionner dans une machine virtuelle.
diff --git a/SafeExamBrowser.I18n/Data/it.xml b/SafeExamBrowser.I18n/Data/it.xml
index b99ba6a1..02ef95b2 100644
--- a/SafeExamBrowser.I18n/Data/it.xml
+++ b/SafeExamBrowser.I18n/Data/it.xml
@@ -252,6 +252,12 @@
interno/i o esterno/i
+
+ Il download di file non è consentito nelle impostazioni SEB correnti. Si prega di segnalarlo al fornitore dell'esame.
+
+
+ Download non consentito!
+
La risorsa di configurazione "%%URI%%" contiene dati non validi!
@@ -378,6 +384,12 @@
Errore di configurazione
+
+ Il upload di file non è consentito nelle impostazioni SEB correnti. Si prega di segnalarlo al fornitore dell'esame.
+
+
+ Upload non consentito!
+
Questo computer sembra essere una macchina virtuale. La configurazione selezionata non consente l'esecuzione di SEB in una macchina virtuale.
diff --git a/SafeExamBrowser.I18n/Data/zh.xml b/SafeExamBrowser.I18n/Data/zh.xml
index 87076aa3..5c4521b2 100644
--- a/SafeExamBrowser.I18n/Data/zh.xml
+++ b/SafeExamBrowser.I18n/Data/zh.xml
@@ -222,6 +222,12 @@
内部或外部
+
+ 当前 SEB 设置中不允许下载文件。 请将此情况报告给您的考试提供商。
+
+
+ 不允许下载！
+
配置"%%URI%%" 中包含无效数据。
@@ -342,6 +348,12 @@
配置错误
+
+ 当前 SEB 设置中不允许上传文件。 请将此情况报告给您的考试提供商。
+
+
+ 不允许上传！
+
这台电脑是一个虚拟机。所选配置不允许防作弊考试专用浏览器在虚拟机中运行。