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

SEBWIN-329: Fixed bug with custom URI scheme handling and blocked mailto URLs.

Browse source
This commit is contained in:
dbuechel 2019-06-27 15:07:36 +02:00
parent 5599fceef6
commit c38e57e081
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SafeExamBrowser.Browser/Handlers/RequestHandler.cs
View file

@ -33,6 +33,11 @@ namespace SafeExamBrowser.Browser.Handlers
// reactivated. See https://bitbucket.org/chromiumembedded/cef/issues/2622 for the current status of development. // reactivated. See https://bitbucket.org/chromiumembedded/cef/issues/2622 for the current status of development.
// AppendCustomUserAgent(request); // AppendCustomUserAgent(request);
if (IsMailtoUrl(request.Url))
{
return CefReturnValue.Cancel;
}
ReplaceCustomScheme(request); ReplaceCustomScheme(request);
return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback); return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
@ -47,17 +52,25 @@ namespace SafeExamBrowser.Browser.Handlers
request.Headers = headers; request.Headers = headers;
} }
private bool IsMailtoUrl(string url)
{
return url.StartsWith(Uri.UriSchemeMailto);
}
private void ReplaceCustomScheme(IRequest request) private void ReplaceCustomScheme(IRequest request)
{ {
var uri = new Uri(request.Url); if (Uri.IsWellFormedUriString(request.Url, UriKind.RelativeOrAbsolute))
{
var uri = new Uri(request.Url);
if (uri.Scheme == appConfig.SebUriScheme) if (uri.Scheme == appConfig.SebUriScheme)
{ {
request.Url = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttp }.Uri.AbsoluteUri; request.Url = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttp }.Uri.AbsoluteUri;
} }
else if (uri.Scheme == appConfig.SebUriSchemeSecure) else if (uri.Scheme == appConfig.SebUriSchemeSecure)
{ {
request.Url = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttps }.Uri.AbsoluteUri; request.Url = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttps }.Uri.AbsoluteUri;
}
} }
} }
} }