Implemented better testing and fixed skipepd frames

Client/debugger/cmd_gate_test.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"testing"
+)
+
+// TestIsDangerousCommand_Force — FORCE is dangerous.
+func TestIsDangerousCommand_Force(t *testing.T) {
+	if !isDangerousCommand("FORCE signal 1.0") {
+		t.Error("FORCE should be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_Pause — PAUSE is dangerous.
+func TestIsDangerousCommand_Pause(t *testing.T) {
+	if !isDangerousCommand("PAUSE") {
+		t.Error("PAUSE should be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_Msg — MSG is dangerous.
+func TestIsDangerousCommand_Msg(t *testing.T) {
+	if !isDangerousCommand("MSG target func") {
+		t.Error("MSG should be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_CaseInsensitive — case-insensitive.
+func TestIsDangerousCommand_CaseInsensitive(t *testing.T) {
+	if !isDangerousCommand("force signal 1.0") {
+		t.Error("lowercase force should be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_SafeCommand — DISCOVER is not dangerous.
+func TestIsDangerousCommand_SafeCommand(t *testing.T) {
+	if isDangerousCommand("DISCOVER") {
+		t.Error("DISCOVER should not be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_TraceNotDangerous — TRACE is not dangerous (read-only).
+func TestIsDangerousCommand_TraceNotDangerous(t *testing.T) {
+	if isDangerousCommand("TRACE signal 1") {
+		t.Error("TRACE should not be dangerous")
+	}
+}
+
+// TestIsDangerousCommand_Empty — empty command is not dangerous.
+func TestIsDangerousCommand_Empty(t *testing.T) {
+	if isDangerousCommand("") {
+		t.Error("empty command should not be dangerous")
+	}
+}

Client/debugger/main.go

@@ -21,6 +21,8 @@ var staticFiles embed.FS
 func main() {
 	addr := flag.String("addr", ":7777", "HTTP listen address")
 	sourcesFile := flag.String("sources-file", "", "JSON file for persistent source list")
+	flag.BoolVar(&dangerousCommandsEnabled, "enable-dangerous-commands", false,
+		"Allow FORCE/PAUSE/RESUME/STEP/BREAK/MSG commands from the browser (CR-4 safety gate)")
 	flag.Parse()
 
 	hub := wshub.NewHub()

Client/debugger/martecontrol.go

@@ -17,6 +17,40 @@ import (
 	"marte2/common/wshub"
 )
 
+// ---------------------------------------------------------------------------
+// Command safety gate (CR-4)
+// ---------------------------------------------------------------------------
+
+// dangerousCommandsEnabled gates commands that mutate the RT application state
+// (FORCE, PAUSE, RESUME, STEP, BREAK, MSG).  Set via --enable-dangerous-commands.
+var dangerousCommandsEnabled = false
+
+// dangerousCommands is the set of MARTe2 commands that can change signal values
+// or alter execution flow.  Without --enable-dangerous-commands these are blocked
+// from the browser WebSocket path.
+var dangerousCommands = map[string]bool{
+	"FORCE":    true,
+	"UNFORCE":  true,
+	"PAUSE":    true,
+	"RESUME":   true,
+	"STEP":     true,
+	"BREAK":    true,
+	"UNBREAK":  true,
+	"MSG":      true,
+	"LOAD":     true,
+	"UNLOAD":   true,
+}
+
+// isDangerousCommand returns true if the command's first word is in the
+// dangerous set (case-insensitive).
+func isDangerousCommand(cmd string) bool {
+	parts := strings.Fields(cmd)
+	if len(parts) == 0 {
+		return false
+	}
+	return dangerousCommands[strings.ToUpper(parts[0])]
+}
+
 // ---------------------------------------------------------------------------
 // Signal metadata (populated by DISCOVER)
 // ---------------------------------------------------------------------------
@@ -256,10 +290,25 @@ func (m *MarteController) HandleBrowserCommand(msg []byte) {
 			return
 		}
 		cmd, _ := data["cmd"].(string)
-		if cmd != "" {
-			m.trackForcedCmd(cmd)
-			m.SendCommand(cmd)
+		if cmd == "" {
+			return
 		}
+		// Gate dangerous commands (FORCE/UNFORCE/PAUSE/RESUME/STEP/BREAK/MSG)
+		// behind an explicit opt-in flag.  Without it, only read-only commands
+		// (DISCOVER, TREE, INFO, LS, VALUE, TRACE, UNTRACE, STEP_STATUS) are
+		// forwarded to the MARTe2 TCP control connection.
+		if isDangerousCommand(cmd) {
+			if !dangerousCommandsEnabled {
+				broadcastHub(m.hub, map[string]any{
+					"type": "log", "time": time.Now().Format("15:04:05.000"),
+					"level": "WARNING",
+					"message": fmt.Sprintf("Blocked dangerous command (requires --enable-dangerous-commands): %s", cmd),
+				})
+				return
+			}
+		}
+		m.trackForcedCmd(cmd)
+		m.SendCommand(cmd)
 	}
 }
 

Client/debugger/static/app.js

@@ -3511,7 +3511,7 @@ function _fmtHz(v) { return v != null && isFinite(v) && v > 0 ? v.toFixed(2) + '
 function _fmtKB(v) { return v != null && isFinite(v) ? (v / 1024).toFixed(2) + ' KB' : '—'; }
 
 function _statsKV(label, value, cls) {
-  return `<div class="stats-kv"><span class="stats-k">${label}</span><span class="stats-v${cls ? ' ' + cls : ''}">${value}</span></div>`;
+  return `<div class="stats-kv"><span class="stats-k">${escHtml(label)}</span><span class="stats-v${cls ? ' ' + cls : ''}">${escHtml(value)}</span></div>`;
 }
 
 function _histHTML(si) {

Client/streamhub/WSClient.cpp

@@ -18,18 +18,27 @@
 #include <cstdlib>
 #include <ctime>
 #include <chrono>
+#include <random>
 
 namespace StreamHubClient {
 
 /* ── Helpers ─────────────────────────────────────────────────────────────── */
 
 static std::string base64Key() {
-    /* Generate 16 random bytes and base64-encode them */
+    /* HI-7: use /dev/urandom (CSPRNG) instead of srand(time)/rand() */
     uint8_t raw[16];
-    srand(static_cast<unsigned>(time(nullptr)));
-    for (int i = 0; i < 16; i++) {
-        raw[i] = static_cast<uint8_t>(rand() & 0xFF);
+    int fd = open("/dev/urandom", O_RDONLY);
+    if (fd < 0 || read(fd, raw, sizeof(raw)) != static_cast<ssize_t>(sizeof(raw))) {
+        /* Fallback: std::random_device (still better than srand/rand) */
+        std::random_device rd;
+        for (size_t i = 0; i < sizeof(raw); i += sizeof(unsigned)) {
+            unsigned val = rd();
+            for (size_t j = 0; j < sizeof(unsigned) && i + j < sizeof(raw); j++) {
+                raw[i + j] = static_cast<uint8_t>(val >> (j * 8));
+            }
+        }
     }
+    if (fd >= 0) { close(fd); }
     char out[32];
     WS_Base64Encode(raw, 16, out);
     return std::string(out);

Client/udpstreamer/static/app.js

@@ -3465,7 +3465,7 @@ function _fmtHz(v) { return v != null && isFinite(v) && v > 0 ? v.toFixed(2) + '
 function _fmtKB(v) { return v != null && isFinite(v) ? (v / 1024).toFixed(2) + ' KB' : '—'; }
 
 function _statsKV(label, value, cls) {
-  return `<div class="stats-kv"><span class="stats-k">${label}</span><span class="stats-v${cls ? ' ' + cls : ''}">${value}</span></div>`;
+  return `<div class="stats-kv"><span class="stats-k">${escHtml(label)}</span><span class="stats-v${cls ? ' ' + cls : ''}">${escHtml(value)}</span></div>`;
 }
 
 function _histHTML(si) {