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

SEBWIN-518: Changed session identification to only trigger event when identifier changes.

Browse source
This commit is contained in:
Damian Büchel 2021-10-04 18:10:36 +02:00
parent 55db0f8bf9
commit f11d4cb093
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ namespace SafeExamBrowser.Browser.Handlers
private HtmlLoader htmlLoader; private HtmlLoader htmlLoader;
private ILogger logger; private ILogger logger;
private IResourceHandler pageHandler; private IResourceHandler pageHandler;
private string sessionIdentifier;
private BrowserSettings settings; private BrowserSettings settings;
private WindowSettings windowSettings; private WindowSettings windowSettings;
private IText text; private IText text;
@ -270,9 +271,10 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var userId = ids.FirstOrDefault(); var userId = ids.FirstOrDefault();
if (userId != default(string)) if (userId != default(string) && sessionIdentifier != userId)
{ {
Task.Run(() => SessionIdentifierDetected?.Invoke(userId)); sessionIdentifier = userId;
Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier));
logger.Info("Generic LMS session detected."); logger.Info("Generic LMS session detected.");
return true; return true;
@ -301,8 +303,12 @@ namespace SafeExamBrowser.Browser.Handlers
var json = JsonConvert.DeserializeObject(sanitized) as JObject; var json = JsonConvert.DeserializeObject(sanitized) as JObject;
var userName = json["username"].Value<string>(); var userName = json["username"].Value<string>();
Task.Run(() => SessionIdentifierDetected?.Invoke(userName)); if (sessionIdentifier != userName)
logger.Info("EdX session detected."); {
sessionIdentifier = userName;
Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier));
logger.Info("EdX session detected.");
}
} }
} }
catch (Exception e) catch (Exception e)
@ -336,8 +342,12 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var userId = location.Substring(location.IndexOf("=") + 1); var userId = location.Substring(location.IndexOf("=") + 1);
Task.Run(() => SessionIdentifierDetected?.Invoke(userId)); if (sessionIdentifier != userId)
logger.Info("Moodle session detected."); {
sessionIdentifier = userId;
Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier));
logger.Info("Moodle session detected.");
}
return true; return true;
} }
@ -384,12 +394,13 @@ namespace SafeExamBrowser.Browser.Handlers
{ {
var userId = await result.Content.ReadAsStringAsync(); var userId = await result.Content.ReadAsStringAsync();
if (int.TryParse(userId, out var id) && id > 0) if (int.TryParse(userId, out var id) && id > 0 && sessionIdentifier != userId)
{ {
#pragma warning disable CS4014 #pragma warning disable CS4014
Task.Run(() => SessionIdentifierDetected?.Invoke(userId)); sessionIdentifier = userId;
#pragma warning restore CS4014 Task.Run(() => SessionIdentifierDetected?.Invoke(sessionIdentifier));
logger.Info("Moodle session detected."); logger.Info("Moodle session detected.");
#pragma warning restore CS4014
} }
} }
else else