From f5d0608e03fc9f494e6bd4ab1a1bc7e9bd6b884d Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Sun, 30 Jun 2024 19:14:16 -0600
Subject: [PATCH] reorganize

---
 server/build.sh                               | 24 +++++++++++++++++++
 config.sample.yml => server/config.sample.yml |  0
 generate-key.sh => server/generate-key.sh     |  0
 server/{ => src}/encryption/decrypt.go        |  0
 server/{ => src}/encryption/encrypt.go        |  0
 server/{ => src}/go.mod                       |  0
 server/{ => src}/go.sum                       |  0
 server/{ => src}/logging/logging.go           |  0
 server/{ => src}/server.go                    |  5 ++--
 {test => server/test}/README.md               |  0
 {test => server/test}/test.py                 |  0
 {test => server/test}/test_raw.py             |  0
 12 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100755 server/build.sh
 rename config.sample.yml => server/config.sample.yml (100%)
 rename generate-key.sh => server/generate-key.sh (100%)
 rename server/{ => src}/encryption/decrypt.go (100%)
 rename server/{ => src}/encryption/encrypt.go (100%)
 rename server/{ => src}/go.mod (100%)
 rename server/{ => src}/go.sum (100%)
 rename server/{ => src}/logging/logging.go (100%)
 rename server/{ => src}/server.go (97%)
 rename {test => server/test}/README.md (100%)
 rename {test => server/test}/test.py (100%)
 rename {test => server/test}/test_raw.py (100%)

diff --git a/server/build.sh b/server/build.sh
new file mode 100755
index 0000000..a5c3e40
--- /dev/null
+++ b/server/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+if [ -z ${1+x} ]; then
+  VERSION="0.0.0"
+else
+  VERSION="$1"
+fi
+
+mkdir -p "$SCRIPT_DIR/dist"
+rm "$SCRIPT_DIR"/dist/* &> /dev/null
+
+BUILDARGS="$(uname)-$(uname -p)"
+OUTPUTFILE="$SCRIPT_DIR/dist/freematics-encrypt-$VERSION-$BUILDARGS"
+
+cd "$SCRIPT_DIR/src" || exit 1
+go mod tidy
+go build -v -trimpath -ldflags "-s -w -X main.VersionDate=$(date -u --iso-8601=minutes) -X main.Version=v$VERSION" -o "$OUTPUTFILE"
+
+if [ $? -eq 0 ]; then
+  chmod +x "$OUTPUTFILE"
+  echo "Build Succeeded ->  $OUTPUTFILE"
+fi
diff --git a/config.sample.yml b/server/config.sample.yml
similarity index 100%
rename from config.sample.yml
rename to server/config.sample.yml
diff --git a/generate-key.sh b/server/generate-key.sh
similarity index 100%
rename from generate-key.sh
rename to server/generate-key.sh
diff --git a/server/encryption/decrypt.go b/server/src/encryption/decrypt.go
similarity index 100%
rename from server/encryption/decrypt.go
rename to server/src/encryption/decrypt.go
diff --git a/server/encryption/encrypt.go b/server/src/encryption/encrypt.go
similarity index 100%
rename from server/encryption/encrypt.go
rename to server/src/encryption/encrypt.go
diff --git a/server/go.mod b/server/src/go.mod
similarity index 100%
rename from server/go.mod
rename to server/src/go.mod
diff --git a/server/go.sum b/server/src/go.sum
similarity index 100%
rename from server/go.sum
rename to server/src/go.sum
diff --git a/server/logging/logging.go b/server/src/logging/logging.go
similarity index 100%
rename from server/logging/logging.go
rename to server/src/logging/logging.go
diff --git a/server/server.go b/server/src/server.go
similarity index 97%
rename from server/server.go
rename to server/src/server.go
index 15de618..73df44a 100644
--- a/server/server.go
+++ b/server/src/server.go
@@ -30,7 +30,7 @@ func main() {
 	logger := logging.GetLogger()
 
 	if *configFile == "" {
-		logger.Fatalln("Please provide a configuration file")
+		logger.Fatalln("Provide a configuration file via --config")
 	}
 
 	data, err := os.ReadFile(*configFile)
@@ -96,6 +96,7 @@ func main() {
 						}
 					} else {
 						plaintext = buf[:n]
+						logger.Warningln("Got unencrypted message!")
 					}
 
 					forwardAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", dest.Address, dest.Port))
@@ -142,8 +143,6 @@ func main() {
 						return
 					}
 
-					//fmt.Println(string(backendResponse[:]))
-
 					// Encrypt the backend's response.
 					encryptedBackendResponse, err := encryption.Encrypt(key, backendResponse[:n])
 					if err != nil {
diff --git a/test/README.md b/server/test/README.md
similarity index 100%
rename from test/README.md
rename to server/test/README.md
diff --git a/test/test.py b/server/test/test.py
similarity index 100%
rename from test/test.py
rename to server/test/test.py
diff --git a/test/test_raw.py b/server/test/test_raw.py
similarity index 100%
rename from test/test_raw.py
rename to server/test/test_raw.py