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

SEBWIN-407: Implemented access restriction for file system dialog.

Browse source
This commit is contained in:
Damian Büchel 2020-08-05 22:55:38 +02:00
parent 8d94750078
commit 2ade9e15b4
17 changed files with 994 additions and 873 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SafeExamBrowser.Browser.UnitTests/Handlers/DownloadHandlerTests.cs
View file

@ -172,15 +172,15 @@ namespace SafeExamBrowser.Browser.UnitTests.Handlers
});
settings.AllowDownloads = true;
settings.AllowConfigurationDownloads = false;
settings.AllowCustomDownloadLocation = true;
settings.DownloadDirectory = @"%APPDATA%\Downloads";
settings.AllowCustomDownAndUploadLocation = true;
settings.DownAndUploadDirectory = @"%APPDATA%\Downloads";
sut.ConfigurationDownloadRequested += (f, a) => failed = true;
sut.DownloadUpdated += (state) => failed = true;
sut.OnBeforeDownload(default(IWebBrowser), default(IBrowser), item, callback.Object);
sync.WaitOne();
var downloadPath = Path.Combine(Environment.ExpandEnvironmentVariables(settings.DownloadDirectory), item.SuggestedFileName);
var downloadPath = Path.Combine(Environment.ExpandEnvironmentVariables(settings.DownAndUploadDirectory), item.SuggestedFileName);
callback.Verify(c => c.Continue(It.Is<string>(p => p.Equals(downloadPath)), true), Times.Once);

19
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -28,6 +28,7 @@ using SafeExamBrowser.UserInterface.Contracts.Browser;
using SafeExamBrowser.UserInterface.Contracts.Browser.Data;
using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
using SafeExamBrowser.UserInterface.Contracts.MessageBox;
using Syroot.Windows.IO;
using BrowserSettings = SafeExamBrowser.Settings.Browser.BrowserSettings;
using Request = SafeExamBrowser.Browser.Contracts.Filters.Request;
using ResourceHandler = SafeExamBrowser.Browser.Handlers.ResourceHandler;
@ -262,10 +263,26 @@ namespace SafeExamBrowser.Browser
var isDownload = args.Operation == FileSystemOperation.Save;
var isUpload = args.Operation == FileSystemOperation.Open;
var isAllowed = (isDownload && settings.AllowDownloads) || (isUpload && settings.AllowUploads);
var initialPath = default(string);
if (isDownload)
{
initialPath = args.InitialPath;
}
else
{
initialPath = string.IsNullOrEmpty(settings.DownAndUploadDirectory) ? KnownFolders.Downloads.ExpandedPath : Environment.ExpandEnvironmentVariables(settings.DownAndUploadDirectory);
}
if (isAllowed)
{
var result = fileSystemDialog.Show(args.Element, args.Operation, args.InitialPath, title: args.Title, parent: window);
var result = fileSystemDialog.Show(
args.Element,
args.Operation,
initialPath,
title: args.Title,
parent: window,
restrictNavigation: !settings.AllowCustomDownAndUploadLocation);
if (result.Success)
{

6
SafeExamBrowser.Browser/Handlers/DownloadHandler.cs
View file

@ -105,13 +105,13 @@ namespace SafeExamBrowser.Browser.Handlers
private void HandleFileDownload(DownloadItem downloadItem, IBeforeDownloadCallback callback)
{
var filePath = default(string);
var showDialog = settings.AllowCustomDownloadLocation;
var showDialog = settings.AllowCustomDownAndUploadLocation;
logger.Debug($"Handling download of file '{downloadItem.SuggestedFileName}'.");
if (!string.IsNullOrEmpty(settings.DownloadDirectory))
if (!string.IsNullOrEmpty(settings.DownAndUploadDirectory))
{
filePath = Path.Combine(Environment.ExpandEnvironmentVariables(settings.DownloadDirectory), downloadItem.SuggestedFileName);
filePath = Path.Combine(Environment.ExpandEnvironmentVariables(settings.DownAndUploadDirectory), downloadItem.SuggestedFileName);
}
else
{

6
SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
View file

@ -508,7 +508,8 @@ namespace SafeExamBrowser.Client.UnitTests
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<IWindow>())).Returns(result);
It.IsAny<IWindow>(),
It.IsAny<bool>())).Returns(result);
text.SetReturnsDefault(string.Empty);
sut.TryStart();
@ -530,7 +531,8 @@ namespace SafeExamBrowser.Client.UnitTests
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<string>(),
It.IsAny<IWindow>())).Returns(result);
It.IsAny<IWindow>(),
It.IsAny<bool>())).Returns(result);
text.SetReturnsDefault(string.Empty);
sut.TryStart();

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

