Merge branch 'refactor' into main

Author: jvde-github

CMakeLists.txt

@@ -16,36 +16,30 @@ project(AIS-catcher)
 find_package(Git QUIET)
 
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-
-    set(GIT_VERSION_DESCRIBE "")
-
-    # First try to fetch tags (ignore errors if repo is already complete)
+    # For shallow clones, fetch enough history to reach a tag
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} fetch --prune --unshallow
+        COMMAND ${GIT_EXECUTABLE} fetch --deepen=200 --tags
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_FETCH_OUTPUT
-        ERROR_VARIABLE GIT_FETCH_ERROR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_QUIET
         ERROR_QUIET
-        RESULT_VARIABLE GIT_FETCH_RESULT
     )
-
-    # Now get the version using git describe
+    
+    # Get the version using git describe
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} describe --tags
+        COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_VERSION_DESCRIBE
         OUTPUT_STRIP_TRAILING_WHITESPACE
         RESULT_VARIABLE GIT_RESULT
-        ERROR_VARIABLE GIT_ERROR
+        ERROR_QUIET
     )
 
     if(GIT_VERSION_DESCRIBE)
         set(VERSION_DESCRIBE "${GIT_VERSION_DESCRIBE}")
         message(STATUS "Git version: ${VERSION_DESCRIBE}")
     else()
         set(VERSION_DESCRIBE "v0.00-1-unknown")
-        message(STATUS "All git describe methods failed, using fallback version: ${VERSION_DESCRIBE}")
+        message(STATUS "Git describe failed, using fallback version: ${VERSION_DESCRIBE}")
     endif()
 else()
     set(VERSION_DESCRIBE "v0.00-1-unknown")
@@ -159,7 +153,6 @@ endif()
 
 if(NOT MSVC AND NMEA2000)
 
-
     check_include_file("linux/can.h" HAVE_CAN_HEADER)
     check_include_file("linux/can/raw.h" HAVE_RAW_CAN_HEADER)
 
@@ -245,7 +238,6 @@ if(OPENSSL)
     endif()
 endif()
 
-
 # Find libcurl
 if(CURL)
     if(MSVC AND NOT MSVC_VCPKG)
