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

SEBWIN-584, SEBWIN-585: Fixed issues with internal PDF reader toolbar.

Browse source
This commit is contained in:
Damian Büchel 2022-07-26 17:56:40 +02:00
parent d2d93db9f0
commit f5507cc2bc
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
SafeExamBrowser.Browser/Handlers/ResourceHandler.cs
View file

@ -101,9 +101,9 @@ namespace SafeExamBrowser.Browser.Handlers
protected override bool OnResourceResponse(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IRequest request, IResponse response) protected override bool OnResourceResponse(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IRequest request, IResponse response)
{ {
if (RedirectToDisablePdfToolbar(request, response, out var url)) if (RedirectToDisablePdfReaderToolbar(request, response, out var url))
{ {
webBrowser.Load(url); frame?.LoadUrl(url);
return true; return true;
} }
@ -165,15 +165,16 @@ namespace SafeExamBrowser.Browser.Handlers
return url.StartsWith(Uri.UriSchemeMailto); return url.StartsWith(Uri.UriSchemeMailto);
} }
private bool RedirectToDisablePdfToolbar(IRequest request, IResponse response, out string url) private bool RedirectToDisablePdfReaderToolbar(IRequest request, IResponse response, out string url)
{ {
const string DISABLE_PDF_TOOLBAR = "#toolbar=0"; const string DISABLE_PDF_READER_TOOLBAR = "#toolbar=0";
var isPdf = response.Headers["Content-Type"] == MediaTypeNames.Application.Pdf; var isPdf = response.Headers["Content-Type"] == MediaTypeNames.Application.Pdf;
var isMainFrame = request.ResourceType == ResourceType.MainFrame; var isMainFrame = request.ResourceType == ResourceType.MainFrame;
var hasFragment = request.Url.Contains(DISABLE_PDF_TOOLBAR); var hasFragment = request.Url.Contains(DISABLE_PDF_READER_TOOLBAR);
var redirect = settings.AllowPdfReader && !settings.AllowPdfReaderToolbar && isPdf && isMainFrame && !hasFragment; var redirect = settings.AllowPdfReader && !settings.AllowPdfReaderToolbar && isPdf && isMainFrame && !hasFragment;
url = request.Url + DISABLE_PDF_TOOLBAR; url = request.Url + DISABLE_PDF_READER_TOOLBAR;
if (redirect) if (redirect)
{ {
@ -241,7 +242,7 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var userId = ids.FirstOrDefault(); var userId = ids.FirstOrDefault();
if (userId != default(string) && sessionIdentifier != userId) if (userId != default && sessionIdentifier != userId)
{ {
sessionIdentifier = userId; sessionIdentifier = userId;
Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier)); Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier));
@ -264,7 +265,7 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var userInfo = cookies.FirstOrDefault(c => c.Contains("edx-user-info")); var userInfo = cookies.FirstOrDefault(c => c.Contains("edx-user-info"));
if (userInfo != default(string)) if (userInfo != default)
{ {
var start = userInfo.IndexOf("=") + 1; var start = userInfo.IndexOf("=") + 1;
var end = userInfo.IndexOf("; expires"); var end = userInfo.IndexOf("; expires");
@ -308,7 +309,7 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var location = locations.FirstOrDefault(l => l.Contains("/login/index.php?testsession")); var location = locations.FirstOrDefault(l => l.Contains("/login/index.php?testsession"));
if (location != default(string)) if (location != default)
{ {
var userId = location.Substring(location.IndexOf("=") + 1); var userId = location.Substring(location.IndexOf("=") + 1);
@ -339,7 +340,7 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var session = cookies.FirstOrDefault(c => c.Contains("MoodleSession")); var session = cookies.FirstOrDefault(c => c.Contains("MoodleSession"));
if (session != default(string)) if (session != default)
{ {
var requestUrl = request.Url; var requestUrl = request.Url;