@ -24,7 +24,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Browser.AllowConfigurationDownloads:
MapAllowConfigurationDownloads(settings, value);
break;
case Keys.Browser.AllowCustomDownloadLocation:
case Keys.Browser.AllowCustomDownUploadLocation:
MapAllowCustomDownloadLocation(settings, value);
break;
case Keys.Browser.AllowDeveloperConsole:
@ -173,7 +173,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{
if (value is bool allow)
{
settings.Browser.AllowCustomDownloadLocation = allow;
settings.Browser.AllowCustomDownAndUploadLocation = allow;
}
}
@ -281,7 +281,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
{
if (value is string directory)
{
settings.Browser.DownloadDirectory = directory;
settings.Browser.DownAndUploadDirectory = directory;
}
}

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

@ -115,7 +115,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
settings.Browser.AdditionalWindow.ShowReloadWarning = false;
settings.Browser.AdditionalWindow.ShowToolbar = false;
settings.Browser.AllowConfigurationDownloads = true;
settings.Browser.AllowCustomDownloadLocation = false;
settings.Browser.AllowCustomDownAndUploadLocation = false;
settings.Browser.AllowDownloads = true;
settings.Browser.AllowPageZoom = true;
settings.Browser.AllowPdfReader = true;

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

@ -42,7 +42,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal static class Browser
{
internal const string AllowConfigurationDownloads = "downloadAndOpenSebConfig";
internal const string AllowCustomDownloadLocation = "allowCustomDownloadLocation";
internal const string AllowCustomDownUploadLocation = "allowCustomDownUploadLocation";
internal const string AllowDeveloperConsole = "allowDeveloperConsole";
internal const string AllowDownloadsAndUploads = "allowDownUploads";
internal const string AllowPageZoom = "enableZoomPage";

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

@ -27,9 +27,9 @@ namespace SafeExamBrowser.Settings.Browser
public bool AllowConfigurationDownloads { get; set; }
/// <summary>
/// Determines whether the user will be allowed to select a custom location when downloading a file (excluding configuration files).
/// Determines whether the user will be allowed to select a custom location when down- or uploading a file (excluding configuration files).
/// </summary>
public bool AllowCustomDownloadLocation { get; set; }
public bool AllowCustomDownAndUploadLocation { get; set; }
/// <summary>
/// Determines whether the user will be allowed to download files (excluding configuration files).
@ -94,9 +94,9 @@ namespace SafeExamBrowser.Settings.Browser
public bool DeleteCookiesOnStartup { get; set; }
/// <summary>
/// Defines a custom directory for file downloads. If not defined, all downloads will be saved in the current user's download directory.
/// Defines a custom directory for file down- and uploads. If not defined, all operations will be directed to the current user's download directory.
/// </summary>
public string DownloadDirectory { get; set; }
public string DownAndUploadDirectory { get; set; }
/// <summary>
/// Determines whether the user is allowed to use the integrated browser application.

9
SafeExamBrowser.UserInterface.Contracts/FileSystemDialog/IFileSystemDialog.cs
View file

@ -15,6 +15,13 @@ namespace SafeExamBrowser.UserInterface.Contracts.FileSystemDialog
/// <summary>
/// Creates a dialog according to the given parameters and shows it to the user.
/// </summary>
FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = default(string), string title = default(string), IWindow parent = default(IWindow));
FileSystemDialogResult Show(
FileSystemElement element,
FileSystemOperation operation,
string initialPath = default(string),
string message = default(string),
string title = default(string),
IWindow parent = default(IWindow),
bool restrictNavigation = false);
}
}

13
SafeExamBrowser.UserInterface.Desktop/FileSystemDialogFactory.cs
View file

@ -23,15 +23,22 @@ namespace SafeExamBrowser.UserInterface.Desktop
this.text = text;
}
public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow parent = null)
public FileSystemDialogResult Show(
FileSystemElement element,
FileSystemOperation operation,
string initialPath = default(string),
string message = null,
string title = null,
IWindow parent = null,
bool restrictNavigation = false)
{
if (parent is Window window)
{
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent).Show());
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent, restrictNavigation).Show());
}
else
{
return new FileSystemDialog(element, operation, text, initialPath, message, title).Show();
return new FileSystemDialog(element, operation, text, initialPath, message, title, restrictNavigation: restrictNavigation).Show();
}
}
}

33
SafeExamBrowser.UserInterface.Desktop/Windows/FileSystemDialog.xaml.cs
View file

