SEBWIN-1009, SEBWIN-1010, #1090: Fixed issues with the implementation of the isolated clipboard.

Author: dbuechel

SafeExamBrowser.Browser/BrowserControl.cs

@@ -89,31 +89,20 @@ public void ExecuteJavaScript(string code, Action<JavaScriptResult> callback = d
 				{
 					control.BrowserCore.EvaluateScriptAsync(code).ContinueWith(t =>
 					{
-						callback?.Invoke(new JavaScriptResult
-						{
-							Message = t.Result.Message,
-							Result = t.Result.Result,
-							Success = t.Result.Success
-						});
+						callback?.Invoke(new JavaScriptResult { Message = t.Result.Message, Result = t.Result.Result, Success = t.Result.Success });
 					});
 				}
 				else
 				{
-					Task.Run(() => callback?.Invoke(new JavaScriptResult
-					{
-						Message = "JavaScript can't be executed in main frame!",
-						Success = false
-					}));
+					Task.Run(() => callback?.Invoke(new JavaScriptResult { Message = "Could not execute JavaScript in main frame!", Success = false }));
 				}
 			}
 			catch (Exception e)
 			{
-				logger.Error($"Failed to execute JavaScript '{(code.Length > 50 ? code.Take(50) : code)}'!", e);
-				Task.Run(() => callback?.Invoke(new JavaScriptResult
-				{
-					Message = $"Failed to execute JavaScript '{(code.Length > 50 ? code.Take(50) : code)}'! Reason: {e.Message}",
-					Success = false
-				}));
+				var message = "Failed to execute JavaScript in main frame!";
+
+				logger.Error(message, e);
+				Task.Run(() => callback?.Invoke(new JavaScriptResult { Message = $"{message} Reason: {e.Message}", Success = false }));
 			}
 		}
 
@@ -193,9 +182,21 @@ public void Zoom(double level)
 			control.BrowserCore.SetZoomLevel(level);
 		}
 
-		private void Clipboard_Changed(long id)
+		private void Clipboard_Changed(string id)
 		{
-			ExecuteJavaScript($"SafeExamBrowser.clipboard.update({id}, '{clipboard.Content}');");
+			try
+			{
+				var script = $"SafeExamBrowser.clipboard.update('{id}', '{clipboard.Content}');";
+
+				foreach (var frame in control.BrowserCore?.GetAllFrames() ?? Enumerable.Empty<IFrame>())
+				{
+					frame.EvaluateScriptAsync(script);
+				}
+			}
+			catch (Exception e)
+			{
+				logger.Error($"Failed to update JavaScript clipboard!", e);
+			}
 		}
 
 		private void Control_IsBrowserInitializedChanged(object sender, EventArgs e)
@@ -208,7 +209,7 @@ private void Control_IsBrowserInitializedChanged(object sender, EventArgs e)
 
 		private void WebBrowser_JavascriptMessageReceived(object sender, JavascriptMessageReceivedEventArgs e)
 		{
-			clipboard.Process(e);
+			clipboard.Update(e);
 		}
 	}
 }

SafeExamBrowser.Browser/Clipboard.cs

@@ -30,7 +30,7 @@ internal Clipboard(ILogger logger, BrowserSettings settings)
 			this.settings = settings;
 		}
 
-		internal void Process(JavascriptMessageReceivedEventArgs message)
+		internal void Update(JavascriptMessageReceivedEventArgs message)
 		{
 			if (settings.UseIsolatedClipboard)
 			{
@@ -65,7 +65,7 @@ private bool TrySetContent(object value)
 		private class Data
 		{
 			public string Content { get; set; }
-			public long Id { get; set; }
+			public string Id { get; set; }
 			public string Type { get; set; }
 		}
 	}