@@ -884,7 +876,7 @@ set(CPP
     Source/Marine/N2K.cpp
     Source/Marine/NMEA.cpp
     Source/Library/Logger.cpp
-    Source/Library/TCP.cpp
+    Source/IO/TCPServer.cpp
     Source/Tracking/DB.cpp
     Source/Tracking/Ships.cpp
     Source/Utilities/Parse.cpp
@@ -899,7 +891,7 @@ set(HEADER
     Source/Application/AIS-catcher.h Source/Application/Prometheus.h Source/Application/Config.h Source/Application/DeviceManager.h Source/Application/WebDB.h Source/Library/Logger.h Source/Application/WebViewer.h Source/Application/Receiver.h Source/Tracking/Ships.h Source/Tracking/DB.h Source/DBMS/PostgreSQL.h Source/IO/HTTPClient.h Source/Application/MapTiles.h Source/Aviation/Beast.h
     Source/Device/Device.h Source/Device/FileWAV.h Source/Device/RTLTCP.h Source/Device/UDP.h Source/DSP/Demod.h Source/DSP/Filters.h Source/Marine/AIS.h Source/Marine/Message.h Source/Marine/NMEA.h Source/Library/ZIP.h Source/Library/Signals.h Source/Device/SoapySDR.h Source/JSON/JSONAIS.h Source/JSON/JSON.h Source/Aviation/Basestation.h Source/Aviation/ADSB.h
     Source/Device/AIRSPY.h Source/Library/FIFO.h Source/Device/N2KsktCAN.h Source/Device/HACKRF.h Source/Device/SDRPLAY.h Source/DSP/DSP.h Source/DSP/Model.h Source/Tracking/History.h Source/Tracking/Statistics.h Source/Library/Common.h Source/Library/Stream.h Source/Device/SpyServer.h Source/JSON/Keys.h Source/JSON/StringBuilder.h Source/JSON/Parser.h Source/Tracking/PlaneDB.h
-    Source/Device/Serial.h Source/IO/N2KInterface.h Source/Marine/N2K.h Source/IO/N2KStream.h Source/Device/AIRSPYHF.h Source/Device/FileRAW.h Source/Device/RTLSDR.h Source/Device/ZMQ.h Source/DSP/FFT.h Source/IO/MsgOut.h Source/IO/Screen.h Source/IO/File.h Source/IO/StreamCounter.h Source/IO/Network.h Source/IO/HTTPServer.h Source/Utilities/StreamHelpers.h Source/Library/TCP.h Source/IO/Protocol.h
+    Source/Device/Serial.h Source/IO/N2KInterface.h Source/Marine/N2K.h Source/IO/N2KStream.h Source/Device/AIRSPYHF.h Source/Device/FileRAW.h Source/Device/RTLSDR.h Source/Device/ZMQ.h Source/DSP/FFT.h Source/IO/MsgOut.h Source/IO/Screen.h Source/IO/File.h Source/IO/StreamCounter.h Source/IO/Network.h Source/IO/HTTPServer.h Source/Utilities/StreamHelpers.h Source/IO/TCPServer.h Source/IO/Protocol.h
     Source/Utilities/Parse.h Source/Utilities/Convert.h Source/Utilities/Helper.h Source/Utilities/Serialize.h Source/Utilities/PackedInt.h Source/Utilities/TemplateString.h)
 
 set(APP_INCLUDES . ./Source ./Source/Tracking ./Source/DBMS ./Source/Library ./Source/Marine ./Source/Aviation ./Source/DSP ./Source/Application ./Source/IO ./Source/JSON ./Source/Utilities)

Makefile

@@ -1,10 +1,10 @@
-SRC = Tracking/Ships.cpp Marine/N2K.cpp IO/N2KInterface.cpp Device/N2KsktCAN.cpp IO/N2KStream.cpp Application/Prometheus.cpp Application/Main.cpp Application/WebViewer.cpp Application/MapTiles.cpp IO/HTTPClient.cpp DBMS/PostgreSQL.cpp Tracking/DB.cpp Application/Config.cpp Application/DeviceManager.cpp Application/Receiver.cpp IO/HTTPServer.cpp DSP/DSP.cpp JSON/JSONAIS.cpp JSON/Parser.cpp JSON/StringBuilder.cpp JSON/Keys.cpp Marine/AIS.cpp IO/Network.cpp DSP/Model.cpp Marine/NMEA.cpp DSP/Demod.cpp Marine/Message.cpp Device/UDP.cpp Device/ZMQ.cpp Device/RTLSDR.cpp Device/AIRSPYHF.cpp Device/SoapySDR.cpp Device/AIRSPY.cpp Device/FileRAW.cpp Device/FileWAV.cpp Device/SDRPLAY.cpp Device/RTLTCP.cpp Device/HACKRF.cpp Device/Serial.cpp Library/TCP.cpp Device/SpyServer.cpp JSON/JSON.cpp IO/Protocol.cpp IO/MsgOut.cpp IO/Screen.cpp Library/Logger.cpp Aviation/Basestation.cpp  Application/WebDB.cpp Aviation/Beast.cpp Aviation/ADSB.cpp Utilities/Parse.cpp Utilities/Convert.cpp Utilities/Helper.cpp Utilities/Serialize.cpp Utilities/TemplateString.cpp Utilities/StreamHelpers.cpp
-OBJ = Ships.o Main.o N2KStream.o N2K.o N2KInterface.o N2KsktCAN.o Prometheus.o DeviceManager.o Receiver.o Config.o WebViewer.o MapTiles.o HTTPClient.o PostgreSQL.o DB.o DSP.o AIS.o Model.o Network.o Demod.o Serial.o RTLSDR.o HTTPServer.o AIRSPYHF.o Keys.o AIRSPY.o Parser.o StringBuilder.o FileRAW.o FileWAV.o SDRPLAY.o NMEA.o RTLTCP.o HACKRF.o ZMQ.o UDP.o SoapySDR.o TCP.o Message.o SpyServer.o JSON.o JSONAIS.o Protocol.o MsgOut.o Screen.o Logger.o Basestation.o WebDB.o Beast.o ADSB.o Parse.o Convert.o Helper.o Serialize.o TemplateString.o StreamHelpers.o
+SRC = Tracking/Ships.cpp Marine/N2K.cpp IO/N2KInterface.cpp Device/N2KsktCAN.cpp IO/N2KStream.cpp Application/Prometheus.cpp Application/Main.cpp Application/WebViewer.cpp Application/MapTiles.cpp IO/HTTPClient.cpp DBMS/PostgreSQL.cpp Tracking/DB.cpp Application/Config.cpp Application/DeviceManager.cpp Application/Receiver.cpp IO/HTTPServer.cpp DSP/DSP.cpp JSON/JSONAIS.cpp JSON/Parser.cpp JSON/StringBuilder.cpp JSON/Keys.cpp Marine/AIS.cpp IO/Network.cpp DSP/Model.cpp Marine/NMEA.cpp DSP/Demod.cpp Marine/Message.cpp Device/UDP.cpp Device/ZMQ.cpp Device/RTLSDR.cpp Device/AIRSPYHF.cpp Device/SoapySDR.cpp Device/AIRSPY.cpp Device/FileRAW.cpp Device/FileWAV.cpp Device/SDRPLAY.cpp Device/RTLTCP.cpp Device/HACKRF.cpp Device/Serial.cpp IO/TCPServer.cpp Device/SpyServer.cpp JSON/JSON.cpp IO/Protocol.cpp IO/MsgOut.cpp IO/Screen.cpp Library/Logger.cpp Aviation/Basestation.cpp  Application/WebDB.cpp Aviation/Beast.cpp Aviation/ADSB.cpp Utilities/Parse.cpp Utilities/Convert.cpp Utilities/Helper.cpp Utilities/Serialize.cpp Utilities/TemplateString.cpp Utilities/StreamHelpers.cpp
+OBJ = Ships.o Main.o N2KStream.o N2K.o N2KInterface.o N2KsktCAN.o Prometheus.o DeviceManager.o Receiver.o Config.o WebViewer.o MapTiles.o HTTPClient.o PostgreSQL.o DB.o DSP.o AIS.o Model.o Network.o Demod.o Serial.o RTLSDR.o HTTPServer.o AIRSPYHF.o Keys.o AIRSPY.o Parser.o StringBuilder.o FileRAW.o FileWAV.o SDRPLAY.o NMEA.o RTLTCP.o HACKRF.o ZMQ.o UDP.o SoapySDR.o TCPServer.o Message.o SpyServer.o JSON.o JSONAIS.o Protocol.o MsgOut.o Screen.o Logger.o Basestation.o WebDB.o Beast.o ADSB.o Parse.o Convert.o Helper.o Serialize.o TemplateString.o StreamHelpers.o
 INCLUDE = -I. -ISource -ISource/JSON/ -ISource/DBMS/ -ISource/Tracking/ -ISource/Library/ -ISource/Marine/ -ISource/Aviation/ -ISource/DSP/ -ISource/Application/ -ISource/IO/ -ISource/Utilities/ 
 CC = clang
 
 override CFLAGS +=  -Ofast -std=c++11 -g -pg -Wno-sign-compare $(INCLUDE)
-override LFLAGS += -lstdc++ -lpthread -g -pg -lm -o AIS-catcher
+override LFLAGS += -lstdc++ -lpthread -g -pg -lm  -o AIS-catcher
 
 CFLAGS_RTL = -DHASRTLSDR $(shell pkg-config --cflags librtlsdr)
 CFLAGS_AIRSPYHF = -DHASAIRSPYHF $(shell pkg-config --cflags libairspyhf)

Source/Application/Config.cpp

@@ -350,7 +350,7 @@ void Config::setSharing(const std::vector<JSON::Property> &props)
 		_msg.push_back(std::unique_ptr<IO::OutputMessage>(new IO::TCPClientStreamer()));
 		commm_feed = _msg.back().get();
 
-		commm_feed->Set("HOST", AISCATCHER_URL).Set("PORT", AISCATCHER_PORT).Set("JSON", "on").Set("FILTER", "on").Set("GPS", "off").Set("REMOVE_EMPTY","on").Set("KEEP_ALIVE", "on").Set("DOWNSAMPLE", "on").Set("INCLUDE_SAMPLE_START", "on");
+		commm_feed->Set("HOST", AISCATCHER_URL).Set("PORT", AISCATCHER_PORT).Set("MSGFORMAT", "COMMUNITY_HUB").Set("FILTER", "on").Set("GPS", "off").Set("REMOVE_EMPTY","on").Set("KEEP_ALIVE", "on").Set("DOWNSAMPLE", "on").Set("INCLUDE_SAMPLE_START", "on");
 	}
 	if (!uuid.empty() && commm_feed)
 		commm_feed->Set("UUID", uuid);

