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

SEBWIN-314: Added functionality to automatically allow start URL when request filtering is active.

Browse source
This commit is contained in:
dbuechel 2019-09-24 08:53:29 +02:00
parent f4f6b47548
commit 0159b9c0de
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -12,6 +12,7 @@ using System.Threading.Tasks;
using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Applications.Contracts;
using SafeExamBrowser.Applications.Contracts.Events; using SafeExamBrowser.Applications.Contracts.Events;
using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Browser.Contracts.Events;
using SafeExamBrowser.Browser.Contracts.Filters;
using SafeExamBrowser.Browser.Events; using SafeExamBrowser.Browser.Events;
using SafeExamBrowser.Browser.Filters; using SafeExamBrowser.Browser.Filters;
using SafeExamBrowser.Browser.Handlers; using SafeExamBrowser.Browser.Handlers;
@ -117,6 +118,19 @@ namespace SafeExamBrowser.Browser
lifeSpanHandler.PopupRequested += LifeSpanHandler_PopupRequested; lifeSpanHandler.PopupRequested += LifeSpanHandler_PopupRequested;
requestHandler.RequestBlocked += RequestHandler_RequestBlocked; requestHandler.RequestBlocked += RequestHandler_RequestBlocked;
InitializeRequestFilter(requestFilter);
control = new BrowserControl(contextMenuHandler, displayHandler, downloadHandler, keyboardHandler, lifeSpanHandler, requestHandler, url);
control.AddressChanged += Control_AddressChanged;
control.LoadingStateChanged += Control_LoadingStateChanged;
control.TitleChanged += Control_TitleChanged;
control.Initialize();
logger.Debug("Initialized browser control.");
}
private void InitializeRequestFilter(IRequestFilter requestFilter)
{
if (settings.Filter.ProcessContentRequests || settings.Filter.ProcessMainRequests) if (settings.Filter.ProcessContentRequests || settings.Filter.ProcessMainRequests)
{ {
var factory = new RuleFactory(); var factory = new RuleFactory();
@ -130,15 +144,17 @@ namespace SafeExamBrowser.Browser
} }
logger.Debug($"Initialized request filter with {settings.Filter.Rules.Count} rule(s)."); logger.Debug($"Initialized request filter with {settings.Filter.Rules.Count} rule(s).");
if (requestFilter.Process(new Request { Url = settings.StartUrl }) != FilterResult.Allow)
{
var rule = factory.CreateRule(FilterRuleType.Simplified);
rule.Initialize(new FilterRuleSettings { Expression = settings.StartUrl, Result = FilterResult.Allow });
requestFilter.Load(rule);
logger.Debug($"Automatically created filter rule to allow start URL '{settings.StartUrl}'.");
}
} }
control = new BrowserControl(contextMenuHandler, displayHandler, downloadHandler, keyboardHandler, lifeSpanHandler, requestHandler, url);
control.AddressChanged += Control_AddressChanged;
control.LoadingStateChanged += Control_LoadingStateChanged;
control.TitleChanged += Control_TitleChanged;
control.Initialize();
logger.Debug("Initialized browser control.");
} }
private void InitializeWindow() private void InitializeWindow()
@ -248,7 +264,16 @@ namespace SafeExamBrowser.Browser
var message = text.Get(TextKey.MessageBox_BrowserNavigationBlocked).Replace("%%URL%%", url); var message = text.Get(TextKey.MessageBox_BrowserNavigationBlocked).Replace("%%URL%%", url);
var title = text.Get(TextKey.MessageBox_BrowserNavigationBlockedTitle); var title = text.Get(TextKey.MessageBox_BrowserNavigationBlockedTitle);
control.TitleChanged -= Control_TitleChanged;
if (url == this.url)
{
window.UpdateTitle($"*** {title} ***");
NameChanged?.Invoke($"*** {title} ***");
}
messageBox.Show(message, title, parent: window); messageBox.Show(message, title, parent: window);
control.TitleChanged += Control_TitleChanged;
}); });
} }

4
SafeExamBrowser.Configuration/ConfigurationData/DataMapper.cs
View file

@ -29,10 +29,6 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
MapApplicationLogAccess(rawData, settings); MapApplicationLogAccess(rawData, settings);
MapKioskMode(rawData, settings); MapKioskMode(rawData, settings);
MapUserAgentMode(rawData, settings); MapUserAgentMode(rawData, settings);
// TODO: Automatically create filter rule for start URL!
// -> Only if filter active
// -> Create mechanism for post-processing of settings?
} }
private void MapAudioSettings(string key, object value, ApplicationSettings settings) private void MapAudioSettings(string key, object value, ApplicationSettings settings)