@ -29,6 +29,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
private string message;
private FileSystemOperation operation;
private IWindow parent;
private bool restrictNavigation;
private IText text;
private string title;
@ -39,13 +40,15 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
string initialPath = default(string),
string message = default(string),
string title = default(string),
IWindow parent = default(IWindow))
IWindow parent = default(IWindow),
bool restrictNavigation = false)
{
this.element = element;
this.initialPath = initialPath;
this.message = message;
this.operation = operation;
this.parent = parent;
this.restrictNavigation = restrictNavigation;
this.text = text;
this.title = title;
@ -286,6 +289,34 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
}
private void InitializeFileSystem()
{
if (restrictNavigation && !string.IsNullOrEmpty(initialPath))
{
InitializeRestricted();
}
else
{
InitializeUnrestricted();
}
}
private void InitializeRestricted()
{
var root = Directory.Exists(initialPath) ? initialPath : Path.GetDirectoryName(initialPath);
if (Directory.Exists(root))
{
var directory = CreateItem(new DirectoryInfo(root));
FileSystem.Items.Add(directory);
directory.IsExpanded = true;
directory.IsSelected = true;
directory.BringIntoView();
}
}
private void InitializeUnrestricted()
{
foreach (var drive in DriveInfo.GetDrives())
{

13
SafeExamBrowser.UserInterface.Mobile/FileSystemDialogFactory.cs
View file

@ -23,15 +23,22 @@ namespace SafeExamBrowser.UserInterface.Mobile
this.text = text;
}
public FileSystemDialogResult Show(FileSystemElement element, FileSystemOperation operation, string initialPath = default(string), string message = null, string title = null, IWindow parent = null)
public FileSystemDialogResult Show(
FileSystemElement element,
FileSystemOperation operation,
string initialPath = default(string),
string message = null,
string title = null,
IWindow parent = null,
bool restrictNavigation = false)
{
if (parent is Window window)
{
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent).Show());
return window.Dispatcher.Invoke(() => new FileSystemDialog(element, operation, text, initialPath, message, title, parent, restrictNavigation).Show());
}
else
{
return new FileSystemDialog(element, operation, text, initialPath, message, title).Show();
return new FileSystemDialog(element, operation, text, initialPath, message, title, restrictNavigation: restrictNavigation).Show();
}
}
}

33
SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml.cs
View file

@ -31,6 +31,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
private IText text;
private string title;
private IWindow parent;
private bool restrictNavigation;
internal FileSystemDialog(
FileSystemElement element,
@ -39,13 +40,15 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
string initialPath = default(string),
string message = default(string),
string title = default(string),
IWindow parent = default(IWindow))
IWindow parent = default(IWindow),
bool restrictNavigation = false)
{
this.element = element;
this.initialPath = initialPath;
this.message = message;
this.operation = operation;
this.parent = parent;
this.restrictNavigation = restrictNavigation;
this.text = text;
this.title = title;
@ -286,6 +289,34 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
}
private void InitializeFileSystem()
{
if (restrictNavigation && !string.IsNullOrEmpty(initialPath))
{
InitializeRestricted();
}
else
{
InitializeUnrestricted();
}
}
private void InitializeRestricted()
{
var root = Directory.Exists(initialPath) ? initialPath : Path.GetDirectoryName(initialPath);
if (Directory.Exists(root))
{
var directory = CreateItem(new DirectoryInfo(root));
FileSystem.Items.Add(directory);
directory.IsExpanded = true;
directory.IsSelected = true;
directory.BringIntoView();
}
}
private void InitializeUnrestricted()
{
foreach (var drive in DriveInfo.GetDrives())
{

2
SebWindowsConfig/SEBSettings.cs
View file

@ -173,6 +173,7 @@ namespace SebWindowsConfig
// Group "DownUploads"
public const String KeyAllowDownUploads = "allowDownUploads";
public const String KeyAllowCustomDownUploadLocation = "allowCustomDownUploadLocation";
public const String KeyDownloadDirectoryOSX = "downloadDirectoryOSX";
public const String KeyDownloadDirectoryWin = "downloadDirectoryWin";
public const String KeyOpenDownloads = "openDownloads";
@ -686,6 +687,7 @@ namespace SebWindowsConfig
// Default settings for group "DownUploads"
SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowDownUploads , true);
SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowCustomDownUploadLocation, false);
SEBSettings.settingsDefault.Add(SEBSettings.KeyDownloadDirectoryOSX , "~/Downloads");
SEBSettings.settingsDefault.Add(SEBSettings.KeyDownloadDirectoryWin , "");
SEBSettings.settingsDefault.Add(SEBSettings.KeyOpenDownloads , false);

226
SebWindowsConfig/SebWindowsConfigForm.Designer.cs generated
View file

