SEBWIN-1102: Removed start URL from session integrity verification.

Author: dbuechel

SafeExamBrowser.Client.UnitTests/Responsibilities/IntegrityResponsibilityTests.cs

@@ -31,7 +31,7 @@ public void Initialize()
 			text = new Mock<IText>();
 			integrityModule = new Mock<IIntegrityModule>();
 
-			integrityModule.Setup(m => m.TryVerifySessionIntegrity(It.IsAny<string>(), It.IsAny<string>(), out valid)).Returns(true);
+			integrityModule.Setup(m => m.TryVerifySessionIntegrity(It.IsAny<string>(), out valid)).Returns(true);
 
 			var sut = new IntegrityResponsibility(context, logger.Object, text.Object);
 		}

SafeExamBrowser.Client/Responsibilities/IntegrityResponsibility.cs

@@ -62,7 +62,7 @@ private void UpdateSessionIntegrity()
 
 			if (hasQuitPassword)
 			{
-				IntegrityModule?.ClearSession(Settings.Browser.ConfigurationKey, Settings.Browser.StartUrl);
+				IntegrityModule?.ClearSession(Settings.Browser.ConfigurationKey);
 			}
 		}
 
@@ -96,12 +96,12 @@ private void VerifySessionIntegrity()
 			{
 				Logger.Info($"Attempting to verify session integrity...");
 
-				if (IntegrityModule.TryVerifySessionIntegrity(Settings.Browser.ConfigurationKey, Settings.Browser.StartUrl, out var isValid))
+				if (IntegrityModule.TryVerifySessionIntegrity(Settings.Browser.ConfigurationKey, out var isValid))
 				{
 					if (isValid)
 					{
 						Logger.Info("Session integrity successfully verified.");
-						IntegrityModule.CacheSession(Settings.Browser.ConfigurationKey, Settings.Browser.StartUrl);
+						IntegrityModule.CacheSession(Settings.Browser.ConfigurationKey);
 					}
 					else
 					{

SafeExamBrowser.Integrity.Contracts/IIntegrityModule.cs

@@ -16,12 +16,12 @@ public interface IIntegrityModule
 		/// <summary>
 		/// Caches the specified session for later integrity verification.
 		/// </summary>
-		void CacheSession(string configurationKey, string startUrl);
+		void CacheSession(string configurationKey);
 
 		/// <summary>
 		/// Removes the specified session from the integrity verification cache.
 		/// </summary>
-		void ClearSession(string configurationKey, string startUrl);
+		void ClearSession(string configurationKey);
 
 		/// <summary>
 		/// Indicates whether the computer system is a virtual machine and if so, provides its manufacturer and probability.
@@ -51,6 +51,6 @@ public interface IIntegrityModule
 		/// <summary>
 		/// Attempts to verify the integrity for the specified session.
 		/// </summary>
-		bool TryVerifySessionIntegrity(string configurationKey, string startUrl, out bool isValid);
+		bool TryVerifySessionIntegrity(string configurationKey, out bool isValid);
 	}
 }

SafeExamBrowser.Integrity/IntegrityModule.cs

@@ -39,7 +39,6 @@ public class IntegrityModule : IIntegrityModule
 			0x01, 0x04, 0x02, 0x03, 0x14, 0x15, 0x07, 0x08,
 			0x11, 0x12, 0x16, 0x05, 0x09, 0x10, 0x12, 0x02
 		};
-		private static readonly string SESSION_DATA_SEPARATOR = "<@|--separator--|@>";
 
 		private readonly AppConfig appConfig;
 		private readonly ILogger logger;
@@ -50,9 +49,9 @@ public IntegrityModule(AppConfig appConfig, ILogger logger)
 			this.logger = logger;
 		}
 
