zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-308: Implemented mechanism to block uploads.

Browse source
This commit is contained in:
dbuechel 2020-01-24 10:19:11 +01:00
parent c1aa080f87
commit b003bf93b7
4 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -217,17 +217,28 @@ namespace SafeExamBrowser.Browser
private void DialogHandler_DialogRequested(DialogRequestedEventArgs args) private void DialogHandler_DialogRequested(DialogRequestedEventArgs args)
{ {
var result = fileSystemDialog.Show(args.Element, args.Operation, args.InitialPath, title: args.Title, owner: window); var isDownload = args.Operation == FileSystemOperation.Save;
var isUpload = args.Operation == FileSystemOperation.Open;
var isAllowed = (isDownload && settings.AllowDownloads) || (isUpload && settings.AllowUploads);
if (result.Success) if (isAllowed)
{ {
args.FullPath = result.FullPath; var result = fileSystemDialog.Show(args.Element, args.Operation, args.InitialPath, title: args.Title, owner: window);
args.Success = result.Success;
logger.Debug($"User selected path '{result.FullPath}' when asked to {args.Operation}->{args.Element}."); if (result.Success)
{
args.FullPath = result.FullPath;
args.Success = result.Success;
logger.Debug($"User selected path '{result.FullPath}' when asked to {args.Operation}->{args.Element}.");
}
else
{
logger.Debug($"User aborted file system dialog to {args.Operation}->{args.Element}.");
}
} }
else else
{ {
logger.Debug($"User aborted file system dialog to {args.Operation}->{args.Element}."); logger.Info($"Blocked file system dialog to {args.Operation}->{args.Element}, as {(isDownload ? "downloading" : "uploading")} is not allowed.");
} }
} }

7
SafeExamBrowser.Configuration/ConfigurationData/DataMapping/BrowserDataMapper.cs
View file

@ -30,8 +30,8 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Browser.AllowDeveloperConsole: case Keys.Browser.AllowDeveloperConsole:
MapAllowDeveloperConsole(settings, value); MapAllowDeveloperConsole(settings, value);
break; break;
case Keys.Browser.AllowDownloads: case Keys.Browser.AllowDownloadsAndUploads:
MapAllowDownloads(settings, value); MapAllowDownloadsAndUploads(settings, value);
break; break;
case Keys.Browser.AllowPageZoom: case Keys.Browser.AllowPageZoom:
MapAllowPageZoom(settings, value); MapAllowPageZoom(settings, value);
@ -162,11 +162,12 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
} }
} }
private void MapAllowDownloads(AppSettings settings, object value) private void MapAllowDownloadsAndUploads(AppSettings settings, object value)
{ {
if (value is bool allow) if (value is bool allow)
{ {
settings.Browser.AllowDownloads = allow; settings.Browser.AllowDownloads = allow;
settings.Browser.AllowUploads = allow;
} }
} }

2
SafeExamBrowser.Configuration/ConfigurationData/Keys.cs
View file

@ -44,7 +44,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal const string AllowConfigurationDownloads = "downloadAndOpenSebConfig"; internal const string AllowConfigurationDownloads = "downloadAndOpenSebConfig";
internal const string AllowCustomDownloadLocation = "allowCustomDownloadLocation"; internal const string AllowCustomDownloadLocation = "allowCustomDownloadLocation";
internal const string AllowDeveloperConsole = "allowDeveloperConsole"; internal const string AllowDeveloperConsole = "allowDeveloperConsole";
internal const string AllowDownloads = "allowDownUploads"; internal const string AllowDownloadsAndUploads = "allowDownUploads";
internal const string AllowPageZoom = "enableZoomPage"; internal const string AllowPageZoom = "enableZoomPage";
internal const string CustomUserAgentDesktop = "browserUserAgentWinDesktopModeCustom"; internal const string CustomUserAgentDesktop = "browserUserAgentWinDesktopModeCustom";
internal const string CustomUserAgentMobile = "browserUserAgentWinTouchModeCustom"; internal const string CustomUserAgentMobile = "browserUserAgentWinTouchModeCustom";

5
SafeExamBrowser.Settings/Browser/BrowserSettings.cs
View file

@ -41,6 +41,11 @@ namespace SafeExamBrowser.Settings.Browser
/// </summary> /// </summary>
public bool AllowPageZoom { get; set; } public bool AllowPageZoom { get; set; }
/// <summary>
/// Determines whether the user will be allowed to upload files.
/// </summary>
public bool AllowUploads { get; set; }
/// <summary> /// <summary>
/// Determines whether the user needs to confirm the termination of SEB by <see cref="QuitUrl"/>. /// Determines whether the user needs to confirm the termination of SEB by <see cref="QuitUrl"/>.
/// </summary> /// </summary>