Source/Application/Prometheus.cpp

@@ -34,12 +34,14 @@ const std::string ShippingClassNames[] = {
 	"Search and Rescue Transponder EPIRB" // CLASS_SARTEPIRB
 };
 
-PromotheusCounter::PromotheusCounter() {
+PromotheusCounter::PromotheusCounter()
+{
 	Reset();
 	Clear();
 }
 
-void PromotheusCounter::Clear() {
+void PromotheusCounter::Clear()
+{
 
 	m.lock();
 	std::memset(_msg, 0, sizeof(_msg));
@@ -51,10 +53,13 @@ void PromotheusCounter::Clear() {
 	m.unlock();
 }
 
-void PromotheusCounter::Add(const AIS::Message& m, const TAG& tag, bool new_vessel) {
+void PromotheusCounter::Add(const AIS::Message &m, const TAG &tag, bool new_vessel)
+{
 
-	if (m.type() > 27 || m.type() < 1) return;
-	if (tag.shipclass < 0 || tag.shipclass > 13) return;
+	if (m.type() > 27 || m.type() < 1)
+		return;
+	if (tag.shipclass < 0 || tag.shipclass > 13)
+		return;
 
 	std::string speed = tag.speed < 0 ? "Unknown" : (tag.speed > 0.5 ? "Moving" : "Stationary");
 
@@ -67,19 +72,21 @@ void PromotheusCounter::Add(const AIS::Message& m, const TAG& tag, bool new_vess
 	_count++;
 	_msg[m.type() - 1]++;
 
-
-	if (m.getChannel() >= 'A' || m.getChannel() <= 'D')
+	if (m.getChannel() >= 'A' && m.getChannel() <= 'D')
 		_channel[m.getChannel() - 'A']++;
 
-	if (tag.distance > _distance) {
+	if (tag.distance > _distance)
+	{
 		_distance = tag.distance;
 	}
 }
 
-void PromotheusCounter::Receive(const JSON::JSON* json, int len, TAG& tag) {
-	AIS::Message& data = *((AIS::Message*)json[0].binary);
+void PromotheusCounter::Receive(const JSON::JSON *json, int len, TAG &tag)
+{
+	AIS::Message &data = *((AIS::Message *)json[0].binary);
 
-	if (ppm.size() > 32768 || level.size() > 32768) {
+	if (ppm.size() > 32768 || level.size() > 32768)
+	{
 		return;
 	}
 
@@ -90,14 +97,16 @@ void PromotheusCounter::Receive(const JSON::JSON* json, int len, TAG& tag) {
 	m.unlock();
 }
 
-void PromotheusCounter::Reset() {
+void PromotheusCounter::Reset()
+{
 	m.lock();
 	ppm = "# HELP ais_msg_ppm\n# TYPE ais_msg_ppm gauge\n";
 	level = "# HELP ais_msg_level\n# TYPE ais_msg_level gauge\n";
 	m.unlock();
 }
 
-std::string PromotheusCounter::toPrometheus() {
+std::string PromotheusCounter::toPrometheus()
+{
 	m.lock();
 	std::string element;
 
@@ -109,14 +118,16 @@ std::string PromotheusCounter::toPrometheus() {
 	element += "# TYPE ais_stat_distance gauge\n";
 	element += "ais_stat_distance " + std::to_string(_distance) + "\n";
 
-	for (int i = 0; i < 4; i++) {
+	for (int i = 0; i < 4; i++)
+	{
 		std::string ch(1, i + 'A');
 		element += "# HELP ais_stat_count_channel_" + ch + " Total number of messages on channel " + ch + "\n";
 		element += "# TYPE ais_stat_count_channel_" + ch + " counter\n";
 		element += "ais_stat_count_channel_" + ch + " " + std::to_string(_channel[i]) + "\n";
 	}
 
-	for (int i = 0; i < 27; i++) {
+	for (int i = 0; i < 27; i++)
+	{
 		std::string type = std::to_string(i + 1);
 		element += "# HELP ais_stat_count_type_" + type + " Total number of messages of type " + type + "\n";
 		element += "# TYPE ais_stat_count_type_" + type + " counter\n";

Source/Application/WebViewer.cpp

@@ -376,15 +376,16 @@ void WebViewer::connect(Receiver &r)
 	for (int j = 0; j < r.Count(); j++)
 		if (r.Output(j).canConnect(groups_in))
 		{
-		if (!rec_details)
-		{
-			auto* device = r.getDeviceManager().getDevice();
+			if (!rec_details)
+			{
+				auto *device = r.getDeviceManager().getDevice();
 
-			sample_rate += device->getRateDescription() + "<br>";
+				sample_rate += device->getRateDescription() + "<br>";
 
-			JSON::StringBuilder::stringify(device->getProduct(), product, false);
-			JSON::StringBuilder::stringify(device->getVendor().empty() ? "-" : device->getVendor(), vendor, false);
-			JSON::StringBuilder::stringify(device->getSerial().empty() ? "-" : device->getSerial(), serial, false);				product += newline;
+				JSON::StringBuilder::stringify(device->getProduct(), product, false);
+				JSON::StringBuilder::stringify(device->getVendor().empty() ? "-" : device->getVendor(), vendor, false);
+				JSON::StringBuilder::stringify(device->getSerial().empty() ? "-" : device->getSerial(), serial, false);
+				product += newline;
 				vendor += newline;
 				serial += newline;
 
@@ -514,7 +515,7 @@ void WebViewer::close()
 	}
 }
 
-void WebViewer::Request(TCP::ServerConnection &c, const std::string &response, bool gzip)
+void WebViewer::Request(IO::TCPServerConnection &c, const std::string &response, bool gzip)
 {
 
 	std::string r;
@@ -718,9 +719,17 @@ void WebViewer::Request(TCP::ServerConnection &c, const std::string &response, b
 		std::stringstream ss(a);
 		std::string mmsi_str;
 		std::string content = "{";
+		int count = 0;
+		const int MAX_MMSI_COUNT = 100; // Limit number of MMSIs to prevent DoS
 
 		while (std::getline(ss, mmsi_str, ','))
 		{
+			if (++count > MAX_MMSI_COUNT)
+			{
+				Error() << "Server - path MMSI count exceeds limit: " << MAX_MMSI_COUNT;
+				break;
+			}
+
 			try
 			{
 				int mmsi = std::stoi(mmsi_str);
@@ -816,8 +825,8 @@ void WebViewer::Request(TCP::ServerConnection &c, const std::string &response, b
 	{
 		try
 		{
-			if (a.size() > 1024)
-				throw std::runtime_error("Input too large");
+			if (a.empty() || a.size() > 1024)
+				throw std::runtime_error("Input size limit exceeded");
 
 			std::string result = decodeNMEAtoJSON(a, true);
 

Source/Application/WebViewer.h

@@ -185,7 +185,7 @@ class WebViewer : public IO::HTTPServer, public Setting
 
 	bool isPortSet() { return port_set; }
 	// HTTP callbacks
-	void Request(TCP::ServerConnection &c, const std::string &r, bool gzip);
+	void Request(IO::TCPServerConnection &c, const std::string &r, bool gzip);
 
 	Setting &Set(std::string option, std::string arg);
 	std::string Get() { return ""; }

Source/Device/AIRSPY.cpp

@@ -210,7 +210,8 @@ namespace Device
 				for (j = 5; j >= 0; j--)
 					if ((r820t_hf[j] - r820t_lf[i]) <= tuner_bandwidth)
 						break;
-				j++;
+				if (j < 5)
+					j++;
 
 				airspy_r820t_write(dev, 10, 0xB0 | (15 - j));
 				airspy_r820t_write(dev, 11, 0xE0 | (15 - i));

Source/Device/RTLSDR.cpp

@@ -197,11 +197,11 @@ namespace Device
 			throw std::runtime_error("RTLSDR: cannot set gain mode.");
 
 		int nGains = rtlsdr_get_tuner_gains(dev, nullptr);
-		if (nGains <= 0)
-			throw std::runtime_error("RTLSDR: no gains available");
+		if (nGains <= 0 || nGains > 1000)
+			throw std::runtime_error("RTLSDR: cannot get tuner gains.");
 
 		std::vector<int> gains(nGains);
-		nGains = rtlsdr_get_tuner_gains(dev, gains.data());
+		rtlsdr_get_tuner_gains(dev, gains.data());
 
 		int gain = gains[0];