@ -30,8 +30,8 @@ namespace SebWindowsConfig
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SebWindowsConfigForm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.openFileDialogSebConfigFile = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialogSebConfigFile = new System.Windows.Forms.SaveFileDialog();
this.imageListTabIcons = new System.Windows.Forms.ImageList(this.components);
@ -74,12 +74,17 @@ namespace SebWindowsConfig
this.checkBoxInsideSebEnableEaseOfAccess = new System.Windows.Forms.CheckBox();
this.checkBoxInsideSebEnableVmWareClientShade = new System.Windows.Forms.CheckBox();
this.tabPageSecurity = new System.Windows.Forms.TabPage();
this.checkBoxAllowWindowsUpdate = new System.Windows.Forms.CheckBox();
this.groupBoxSebService = new System.Windows.Forms.GroupBox();
this.checkBoxSebServiceIgnore = new System.Windows.Forms.CheckBox();
this.checkBoxAllowChromeNotifications = new System.Windows.Forms.CheckBox();
this.checkBoxAllowWindowsUpdate = new System.Windows.Forms.CheckBox();
this.labelSebServiceIgnore = new System.Windows.Forms.Label();
this.listBoxSebServicePolicy = new System.Windows.Forms.ListBox();
this.labelSebServicePolicy = new System.Windows.Forms.Label();
this.checkBoxAllowScreenSharing = new System.Windows.Forms.CheckBox();
this.checkBoxShowLogButton = new System.Windows.Forms.CheckBox();
this.checkBoxAllowLogAccess = new System.Windows.Forms.CheckBox();
this.checkBoxEnablePrivateClipboard = new System.Windows.Forms.CheckBox();
this.checkBoxAllowScreenSharing = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label14 = new System.Windows.Forms.Label();
this.comboBoxMinMacOSVersion = new System.Windows.Forms.ComboBox();
@ -105,8 +110,6 @@ namespace SebWindowsConfig
this.radioNoKiosMode = new System.Windows.Forms.RadioButton();
this.radioCreateNewDesktop = new System.Windows.Forms.RadioButton();
this.radioKillExplorerShell = new System.Windows.Forms.RadioButton();
this.labelSebServicePolicy = new System.Windows.Forms.Label();
this.listBoxSebServicePolicy = new System.Windows.Forms.ListBox();
this.checkBoxAllowVirtualMachine = new System.Windows.Forms.CheckBox();
this.tabPageNetwork = new System.Windows.Forms.TabPage();
this.tabControlNetwork = new System.Windows.Forms.TabControl();
@ -436,15 +439,14 @@ namespace SebWindowsConfig
this.editDuplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.configureClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.applyAndStartSEBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.checkBoxSebServiceIgnore = new System.Windows.Forms.CheckBox();
this.labelSebServiceIgnore = new System.Windows.Forms.Label();
this.groupBoxSebService = new System.Windows.Forms.GroupBox();
this.checkBoxAllowCustomDownloadLocation = new System.Windows.Forms.CheckBox();
this.tabPageHookedKeys.SuspendLayout();
this.groupBoxFunctionKeys.SuspendLayout();
this.groupBoxSpecialKeys.SuspendLayout();
this.tabPageRegistry.SuspendLayout();
this.groupBoxInsideSeb.SuspendLayout();
this.tabPageSecurity.SuspendLayout();
this.groupBoxSebService.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox3.SuspendLayout();
@ -492,7 +494,6 @@ namespace SebWindowsConfig
this.groupBoxExitSequence.SuspendLayout();
this.tabControlSebWindowsConfig.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.groupBoxSebService.SuspendLayout();
this.SuspendLayout();
//
// openFileDialogSebConfigFile
@ -1078,16 +1079,32 @@ namespace SebWindowsConfig
this.tabPageSecurity.Text = "Security";
this.tabPageSecurity.UseVisualStyleBackColor = true;
//
// checkBoxAllowWindowsUpdate
// groupBoxSebService
//
this.checkBoxAllowWindowsUpdate.AutoSize = true;
this.checkBoxAllowWindowsUpdate.Location = new System.Drawing.Point(14, 165);
this.checkBoxAllowWindowsUpdate.Name = "checkBoxAllowWindowsUpdate";
this.checkBoxAllowWindowsUpdate.Size = new System.Drawing.Size(265, 17);
this.checkBoxAllowWindowsUpdate.TabIndex = 103;
this.checkBoxAllowWindowsUpdate.Text = "Allow Windows Update to run while SEB is running";
this.checkBoxAllowWindowsUpdate.UseVisualStyleBackColor = true;
this.checkBoxAllowWindowsUpdate.CheckedChanged += new System.EventHandler(this.checkBoxAllowWindowsUpdate_CheckedChanged);
this.groupBoxSebService.Controls.Add(this.checkBoxSebServiceIgnore);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowChromeNotifications);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowWindowsUpdate);
this.groupBoxSebService.Controls.Add(this.labelSebServiceIgnore);
this.groupBoxSebService.Controls.Add(this.listBoxSebServicePolicy);
this.groupBoxSebService.Controls.Add(this.labelSebServicePolicy);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowScreenSharing);
this.groupBoxSebService.Location = new System.Drawing.Point(23, 27);
this.groupBoxSebService.Name = "groupBoxSebService";
this.groupBoxSebService.Size = new System.Drawing.Size(540, 212);
this.groupBoxSebService.TabIndex = 106;
this.groupBoxSebService.TabStop = false;
this.groupBoxSebService.Text = "SEB Service (Win)";
//
// checkBoxSebServiceIgnore
//
this.checkBoxSebServiceIgnore.AutoSize = true;
this.checkBoxSebServiceIgnore.Location = new System.Drawing.Point(14, 21);
this.checkBoxSebServiceIgnore.Name = "checkBoxSebServiceIgnore";
this.checkBoxSebServiceIgnore.Size = new System.Drawing.Size(119, 17);
this.checkBoxSebServiceIgnore.TabIndex = 104;
this.checkBoxSebServiceIgnore.Text = "Ignore SEB Service";
this.checkBoxSebServiceIgnore.UseVisualStyleBackColor = true;
this.checkBoxSebServiceIgnore.CheckedChanged += new System.EventHandler(this.checkBoxSebServiceIgnore_CheckedChanged);
//
// checkBoxAllowChromeNotifications
//
@ -1100,6 +1117,62 @@ namespace SebWindowsConfig
this.checkBoxAllowChromeNotifications.UseVisualStyleBackColor = true;
this.checkBoxAllowChromeNotifications.CheckedChanged += new System.EventHandler(this.checkBoxAllowChromeNotifications_CheckedChanged);
//
// checkBoxAllowWindowsUpdate
//
this.checkBoxAllowWindowsUpdate.AutoSize = true;
this.checkBoxAllowWindowsUpdate.Location = new System.Drawing.Point(14, 165);
this.checkBoxAllowWindowsUpdate.Name = "checkBoxAllowWindowsUpdate";
this.checkBoxAllowWindowsUpdate.Size = new System.Drawing.Size(265, 17);
this.checkBoxAllowWindowsUpdate.TabIndex = 103;
this.checkBoxAllowWindowsUpdate.Text = "Allow Windows Update to run while SEB is running";
this.checkBoxAllowWindowsUpdate.UseVisualStyleBackColor = true;
this.checkBoxAllowWindowsUpdate.CheckedChanged += new System.EventHandler(this.checkBoxAllowWindowsUpdate_CheckedChanged);
//
// labelSebServiceIgnore
//
this.labelSebServiceIgnore.BackColor = System.Drawing.SystemColors.Window;
this.labelSebServiceIgnore.ForeColor = System.Drawing.Color.Red;
this.labelSebServiceIgnore.Location = new System.Drawing.Point(12, 46);
this.labelSebServiceIgnore.Name = "labelSebServiceIgnore";
this.labelSebServiceIgnore.Size = new System.Drawing.Size(514, 42);
this.labelSebServiceIgnore.TabIndex = 105;
this.labelSebServiceIgnore.Text = resources.GetString("labelSebServiceIgnore.Text");
//
// listBoxSebServicePolicy
//
this.listBoxSebServicePolicy.FormattingEnabled = true;
this.listBoxSebServicePolicy.Location = new System.Drawing.Point(14, 113);
this.listBoxSebServicePolicy.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.listBoxSebServicePolicy.Name = "listBoxSebServicePolicy";
this.listBoxSebServicePolicy.Size = new System.Drawing.Size(512, 43);
this.listBoxSebServicePolicy.TabIndex = 0;
this.toolTip1.SetToolTip(this.listBoxSebServicePolicy, "Policy that applies when an exam client doesn\'t have the SEB Service running.");
this.listBoxSebServicePolicy.SelectedIndexChanged += new System.EventHandler(this.listBoxSebServicePolicy_SelectedIndexChanged);
//
// labelSebServicePolicy
//
this.labelSebServicePolicy.AutoSize = true;
this.labelSebServicePolicy.Location = new System.Drawing.Point(11, 97);
this.labelSebServicePolicy.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelSebServicePolicy.Name = "labelSebServicePolicy";
this.labelSebServicePolicy.Size = new System.Drawing.Size(101, 13);
this.labelSebServicePolicy.TabIndex = 75;
this.labelSebServicePolicy.Text = "SEB Service Policy:";
//
// checkBoxAllowScreenSharing
//
this.checkBoxAllowScreenSharing.AutoSize = true;
this.checkBoxAllowScreenSharing.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxAllowScreenSharing.Location = new System.Drawing.Point(305, 165);
this.checkBoxAllowScreenSharing.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxAllowScreenSharing.Name = "checkBoxAllowScreenSharing";
this.checkBoxAllowScreenSharing.Size = new System.Drawing.Size(198, 17);
this.checkBoxAllowScreenSharing.TabIndex = 97;
this.checkBoxAllowScreenSharing.Text = "Allow remote session/screen sharing";
this.toolTip1.SetToolTip(this.checkBoxAllowScreenSharing, "Allows Windows remote sessions and macOS screen sharing to be used");
this.checkBoxAllowScreenSharing.UseVisualStyleBackColor = true;
this.checkBoxAllowScreenSharing.CheckedChanged += new System.EventHandler(this.checkBoxAllowScreenSharing_CheckedChanged);
//
// checkBoxShowLogButton
//
this.checkBoxShowLogButton.AutoSize = true;
@ -1139,20 +1212,6 @@ namespace SebWindowsConfig
this.checkBoxEnablePrivateClipboard.UseVisualStyleBackColor = true;
this.checkBoxEnablePrivateClipboard.CheckedChanged += new System.EventHandler(this.checkBoxEnablePrivateClipboard_CheckedChanged);
//
// checkBoxAllowScreenSharing
//
this.checkBoxAllowScreenSharing.AutoSize = true;
this.checkBoxAllowScreenSharing.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxAllowScreenSharing.Location = new System.Drawing.Point(305, 165);
this.checkBoxAllowScreenSharing.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxAllowScreenSharing.Name = "checkBoxAllowScreenSharing";
this.checkBoxAllowScreenSharing.Size = new System.Drawing.Size(198, 17);
this.checkBoxAllowScreenSharing.TabIndex = 97;
this.checkBoxAllowScreenSharing.Text = "Allow remote session/screen sharing";
this.toolTip1.SetToolTip(this.checkBoxAllowScreenSharing, "Allows Windows remote sessions and macOS screen sharing to be used");
this.checkBoxAllowScreenSharing.UseVisualStyleBackColor = true;
this.checkBoxAllowScreenSharing.CheckedChanged += new System.EventHandler(this.checkBoxAllowScreenSharing_CheckedChanged);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label14);
@ -1509,27 +1568,6 @@ namespace SebWindowsConfig
this.radioKillExplorerShell.UseVisualStyleBackColor = true;
this.radioKillExplorerShell.CheckedChanged += new System.EventHandler(this.radioKillExplorerShell_CheckedChanged);
//
// labelSebServicePolicy
//
this.labelSebServicePolicy.AutoSize = true;
this.labelSebServicePolicy.Location = new System.Drawing.Point(11, 97);
this.labelSebServicePolicy.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelSebServicePolicy.Name = "labelSebServicePolicy";
this.labelSebServicePolicy.Size = new System.Drawing.Size(101, 13);
this.labelSebServicePolicy.TabIndex = 75;
this.labelSebServicePolicy.Text = "SEB Service Policy:";
//
// listBoxSebServicePolicy
//
this.listBoxSebServicePolicy.FormattingEnabled = true;
this.listBoxSebServicePolicy.Location = new System.Drawing.Point(14, 113);
this.listBoxSebServicePolicy.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.listBoxSebServicePolicy.Name = "listBoxSebServicePolicy";
this.listBoxSebServicePolicy.Size = new System.Drawing.Size(512, 43);
this.listBoxSebServicePolicy.TabIndex = 0;
this.toolTip1.SetToolTip(this.listBoxSebServicePolicy, "Policy that applies when an exam client doesn\'t have the SEB Service running.");
this.listBoxSebServicePolicy.SelectedIndexChanged += new System.EventHandler(this.listBoxSebServicePolicy_SelectedIndexChanged);
//
// checkBoxAllowVirtualMachine
//
this.checkBoxAllowVirtualMachine.AutoSize = true;
@ -1770,8 +1808,8 @@ namespace SebWindowsConfig
//
// Type
//
dataGridViewCellStyle17.BackColor = System.Drawing.Color.Silver;
this.Type.DefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.Silver;
this.Type.DefaultCellStyle = dataGridViewCellStyle5;
this.Type.HeaderText = "Type";
this.Type.Name = "Type";
this.Type.ReadOnly = true;
@ -3303,6 +3341,7 @@ namespace SebWindowsConfig
//
// tabPageDownUploads
//
this.tabPageDownUploads.Controls.Add(this.checkBoxAllowCustomDownloadLocation);
this.tabPageDownUploads.Controls.Add(this.checkBoxAllowPDFPlugIn);
this.tabPageDownUploads.Controls.Add(this.textBoxDownloadDirectoryWin);
this.tabPageDownUploads.Controls.Add(this.checkBoxDownloadOpenSEBFiles);
@ -3328,7 +3367,7 @@ namespace SebWindowsConfig
//
this.checkBoxAllowPDFPlugIn.AutoSize = true;
this.checkBoxAllowPDFPlugIn.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxAllowPDFPlugIn.Location = new System.Drawing.Point(25, 261);
this.checkBoxAllowPDFPlugIn.Location = new System.Drawing.Point(25, 278);
this.checkBoxAllowPDFPlugIn.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxAllowPDFPlugIn.Name = "checkBoxAllowPDFPlugIn";
this.checkBoxAllowPDFPlugIn.Size = new System.Drawing.Size(310, 17);
@ -3342,7 +3381,7 @@ namespace SebWindowsConfig
//
// textBoxDownloadDirectoryWin
//
this.textBoxDownloadDirectoryWin.Location = new System.Drawing.Point(269, 55);
this.textBoxDownloadDirectoryWin.Location = new System.Drawing.Point(338, 55);
this.textBoxDownloadDirectoryWin.Name = "textBoxDownloadDirectoryWin";
this.textBoxDownloadDirectoryWin.Size = new System.Drawing.Size(379, 20);
this.textBoxDownloadDirectoryWin.TabIndex = 87;
@ -3352,7 +3391,7 @@ namespace SebWindowsConfig
//
this.checkBoxDownloadOpenSEBFiles.AutoSize = true;
this.checkBoxDownloadOpenSEBFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxDownloadOpenSEBFiles.Location = new System.Drawing.Point(25, 304);
this.checkBoxDownloadOpenSEBFiles.Location = new System.Drawing.Point(25, 321);
this.checkBoxDownloadOpenSEBFiles.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxDownloadOpenSEBFiles.Name = "checkBoxDownloadOpenSEBFiles";
this.checkBoxDownloadOpenSEBFiles.Size = new System.Drawing.Size(203, 17);
@ -3366,7 +3405,7 @@ namespace SebWindowsConfig
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(131, 88);
this.label5.Location = new System.Drawing.Point(186, 88);
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(137, 13);
@ -3376,7 +3415,7 @@ namespace SebWindowsConfig
//
// textBoxDownloadDirectoryOSX
//
this.textBoxDownloadDirectoryOSX.Location = new System.Drawing.Point(269, 85);
this.textBoxDownloadDirectoryOSX.Location = new System.Drawing.Point(338, 85);
this.textBoxDownloadDirectoryOSX.Name = "textBoxDownloadDirectoryOSX";
this.textBoxDownloadDirectoryOSX.Size = new System.Drawing.Size(379, 20);
this.textBoxDownloadDirectoryOSX.TabIndex = 84;
@ -3388,16 +3427,16 @@ namespace SebWindowsConfig
this.buttonDownloadDirectoryWin.Location = new System.Drawing.Point(114, 52);
this.buttonDownloadDirectoryWin.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.buttonDownloadDirectoryWin.Name = "buttonDownloadDirectoryWin";
this.buttonDownloadDirectoryWin.Size = new System.Drawing.Size(143, 25);
this.buttonDownloadDirectoryWin.Size = new System.Drawing.Size(209, 25);
this.buttonDownloadDirectoryWin.TabIndex = 0;
this.buttonDownloadDirectoryWin.Text = "Save downloaded files to...";
this.buttonDownloadDirectoryWin.Text = "Choose download / upload directory...";
this.buttonDownloadDirectoryWin.UseVisualStyleBackColor = true;
this.buttonDownloadDirectoryWin.Click += new System.EventHandler(this.buttonDownloadDirectoryWin_Click);
//
// listBoxChooseFileToUploadPolicy
//
this.listBoxChooseFileToUploadPolicy.FormattingEnabled = true;
this.listBoxChooseFileToUploadPolicy.Location = new System.Drawing.Point(44, 183);
this.listBoxChooseFileToUploadPolicy.Location = new System.Drawing.Point(44, 200);
this.listBoxChooseFileToUploadPolicy.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.listBoxChooseFileToUploadPolicy.Name = "listBoxChooseFileToUploadPolicy";
this.listBoxChooseFileToUploadPolicy.Size = new System.Drawing.Size(348, 43);
@ -3410,7 +3449,7 @@ namespace SebWindowsConfig
// labelChooseFileToUploadPolicy
//
this.labelChooseFileToUploadPolicy.AutoSize = true;
this.labelChooseFileToUploadPolicy.Location = new System.Drawing.Point(41, 155);
this.labelChooseFileToUploadPolicy.Location = new System.Drawing.Point(41, 172);
this.labelChooseFileToUploadPolicy.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelChooseFileToUploadPolicy.Name = "labelChooseFileToUploadPolicy";
this.labelChooseFileToUploadPolicy.Size = new System.Drawing.Size(145, 13);
@ -3421,7 +3460,7 @@ namespace SebWindowsConfig
//
this.checkBoxDownloadPDFFiles.AutoSize = true;
this.checkBoxDownloadPDFFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxDownloadPDFFiles.Location = new System.Drawing.Point(25, 246);
this.checkBoxDownloadPDFFiles.Location = new System.Drawing.Point(25, 263);
this.checkBoxDownloadPDFFiles.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxDownloadPDFFiles.Name = "checkBoxDownloadPDFFiles";
this.checkBoxDownloadPDFFiles.Size = new System.Drawing.Size(270, 17);
@ -3437,7 +3476,7 @@ namespace SebWindowsConfig
//
this.checkBoxOpenDownloads.AutoSize = true;
this.checkBoxOpenDownloads.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBoxOpenDownloads.Location = new System.Drawing.Point(114, 114);
this.checkBoxOpenDownloads.Location = new System.Drawing.Point(114, 143);
this.checkBoxOpenDownloads.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxOpenDownloads.Name = "checkBoxOpenDownloads";
this.checkBoxOpenDownloads.Size = new System.Drawing.Size(160, 17);
@ -4277,8 +4316,8 @@ namespace SebWindowsConfig
// spellCheckerDictionaryFilesColumn
//
this.spellCheckerDictionaryFilesColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle18;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle6;
this.spellCheckerDictionaryFilesColumn.HeaderText = "Files";
this.spellCheckerDictionaryFilesColumn.Name = "spellCheckerDictionaryFilesColumn";
this.spellCheckerDictionaryFilesColumn.ReadOnly = true;
@ -5675,42 +5714,16 @@ namespace SebWindowsConfig
this.applyAndStartSEBToolStripMenuItem.Visible = false;
this.applyAndStartSEBToolStripMenuItem.Click += new System.EventHandler(this.applyAndStartSEBToolStripMenuItem_Click);
//
// checkBoxSebServiceIgnore
// checkBoxAllowCustomDownloadLocation
//
this.checkBoxSebServiceIgnore.AutoSize = true;
this.checkBoxSebServiceIgnore.Location = new System.Drawing.Point(14, 21);
this.checkBoxSebServiceIgnore.Name = "checkBoxSebServiceIgnore";
this.checkBoxSebServiceIgnore.Size = new System.Drawing.Size(119, 17);
this.checkBoxSebServiceIgnore.TabIndex = 104;
this.checkBoxSebServiceIgnore.Text = "Ignore SEB Service";
this.checkBoxSebServiceIgnore.UseVisualStyleBackColor = true;
this.checkBoxSebServiceIgnore.CheckedChanged += new System.EventHandler(this.checkBoxSebServiceIgnore_CheckedChanged);
//
// labelSebServiceIgnore
//
this.labelSebServiceIgnore.BackColor = System.Drawing.SystemColors.Window;
this.labelSebServiceIgnore.ForeColor = System.Drawing.Color.Red;
this.labelSebServiceIgnore.Location = new System.Drawing.Point(12, 46);
this.labelSebServiceIgnore.Name = "labelSebServiceIgnore";
this.labelSebServiceIgnore.Size = new System.Drawing.Size(514, 42);
this.labelSebServiceIgnore.TabIndex = 105;
this.labelSebServiceIgnore.Text = resources.GetString("labelSebServiceIgnore.Text");
//
// groupBoxSebService
//
this.groupBoxSebService.Controls.Add(this.checkBoxSebServiceIgnore);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowChromeNotifications);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowWindowsUpdate);
this.groupBoxSebService.Controls.Add(this.labelSebServiceIgnore);
this.groupBoxSebService.Controls.Add(this.listBoxSebServicePolicy);
this.groupBoxSebService.Controls.Add(this.labelSebServicePolicy);
this.groupBoxSebService.Controls.Add(this.checkBoxAllowScreenSharing);
this.groupBoxSebService.Location = new System.Drawing.Point(23, 27);
this.groupBoxSebService.Name = "groupBoxSebService";
this.groupBoxSebService.Size = new System.Drawing.Size(540, 212);
this.groupBoxSebService.TabIndex = 106;
this.groupBoxSebService.TabStop = false;
this.groupBoxSebService.Text = "SEB Service (Win)";
this.checkBoxAllowCustomDownloadLocation.AutoSize = true;
this.checkBoxAllowCustomDownloadLocation.Location = new System.Drawing.Point(114, 122);
this.checkBoxAllowCustomDownloadLocation.Name = "checkBoxAllowCustomDownloadLocation";
this.checkBoxAllowCustomDownloadLocation.Size = new System.Drawing.Size(289, 17);
this.checkBoxAllowCustomDownloadLocation.TabIndex = 89;
this.checkBoxAllowCustomDownloadLocation.Text = "Allow user to select custom download / upload directory";
this.checkBoxAllowCustomDownloadLocation.UseVisualStyleBackColor = true;
this.checkBoxAllowCustomDownloadLocation.CheckedChanged += new System.EventHandler(this.checkBoxAllowCustomDownloadLocation_CheckedChanged);
//
// SebWindowsConfigForm
//
@ -5746,6 +5759,8 @@ namespace SebWindowsConfig
this.groupBoxInsideSeb.PerformLayout();
this.tabPageSecurity.ResumeLayout(false);
this.tabPageSecurity.PerformLayout();
this.groupBoxSebService.ResumeLayout(false);
this.groupBoxSebService.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox10.ResumeLayout(false);
@ -5827,8 +5842,6 @@ namespace SebWindowsConfig
this.tabControlSebWindowsConfig.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.groupBoxSebService.ResumeLayout(false);
this.groupBoxSebService.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -6244,6 +6257,7 @@ namespace SebWindowsConfig
private System.Windows.Forms.CheckBox checkBoxSebServiceIgnore;
private System.Windows.Forms.Label labelSebServiceIgnore;
private System.Windows.Forms.GroupBox groupBoxSebService;
private System.Windows.Forms.CheckBox checkBoxAllowCustomDownloadLocation;
}
}

6
SebWindowsConfig/SebWindowsConfigForm.cs
View file

@ -528,6 +528,7 @@ namespace SebWindowsConfig
// Group "Down/Uploads"
checkBoxAllowDownUploads.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowDownUploads];
checkBoxAllowCustomDownloadLocation.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowCustomDownUploadLocation];
checkBoxOpenDownloads .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyOpenDownloads];
checkBoxDownloadPDFFiles.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyDownloadPDFFiles];
checkBoxAllowPDFPlugIn .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowPDFPlugIn];
@ -4578,5 +4579,10 @@ namespace SebWindowsConfig
checkBoxAllowScreenSharing.Enabled = !checkBoxSebServiceIgnore.Checked;
checkBoxAllowChromeNotifications.Enabled = !checkBoxSebServiceIgnore.Checked;
}
private void checkBoxAllowCustomDownloadLocation_CheckedChanged(object sender, EventArgs e)
{
SEBSettings.settingsCurrent[SEBSettings.KeyAllowCustomDownUploadLocation] = checkBoxAllowCustomDownloadLocation.Checked;
}
}
}

1477
SebWindowsConfig/SebWindowsConfigForm.resx
View file

File diff suppressed because it is too large Load diff