-		public void CacheSession(string configurationKey, string startUrl)
+		public void CacheSession(string configurationKey)
 		{
-			if (TryReadSessionCache(out var sessions) && TryWriteSessionCache(sessions.Append((configurationKey, startUrl))))
+			if (TryReadSessionCache(out var sessions) && TryWriteSessionCache(sessions.Append(configurationKey)))
 			{
 				logger.Debug("Successfully cached session.");
 			}
@@ -62,9 +61,9 @@ public void CacheSession(string configurationKey, string startUrl)
 			}
 		}
 
-		public void ClearSession(string configurationKey, string startUrl)
+		public void ClearSession(string configurationKey)
 		{
-			if (TryReadSessionCache(out var sessions) && TryWriteSessionCache(sessions.Where(s => s.configurationKey != configurationKey && s.startUrl != startUrl)))
+			if (TryReadSessionCache(out var sessions) && TryWriteSessionCache(sessions.Where(s => s != configurationKey)))
 			{
 				logger.Debug("Successfully cleared session.");
 			}
@@ -194,15 +193,15 @@ public bool TryVerifyCodeSignature(out bool isValid)
 			return success;
 		}
 
-		public bool TryVerifySessionIntegrity(string configurationKey, string startUrl, out bool isValid)
+		public bool TryVerifySessionIntegrity(string configurationKey, out bool isValid)
 		{
 			var success = false;
 
 			isValid = false;
 
 			if (TryReadSessionCache(out var sessions))
 			{
-				isValid = sessions.All(s => s.configurationKey != configurationKey && s.startUrl != startUrl);
+				isValid = sessions.All(s => s != configurationKey);
 				success = true;
 				logger.Debug($"Successfully verified session integrity, session is {(isValid ? "valid." : "compromised!")}");
 			}
@@ -214,11 +213,11 @@ public bool TryVerifySessionIntegrity(string configurationKey, string startUrl,
 			return success;
 		}
 
-		private bool TryReadSessionCache(out IList<(string configurationKey, string startUrl)> sessions)
+		private bool TryReadSessionCache(out IList<string> sessions)
 		{
 			var success = false;
 
-			sessions = new List<(string configurationKey, string startUrl)>();
+			sessions = new List<string>();
 
 			try
 			{
@@ -229,13 +228,9 @@ private bool TryReadSessionCache(out IList<(string configurationKey, string star
 					using (var stream = new CryptoStream(file, aes.CreateDecryptor(SESSION_DATA_KEY, SESSION_DATA_IV), CryptoStreamMode.Read))
 					using (var reader = new StreamReader(stream))
 					{
-						for (var line = reader.ReadLine(); line != default; line = reader.ReadLine())
+						for (var session = reader.ReadLine(); session != default; session = reader.ReadLine())
 						{
-							var session = line.Split(new string[] { SESSION_DATA_SEPARATOR }, StringSplitOptions.None);
-							var configurationKey = session[0];
-							var startUrl = session[1];
-
-							sessions.Add((configurationKey, startUrl));
+							sessions.Add(session);
 						}
 					}
 				}
@@ -250,7 +245,7 @@ private bool TryReadSessionCache(out IList<(string configurationKey, string star
 			return success;
 		}
 
-		private bool TryWriteSessionCache(IEnumerable<(string configurationKey, string startUrl)> sessions)
+		private bool TryWriteSessionCache(IEnumerable<string> sessions)
 		{
 			var success = false;
 
@@ -267,9 +262,9 @@ private bool TryWriteSessionCache(IEnumerable<(string configurationKey, string s
 						using (var stream = new CryptoStream(file, aes.CreateEncryptor(), CryptoStreamMode.Write))
 						using (var writer = new StreamWriter(stream))
 						{
-							foreach (var (configurationKey, startUrl) in sessions)
+							foreach (var session in sessions)
 							{
-								writer.WriteLine($"{configurationKey}{SESSION_DATA_SEPARATOR}{startUrl}");
+								writer.WriteLine(session);
 							}
 						}
 					}