Maintain MQTT topic prefix + suffix structure (#61)

* Released data diode system information  (#53)

* docs: build requirements for `make`

* fix: match MQTT client ID

* Fix: Add a 'min' function to work with go1.18.1, the default on Ubuntu 22.04. (#54)

* refactor: continuous outbound MQTT topic structure

* bump: project requirements

* docs: resolve formatting issues with markdownlint

Author: TechSolomon

README.md

@@ -6,20 +6,19 @@ Scripts for verifying TCP passthrough functionality.
 
 > [!TIP]
 > This project utilizes [`go`](https://go.dev/) for module management.
-> You can find installation instructions via https://go.dev/doc/install.
+> You can find installation instructions via [relevant operating system](https://go.dev/doc/install) documentation.
 
 - Clone repository: `gh repo clone acep-uaf/data-diode`
 - Source navigation: `cd data-diode`
-- Build binary: `make`
-    - [`build-essential`](https://packages.ubuntu.com/focal/build-essential)
+- Build binary: [`make`](https://www.gnu.org/software/make/)
 - CLI: `./diode [options...]`
 
-#### Branch Management
+### Branch Management
 
 - `main` → production ready environment.
 - `dev` → testing changes to be merged into `main`.
 
-#### Directory Structure
+### Directory Structure
 
 ```zsh
 .
@@ -39,7 +38,7 @@ Scripts for verifying TCP passthrough functionality.
 5 directories, 7 files
 ```
 
-#### Architecture Diagram
+### Architecture Diagram
 
 ```mermaid
 graph LR
@@ -52,23 +51,23 @@ graph LR
 
 ## User Stories
 
-#### Scenario Planning
+### Scenario Planning
 
 1. Power Plant Operator
 1. Information Security Auditor
 1. Energy Awareness Application Developer
 1. Community Member
 
-#### Threat Model[^1]
+### Threat Model[^1]
 
 - [ ] Tactics
 - [ ] Techniques
 - [ ] Procedures
 
-## System Benchmarking
+### System Benchmarking
 
-#### Experimental Design
+### Experimental Design
 
-###### [Device Configuration](docs/SOP.md)
+#### [Device Configuration](docs/SOP.md)
 
-[^1]: https://csrc.nist.gov/glossary/term/tactics_techniques_and_procedures
+[^1]: <https://csrc.nist.gov/glossary/term/tactics_techniques_and_procedures>

docs/SOP.md

@@ -7,16 +7,16 @@
 
 ## Research Question
 
-#### State Synchronization
+### State Synchronization
 
-#### System Replication
+### System Replication
 
 ## System Analysis
 
-#### Latency
+### Latency
 
-#### Bandwidth
+### Bandwidth
 
-#### Throughput
+### Throughput
 
 ## Data Integrity

go.mod

@@ -4,15 +4,15 @@ go 1.22
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.4.3
-	github.com/urfave/cli/v2 v2.27.1
+	github.com/urfave/cli/v2 v2.27.2
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 )

go.sum

@@ -2,16 +2,16 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lV
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik=
 github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
-github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
-github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
+github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

utility/application.go

@@ -13,6 +13,13 @@ const (
 	SAMPLE          = 10240
 )
 
+func min(a, b int) int {
+    if a < b {
+        return a
+    }
+    return b
+}
+
 func SendMessage(input string, client string) {
 	conn, err := net.Dial(CONN_TYPE, client)
 	if err != nil {

utility/republisher.go

@@ -55,7 +55,7 @@ func InboundMessageFlow(server string, port int, topic string, arrival string) {
 	<-c
 }
 
-func OutboundMessageFlow(server string, port int, topic string, destination string) {
+func OutboundMessageFlow(server string, port int, prefix string, destination string) {
 	messages := make(chan string)
 	go func() {
 		err := RecieveMessage(destination, messages)
@@ -66,8 +66,18 @@ func OutboundMessageFlow(server string, port int, topic string, destination stri
 	}()
 
 	for message := range messages {
-		repackaged := RepackageContents(message, topic)
-		PublishPayload(server, port, topic, repackaged)
+		var msg InputDiodeMessage
+		err := json.Unmarshal([]byte(message), &msg)
+		if err != nil {
+			fmt.Println(">> [!] Error parsing JSON message: ", err)
+			continue
+		}
+
+		// TODO: Bounds checking for extracted top-level message intent.
+
+		prepend := prefix + "/" + msg.Topic
+		repackaged := RepackageContents(message, prepend)
+		PublishPayload(server, port, prepend, repackaged)
 	}
 }