Merge branch 'master' into v3.1.0

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ defaults:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral

.github/workflows/release.yml

@@ -11,7 +11,7 @@ defaults:
 
 jobs:
   helm-package:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
       HELM_REPO_USERNAME: ucentral

.gitignore

@@ -29,4 +29,4 @@ helm/charts/*
 !helm/charts/.gitkeep
 /portal-test/
 /src/ow_version.h
-.vscode/*
+

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owgw VERSION 4.2.0)
+project(owgw VERSION 3.1.0)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)

Dockerfile

@@ -1,7 +1,7 @@
-ARG DEBIAN_VERSION=bookworm
-ARG POCO_VERSION=poco-tip-v4-tag
+ARG DEBIAN_VERSION=11.5-slim
+ARG POCO_VERSION=poco-tip-v2
 ARG CPPKAFKA_VERSION=tip-v1
-ARG VALIJASON_VERSION=tip-v1.0.2
+ARG VALIJASON_VERSION=tip-v1
 ARG APP_NAME=owgw
 ARG APP_HOME_DIR=/openwifi
 
@@ -100,7 +100,7 @@ RUN mkdir -p $APP_ROOT $APP_CONFIG && \
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
-    libmariadb-dev-compat libpq5 unixodbc postgresql-client libfmt9 sqlite3
+    libmariadb-dev-compat libpq5 unixodbc postgresql-client libfmt7 sqlite3
 
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli

PROTOCOL.md

@@ -306,54 +306,8 @@ The device should answer:
          },
      "id" : <same number>
 }
-```
-
-#### Controller wants the device to apply a given fixed configuration
-
-Controller sends this command when it requires the device to apply fixed configuration, eg. country code. The device
-should respond with message indicating failure or success.
-
-```json
-{   "jsonrpc" : "2.0",
-    "method" : "fixedconfig",
-    "params" : {
-        "serial" : <serial number>,
-        "when" : Optional - <UTC time when to apply this config, 0 means immediate, this is a suggestion>
-        "country" : "<country-code>"
-     },
-}
-```
-
-If AP supports compressed configuration feature by inidcating `compress_cmd=true` in its capabilities, controller
-will send a compressed configuration message where configuration payload (i.e. contents of `params`) is compressed
-and encoded in base64 format:
-```json
-{   "jsonrpc" : "2.0",
-    "method" : "configure",
-    "params" : {
-        "compress_64" : "<b64 encoded zlib compressed payload>",
-        "compress_sz" : "<size of uncompressed data in bytes>"
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{   "jsonrpc" : "2.0",
-    "result" : {
-        "serial": <serial number>,
-        "status": {
-            "error": 0 or an error number,
-            "text": <description of the error or success, eg. "Applied fixed config, rebooting">
-        },
-        "uuid": <UUID>
-    }
-}
 
 ```
-
-
 ##### The Answer
 The device can answer and tell the controller it has rejected certain parts of the config and potentially replaced them with
 appropriate values. This could be used to allow a device to replace frequencies for the regions it is located in. The device 
@@ -880,32 +834,6 @@ The device should answer:
 }
 ```
 
-#### Controller wants the device to perform re-enrollment
-Controller sends this command to trigger re-enrollment, i.e. update of operational certificate. Extreme care must be taken.
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "reenroll" , 
-     "params" : {
-        "serial" : <serial number>,
-        "when" : Optional - <UTC time when to apply this config, 0 mean immediate, this is a suggestion>
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
 #### Controller wants the device to switch to another controller
 Controller sends this when the device should change the controller it connects to without looking up a new redirector.
 

docker-entrypoint.sh

@@ -32,7 +32,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     FILEUPLOADER_HOST_KEY_PASSWORD=${FILEUPLOADER_HOST_KEY_PASSWORD:-"mypassword"} \
     FILEUPLOADER_PATH=${FILEUPLOADER_PATH:-"\${APP_ROOT}/uploads"} \
     FILEUPLOADER_URI=${FILEUPLOADER_URI:-"https://localhost:16003"} \
-    FILEUPLOADER_MAXSIZE=${FILEUPLOADER_MAXSIZE:-"10000"} \
     SERVICE_KEY=${SERVICE_KEY:-"\${APP_ROOT}/certs/restapi-key.pem"} \
     SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
     SYSTEM_DATA=${SYSTEM_DATA:-"\${APP_ROOT}/data"} \
@@ -77,7 +76,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
     CERTIFICATES_ALLOWMISMATCH=${CERTIFICATES_ALLOWMISMATCH:-"false"} \
     IPINFO_DEFAULT_COUNTRY=${IPINFO_DEFAULT_COUNTRY:-"US"} \
     DEVICE_SESSION_TIMEOUT=${DEVICE_SESSION_TIMEOUT:-"600"} \
-    LOGGING_LEVEL=${LOGGING_LEVEL:-"information"} \
     envsubst < /"${APP_NAME}".properties.tmpl > "${APP_CONFIG}"/"${APP_NAME}".properties
 fi
 

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owgw:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: master
+    tag: v3.1.0
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

openapi/owgw.yaml

@@ -12,7 +12,7 @@ info:
     url: https://www.ucentral.info/support
 
 servers:
-  - url: 'https://localhost:16002/api/v1'
+  - url: 'https://localhost:16001/api/v1'
 
 security:
   - bearerAuth: []
@@ -1576,15 +1576,6 @@ components:
           format: base64
           description: This is a base64 encoded string of the certificate bundle (the current bundle .tar.gz file from the PKI portal)
 
-    ReenrollRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        when:
-          type: integer
-          format: int64
-
     PowerCycleRequest:
       type: object
       properties:
@@ -1609,74 +1600,6 @@ components:
                 maximum: 60000
                 description: off time in milliseconds
 
-    PackageGetResponse:
-      type: object
-      properties:
-        serial:
-          type: string
-        status:
-          type: object
-          properties:
-            package:
-              type: string
-            text:
-              type: string
-        uuid:
-          type: number
-
-
-    PackageInstallRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        packages:
-          type: array
-          items:
-            type: object
-            properties:
-              name:
-                type: string
-              url:
-                type: string
-    
-    PackageInstallResponse:
-      type: object
-      properties:
-        serial:
-          type: string
-        status:
-          type: object
-          properties:
-            error:
-              type: number
-            packages:
-              type: array
-              items:
-                type: object
-                properties:
-                  name:
-                    type: string
-                  result:
-                    type: string
-            text:
-              type: string
-        uuid:
-          type: number
-
-    PackageRemoveRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        packages: 
-          type: array
-          items:
-            type: object
-            properties:
-              name:
-                type: string
-
 paths:
   /devices:
     get:
@@ -3133,32 +3056,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /device/{serialNumber}/reenroll:
-    post:
-      tags:
-        - Commands
-      summary: Reenroll operational certificate for the device.
-      operationId: reenrollCertificate
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Reenroll operational certificate for the device
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ReenrollRequest'
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
   /device/{serialNumber}/powercycle:
     post:
       tags:
@@ -3187,98 +3084,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /device/{serialNumber}/package:
-    get:
-      tags:
-        - Commands
-      summary: Get package installed on the remote device.
-      operationId: getDevicePackages
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-        - in: query
-          name: pkgName
-          schema:
-            type: string
-          required: true
-          description: The name or identifier of the package to retrieve.
-      responses:
-        200:
-          description: Successful command execution
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PackageGetResponse'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    post:
-      tags:
-        - Commands
-      summary: Install IPK files to remote device.
-      operationId: postDevicePackages
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Packages to be installed
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PackageInstallRequest'
-      responses:
-        200:
-          description: Successful command execution
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PackageInstallResponse'
-
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    delete:
-      tags:
-        - Commands
-      summary: Remove install packages from remote device.
-      operationId: deleteDevicePackages
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Packages to be removed
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/PackageRemoveRequest'
-      responses:
-        200:
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PackageInstallResponse'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
   /ouis:
     get:
       tags:

owgw.properties.tmpl

@@ -52,8 +52,7 @@ openwifi.fileuploader.host.0.cert = ${FILEUPLOADER_HOST_CERT}
 openwifi.fileuploader.host.0.key = ${FILEUPLOADER_HOST_KEY}
 openwifi.fileuploader.host.0.key.password = ${FILEUPLOADER_HOST_KEY_PASSWORD}
 openwifi.fileuploader.path = ${FILEUPLOADER_PATH}
-# maxsize in KB
-openwifi.fileuploader.maxsize = ${FILEUPLOADER_MAXSIZE}
+openwifi.fileuploader.maxsize = 10000
 openwifi.fileuploader.uri = ${FILEUPLOADER_URI}
 
 #
@@ -183,4 +182,4 @@ archiver.db.3.keep = 7
 ########################################################################
 logging.type = console
 logging.path = $OWGW_ROOT/logs
-logging.level = ${LOGGING_LEVEL}
+logging.level = information

src/AP_WS_Connection.cpp

@@ -7,7 +7,6 @@
 #include <Poco/Net/Context.h>
 #include <Poco/Net/HTTPServerRequestImpl.h>
 #include <Poco/Net/HTTPServerResponseImpl.h>
-#include <Poco/JSON/JSONException.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/SSLException.h>
 #include <Poco/Net/SecureStreamSocketImpl.h>
@@ -40,7 +39,7 @@ namespace OpenWifi {
 									   Poco::Net::HTTPServerResponse &response,
 									   uint64_t session_id, Poco::Logger &L,
 									   std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> R)
-		: Logger_(L), IncomingFrame_(0) {
+		: Logger_(L) {
 
 		Reactor_ = R.first;
 		DbSession_ = R.second;
@@ -55,7 +54,6 @@ namespace OpenWifi {
 		WS_->setNoDelay(false);
 		WS_->setKeepAlive(true);
 		WS_->setBlocking(false);
-		IncomingFrame_.resize(0);
 		uuid_ = MicroServiceRandom(std::numeric_limits<std::uint64_t>::max()-1);
 
 		AP_WS_Server()->IncrementConnectionCount();
@@ -215,7 +213,6 @@ namespace OpenWifi {
 			}
 
 			State_.certificateExpiryDate = PeerCert.expiresOn().timestamp().epochTime();
-			State_.certificateIssuerName = PeerCert.issuerName();
 
 			poco_trace(Logger_,
 					   fmt::format("TLS-CONNECTION({}): Session={} CN={} Completed. (t={})", CId_,
@@ -602,95 +599,36 @@ namespace OpenWifi {
 		EndConnection();
 	}
 
-	void AP_WS_Connection::ProcessWSFinalPayload() {
-		auto IncomingSize = IncomingFrame_.size();
-
-		if (IncomingSize == 0) {
-			poco_debug(Logger_,
-						 fmt::format("ProcessWSFrame({}): Final Acc. Frame received but empty",
-									 CId_));
-			return;
-		}
-		IncomingFrame_.append(0);
-
-		poco_trace(Logger_,
-				   fmt::format("ProcessWSFrame({}): Final Acc. Frame received (len={}, Msg={}",
-							   CId_, IncomingSize, IncomingFrame_.begin()));
-
-		Poco::JSON::Parser parser;
-		auto ParsedMessage = parser.parse(IncomingFrame_.begin());
-		auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();
-
-		if (IncomingJSON->has(uCentralProtocol::JSONRPC)) {
-			if (IncomingJSON->has(uCentralProtocol::METHOD) &&
-				IncomingJSON->has(uCentralProtocol::PARAMS)) {
-				ProcessJSONRPCEvent(IncomingJSON);
-			} else if (IncomingJSON->has(uCentralProtocol::RESULT) &&
-					   IncomingJSON->has(uCentralProtocol::ID)) {
-				poco_trace(Logger_, fmt::format("RPC-RESULT({}): payload: {}", CId_,
-												IncomingFrame_.begin()));
-				ProcessJSONRPCResult(IncomingJSON);
-			} else {
-				poco_warning(
-					Logger_,
-					fmt::format("INVALID-PAYLOAD({}): Payload is not JSON-RPC 2.0: {}",
-								CId_, IncomingFrame_.begin()));
-			}
-		} else if (IncomingJSON->has(uCentralProtocol::RADIUS)) {
-			ProcessIncomingRadiusData(IncomingJSON);
-		} else {
-			std::ostringstream iS;
-			IncomingJSON->stringify(iS);
-			poco_warning(
-				Logger_,
-				fmt::format("FRAME({}): illegal transaction header, missing 'jsonrpc': {}",
-							CId_, iS.str()));
-			Errors_++;
-		}
-		IncomingFrame_.clear();
-		IncomingFrame_.resize(0);
-	}
-
 	void AP_WS_Connection::ProcessIncomingFrame() {
-		Poco::Buffer<char> CurrentFrame(0);
-		bool KillConnection = false;
-		int flags = 0;
-		int IncomingSize = 0;
+		Poco::Buffer<char> IncomingFrame(0);
 
+		bool	KillConnection=false;
 		try {
-			IncomingSize = WS_->receiveFrame(CurrentFrame, flags);
-			int Op;
+			int 	Op, flags;
+			auto IncomingSize = WS_->receiveFrame(IncomingFrame, flags);
 
 			Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
 
-			if (IncomingSize < 0 && flags == 0) {
-				poco_trace(Logger_,
-					fmt::format("EMPTY({}): Non-blocking try-again empty frame (len={}, flags={})",
-							   CId_, IncomingSize, flags));
-            } else if (IncomingSize == 0 && flags == 0) {
+			if (IncomingSize == 0 && flags == 0 && Op == 0) {
 				poco_information(Logger_,
 								 fmt::format("DISCONNECT({}): device has disconnected. Session={}",
 											 CId_, State_.sessionId));
 				return EndConnection();
 			}
 
-			if (IncomingSize > 0) {
-				State_.RX += IncomingSize;
-				AP_WS_Server()->AddRX(IncomingSize);
-				IncomingFrame_.append(CurrentFrame);
-			}
+			IncomingFrame.append(0);
+
+			State_.RX += IncomingSize;
+			AP_WS_Server()->AddRX(IncomingSize);
 			State_.MessageCount++;
 			State_.LastContact = Utils::Now();
-			poco_trace(Logger_,
-					   fmt::format("FRAME({}): Frame rx (op={} len={}, flags={}, acc.len={})",
-								   CId_, Op, IncomingSize, flags, IncomingFrame_.size()));
 
 			switch (Op) {
 				case Poco::Net::WebSocket::FRAME_OP_PING: {
-					poco_trace(Logger_, fmt::format("PING({}): received. PONG sent back.", CId_));
+					poco_trace(Logger_, fmt::format("WS-PING({}): received. PONG sent back.", CId_));
 					WS_->sendFrame("", 0,
 								   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+									   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
 
 					if (KafkaManager()->Enabled()) {
 						Poco::JSON::Object PingObject;
@@ -704,32 +642,49 @@ namespace OpenWifi {
 						PingDetails.set("locale", State_.locale);
 						PingObject.set(uCentralProtocol::PING, PingDetails);
 						poco_trace(Logger_,fmt::format("Sending PING for {}", SerialNumber_));
-						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_,
-													PingObject);
+						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_,PingObject);
 					}
-					return;
 				} break;
 
 				case Poco::Net::WebSocket::FRAME_OP_PONG: {
 					poco_trace(Logger_, fmt::format("PONG({}): received and ignored.", CId_));
-					return;
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_CONT: {
-					poco_trace(Logger_, fmt::format("CONTINUATION({}): registered.", CId_));
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_BINARY: {
-					poco_trace(Logger_, fmt::format("BINARY({}): Invalid frame type.", CId_));
-					KillConnection=true;
-					return;
 				} break;
 
 				case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 					poco_trace(Logger_,
-							   fmt::format("TEXT({}): Frame received (len={}, flags={}). Msg={}",
-										   CId_, IncomingSize, flags,
-										   CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin()));
+							   fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}",
+										   CId_, IncomingSize, flags, IncomingFrame.begin()));
+
+					Poco::JSON::Parser parser;
+					auto ParsedMessage = parser.parse(IncomingFrame.begin());
+					auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();
+
+					if (IncomingJSON->has(uCentralProtocol::JSONRPC)) {
+						if (IncomingJSON->has(uCentralProtocol::METHOD) &&
+							IncomingJSON->has(uCentralProtocol::PARAMS)) {
+							ProcessJSONRPCEvent(IncomingJSON);
+						} else if (IncomingJSON->has(uCentralProtocol::RESULT) &&
+								   IncomingJSON->has(uCentralProtocol::ID)) {
+							poco_trace(Logger_, fmt::format("RPC-RESULT({}): payload: {}", CId_,
+															IncomingFrame.begin()));
+							ProcessJSONRPCResult(IncomingJSON);
+						} else {
+							poco_warning(
+								Logger_,
+								fmt::format("INVALID-PAYLOAD({}): Payload is not JSON-RPC 2.0: {}",
+											CId_, IncomingFrame.begin()));
+						}
+					} else if (IncomingJSON->has(uCentralProtocol::RADIUS)) {
+						ProcessIncomingRadiusData(IncomingJSON);
+					} else {
+						std::ostringstream iS;
+						IncomingJSON->stringify(iS);
+						poco_warning(
+							Logger_,
+							fmt::format("FRAME({}): illegal transaction header, missing 'jsonrpc': {}",
+										CId_, iS.str()));
+						Errors_++;
+					}
 				} break;
 
 				case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
@@ -745,31 +700,25 @@ namespace OpenWifi {
 					return;
 				}
 			}
-
-			// Check for final frame and process accumulated payload
-			if (!KillConnection && (flags & Poco::Net::WebSocket::FRAME_FLAG_FIN) != 0) {
-				ProcessWSFinalPayload();
-			}
-
 		} catch (const Poco::Net::ConnectionResetException &E) {
 			poco_warning(Logger_,
 						 fmt::format("ConnectionResetException({}): Text:{} Payload:{} Session:{}",
 									 CId_, E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::JSON::JSONException &E) {
 			poco_warning(Logger_,
 						 fmt::format("JSONException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::Net::WebSocketException &E) {
 			poco_warning(Logger_,
 						 fmt::format("WebSocketException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::Net::SSLConnectionUnexpectedlyClosedException &E) {
@@ -778,42 +727,42 @@ namespace OpenWifi {
 				fmt::format(
 					"SSLConnectionUnexpectedlyClosedException({}): Text:{} Payload:{} Session:{}",
 					CId_, E.displayText(),
-					CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+					IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 					State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::Net::SSLException &E) {
 			poco_warning(Logger_,
 						 fmt::format("SSLException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::Net::NetException &E) {
 			poco_warning(Logger_,
 						 fmt::format("NetException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::IOException &E) {
 			poco_warning(Logger_,
 						 fmt::format("IOException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger_,
 						 fmt::format("Exception({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (const std::exception &E) {
 			poco_warning(Logger_,
 						 fmt::format("std::exception({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.what(),
-									 CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin(),
+									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
 			KillConnection=true;
 		} catch (...) {
@@ -826,9 +775,7 @@ namespace OpenWifi {
 		if (!KillConnection && Errors_ < 10)
 			return;
 
-		poco_warning(Logger_,
-				fmt::format("DISCONNECTING({}): ConnectionException: {} Errors: {}",
-							CId_, KillConnection, Errors_ ));
+		poco_warning(Logger_, fmt::format("DISCONNECTING({}): ConnectionException: {} Errors: {}", CId_, KillConnection, Errors_ ));
 		EndConnection();
 	}
 
@@ -973,4 +920,4 @@ namespace OpenWifi {
 		}
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/AP_WS_Connection.h

@@ -22,7 +22,7 @@
 namespace OpenWifi {
 
 	class AP_WS_Connection {
-		static constexpr int BufSize = 512000;
+		static constexpr int BufSize = 256000;
 
 	  public:
 		explicit AP_WS_Connection(Poco::Net::HTTPServerRequest &request,
@@ -33,7 +33,6 @@ namespace OpenWifi {
 		void EndConnection();
 		void ProcessJSONRPCEvent(Poco::JSON::Object::Ptr &Doc);
 		void ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc);
-        void ProcessWSFinalPayload();
 		void ProcessIncomingFrame();
 		void ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc);
 
@@ -146,7 +145,6 @@ namespace OpenWifi {
 		std::uint64_t 	uuid_=0;
 		bool	Simulated_=false;
 		std::atomic_uint64_t 	LastContact_=0;
-		Poco::Buffer<char> IncomingFrame_;
 
 		static inline std::atomic_uint64_t ConcurrentStartingDevices_ = 0;
 
@@ -177,4 +175,4 @@ namespace OpenWifi {
 
 	};
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/AP_WS_Process_connect.cpp

@@ -105,7 +105,7 @@ namespace OpenWifi {
 				Restrictions_.developer = Capabilities->getValue<bool>("developer");
 			}
 
-			if (Capabilities->has("secure-rtty")) {
+			if(Capabilities->has("secure-rtty")) {
 				RTTYMustBeSecure_ = Capabilities->getValue<bool>("secure-rtty");
 			}
 

src/AP_WS_Server.cpp

@@ -71,18 +71,14 @@ namespace OpenWifi {
 	bool AP_WS_Server::ValidateCertificate(const std::string &ConnectionId,
 										   const Poco::Crypto::X509Certificate &Certificate) {
 		if (IsCertOk()) {
-			// validate certificate agains trusted chain
-			for (const auto &cert : ClientCasCerts_) {
-				if (Certificate.issuedBy(cert)) {
-					return true;
-				}
-			}
-			poco_warning(
+			if (!Certificate.issuedBy(*IssuerCert_)) {
+				poco_warning(
 					Logger(),
-					fmt::format(
-						"CERTIFICATE({}): issuer mismatch. Certificate not issued by any trusted CA",
-						ConnectionId)
-					);
+					fmt::format("CERTIFICATE({}): issuer mismatch. Local='{}' Incoming='{}'",
+								ConnectionId, IssuerCert_->issuerName(), Certificate.issuerName()));
+				return false;
+			}
+			return true;
 		}
 		return false;
 	}
@@ -120,6 +116,7 @@ namespace OpenWifi {
 			P.verificationDepth = 9;
 			P.loadDefaultCAs = Svr.RootCA().empty();
 			P.cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
+			P.dhUse2048Bits = true;
 			P.caLocation = Svr.Cas();
 
 			auto Context = Poco::AutoPtr<Poco::Net::Context>(
@@ -136,13 +133,6 @@ namespace OpenWifi {
 			Context->addChainCertificate(Issuing);
 			Context->addCertificateAuthority(Issuing);
 
-			// add certificates from clientcas to trust chain
-			ClientCasCerts_ = Poco::Net::X509Certificate::readPEM(Svr.ClientCas());
-			for (const auto &cert : ClientCasCerts_) {
-				Context->addChainCertificate(cert);
-				Context->addCertificateAuthority(cert);
-			}
-
 			Poco::Crypto::RSAKey Key("", Svr.KeyFile(), Svr.KeyFilePassword());
 			Context->usePrivateKey(Key);
 
@@ -794,4 +784,4 @@ namespace OpenWifi {
 		return false;
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/AP_WS_Server.h

@@ -223,7 +223,6 @@ namespace OpenWifi {
 		mutable std::array<std::mutex,MACHashMax>		SerialNumbersMutex_;
 
 		std::unique_ptr<Poco::Crypto::X509Certificate> IssuerCert_;
-		std::vector<Poco::Crypto::X509Certificate> ClientCasCerts_;
 		std::list<std::unique_ptr<Poco::Net::HTTPServer>> WebServers_;
 		Poco::ThreadPool DeviceConnectionPool_{"ws:dev-pool", 4, 256};
 		Poco::Net::SocketReactor Reactor_;

src/CapabilitiesCache.h

@@ -111,7 +111,7 @@ namespace OpenWifi {
 				i >> cache;
 
 				for (const auto &[Type, Platform] : cache.items()) {
-					Platforms_[Type] = Poco::toLower(Platform.get<std::string>());
+					Platforms_[Type] = Poco::toLower(to_string(Platform));
 				}
 			} catch (...) {
 			}

src/FileUploader.cpp

@@ -315,4 +315,4 @@ namespace OpenWifi {
 		poco_notice(Logger(), "Stopped...");
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/RESTAPI/RESTAPI_RPC.cpp

@@ -25,23 +25,9 @@ namespace OpenWifi::RESTAPI_RPC {
 		if (StorageService()->AddCommand(Cmd.SerialNumber, Cmd, Status)) {
 			Poco::JSON::Object RetObj;
 			Cmd.to_json(RetObj);
-			if (Handler == nullptr) {
-				// nothing to process/return
-				return;
-			}
-			Poco::Net::HTTPResponse::HTTPStatus cmd_status = Poco::Net::HTTPResponse::HTTP_OK;
-            if (Cmd.ErrorCode > 0) {
-				// command returned error
-				cmd_status = Poco::Net::HTTPResponse::HTTP_BAD_REQUEST;
-				if (Cmd.Command == uCentralProtocol::CONFIGURE) {
-					// special handling for configure command
-					if (!Handler->GetBoolParameter("strict", false)) {
-						// in non-strict mode return success for failed configure command
-						cmd_status = Poco::Net::HTTPResponse::HTTP_OK;
-					}
-				}
-			}
-			return Handler->ReturnObject(RetObj, cmd_status);
+			if (Handler != nullptr)
+				return Handler->ReturnObject(RetObj);
+			return;
 		}
 		if (Handler != nullptr)
 			return Handler->ReturnStatus(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
@@ -54,8 +40,8 @@ namespace OpenWifi::RESTAPI_RPC {
 						std::chrono::milliseconds WaitTimeInMs, Poco::JSON::Object *ObjectToReturn,
 						RESTAPIHandler *Handler, Poco::Logger &Logger, bool Deferred) {
 
-		Logger.information(fmt::format("{},{}: New {} command. User={} Serial={} Details={}. ", Cmd.UUID,
-									   RPCID, Cmd.Command, Cmd.SubmittedBy, Cmd.SerialNumber, Cmd.Details));
+		Logger.information(fmt::format("{},{}: New {} command. User={} Serial={}. ", Cmd.UUID,
+									   RPCID, Cmd.Command, Cmd.SubmittedBy, Cmd.SerialNumber));
 		Cmd.Submitted = Utils::Now();
 		Cmd.Executed = 0;
 
@@ -181,20 +167,6 @@ namespace OpenWifi::RESTAPI_RPC {
 				Cmd.AttachType = "";
 			}
 
-			// If the command fails on the device we should show it as failed and not return 200 OK
-			// exception is configure command which only reported failed in strict validation mode
-			if (Cmd.ErrorCode &&
-				(Cmd.Command != uCentralProtocol::CONFIGURE ||
-					(Cmd.Command == uCentralProtocol::CONFIGURE && Handler->GetBoolParameter("strict", false))
-				))
-			{
-				Logger.information(fmt::format(
-				"Command failed with error on device: {}  Reason: {}.",
-				Cmd.ErrorCode, Cmd.ErrorText));
-				return SetCommandStatus(Cmd, Request, Response, Handler,
-								Storage::CommandExecutionType::COMMAND_FAILED, Logger);
-			}
-
 			if (Cmd.ErrorCode == 0 && Cmd.Command == uCentralProtocol::CONFIGURE) {
 				//	we need to post a kafka event for this.
 				if (Params.has(uCentralProtocol::CONFIG) && Params.isObject(uCentralProtocol::CONFIG)) {
@@ -203,7 +175,6 @@ namespace OpenWifi::RESTAPI_RPC {
 					DeviceConfigurationChangeKafkaEvent KEvent(
 						Utils::SerialNumberToInt(Cmd.SerialNumber), Utils::Now(),
 						Config);
-						
 				}
 			}
 

src/RESTAPI/RESTAPI_device_commandHandler.cpp

@@ -91,31 +91,6 @@ namespace OpenWifi {
 					TransactionId_, UUID, RPC, Poco::Thread::current()->id()));
 			return Rtty(UUID, RPC, 60000ms, Restrictions);
 		};
-		case APCommands::Commands::package:{
-			GWObjects::DeviceRestrictions Restrictions;
-			std::string pkg_name = "";
-			if (!AP_WS_Server()->Connected(SerialNumberInt_, Restrictions)) {
-				CallCanceled(Command_.c_str(), RESTAPI::Errors::DeviceNotConnected);
-				return BadRequest(RESTAPI::Errors::DeviceNotConnected);
-			}
-			Poco::URI uri(Request->getURI());
-			for (const auto &param : uri.getQueryParameters()) {
-				if (param.first == "pkgName") {
-					pkg_name = param.second;
-				}
-			}
-			if (pkg_name.empty()) {
-				return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-			}
-			auto UUID = MicroServiceCreateUUID();
-			auto RPC = CommandManager()->Next_RPC_ID();
-			poco_debug(
-				Logger_,
-				fmt::format(
-					"Command Package TID={} can proceed. Identified as {} and RPCID as {}. thr_id={}",
-					TransactionId_, UUID, RPC, Poco::Thread::current()->id()));
-			return GetPackages(UUID, RPC, pkg_name, 300000ms, Restrictions);
-		}
 		default:
 			return BadRequest(RESTAPI::Errors::InvalidCommand);
 		}
@@ -153,21 +128,6 @@ namespace OpenWifi {
 			return DeleteChecks();
 		case APCommands::Commands::statistics:
 			return DeleteStatistics();
-		case APCommands::Commands::package: {
-			GWObjects::DeviceRestrictions Restrictions;
-			if (!AP_WS_Server()->Connected(SerialNumberInt_, Restrictions)) {
-				CallCanceled(Command_.c_str(), RESTAPI::Errors::DeviceNotConnected);
-				return BadRequest(RESTAPI::Errors::DeviceNotConnected);
-			}
-			auto UUID = MicroServiceCreateUUID();
-			auto RPC = CommandManager()->Next_RPC_ID();
-			poco_debug(
-				Logger_,
-				fmt::format(
-					"Command RTTY TID={} can proceed. Identified as {} and RPCID as {}. thr_id={}",
-					TransactionId_, UUID, RPC, Poco::Thread::current()->id()));
-			return DeletePackages(UUID, RPC, 300000ms, Restrictions);
-		}
 		default:
 			return BadRequest(RESTAPI::Errors::InvalidCommand);
 		}
@@ -207,11 +167,7 @@ namespace OpenWifi {
 		{APCommands::Commands::certupdate, false, true, &RESTAPI_device_commandHandler::CertUpdate, 60000ms},
 		{APCommands::Commands::transfer, false, true, &RESTAPI_device_commandHandler::Transfer, 60000ms},
 		{APCommands::Commands::script, false, true, &RESTAPI_device_commandHandler::Script, 60000ms},
-		{APCommands::Commands::powercycle, false, true, &RESTAPI_device_commandHandler::PowerCycle, 60000ms},
-		{APCommands::Commands::fixedconfig, false, true, &RESTAPI_device_commandHandler::FixedConfig, 120000ms},
-		{APCommands::Commands::cablediagnostics, false, true, &RESTAPI_device_commandHandler::CableDiagnostics, 120000ms},
-		{APCommands::Commands::reenroll, false, true, &RESTAPI_device_commandHandler::ReEnroll, 120000ms},
-		{APCommands::Commands::package, false, true, &RESTAPI_device_commandHandler::PackageInstall, 120000ms},
+		{APCommands::Commands::powercycle, false, true, &RESTAPI_device_commandHandler::PowerCycle, 60000ms}
 	};
 
 	void RESTAPI_device_commandHandler::DoPost() {
@@ -449,210 +405,6 @@ namespace OpenWifi {
 		BadRequest(RESTAPI::Errors::NoRecordsDeleted);
 	}
 
-	void RESTAPI_device_commandHandler::GetPackages(const std::string &CMD_UUID, uint64_t CMD_RPC,
-		const std::string pkg_name,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-		poco_debug(Logger_, fmt::format("GET-PACKAGES: TID={}, user={} serial={}. thr_id={}",
-										TransactionId_, Requester(), SerialNumber_,
-										Poco::Thread::current()->id()));
-
-		if (IsDeviceSimulated(SerialNumber_)) {
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		Poco::JSON::Object Params;
-		Params.set(uCentralProtocol::OPERATION, "list");
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::PACKAGE, pkg_name);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = CMD_UUID;
-		Cmd.SubmittedBy = Requester();
-		Cmd.Command = uCentralProtocol::PACKAGE;
-		Cmd.RunAt = 0;
-		Cmd.Details = ParamStream.str();
-
-		RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::package, false, Cmd, Params,
-										*Request, *Response, timeout, nullptr, nullptr, Logger_);
-
-		Poco::JSON::Object O, P;
-		Cmd.to_json(O);
-
-		Poco::Dynamic::Var resultsVar = O.get("results");
-		Poco::JSON::Object::Ptr resultsObj = resultsVar.extract<Poco::JSON::Object::Ptr>();
-
-		return ReturnObject(*resultsObj);
-	}
-
-	void RESTAPI_device_commandHandler::PackageInstall(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		if (UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("INSTALLPACKAGE", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		poco_debug(Logger_, fmt::format("INSTALL-PACKAGES({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if (IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("INSTALL-PACKAGES", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		const auto &Obj = ParsedBody_;
-		if (!Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			CallCanceled("INSTALL-PACKAGES", CMD_UUID, CMD_RPC, RESTAPI::Errors::SerialNumberMismatch);
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-
-		poco_information(Logger_, fmt::format("INSTALL_OBJECT: {} for device {}", os.str(), SerialNumber_));
-
-		GWObjects::PackageInstall	PI;
-		if (!PI.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		Poco::JSON::Array::Ptr ArrayObj = Poco::SharedPtr<Poco::JSON::Array>(new Poco::JSON::Array);
-		for (const auto &i : PI.pkgs) {
-			Poco::JSON::Object::Ptr Obj =
-				Poco::SharedPtr<Poco::JSON::Object>(new Poco::JSON::Object);
-			i.to_json(*Obj);
-			ArrayObj->add(Obj);
-		}
-
-		Poco::JSON::Object Params;
-		Params.set(uCentralProtocol::OPERATION, "install");
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::PACKAGES, ArrayObj);
-
-		std::ostringstream os2;
-		Params.stringify(os2);
-
-		poco_information(Logger_, fmt::format("INSTALL_OBJECT2: {} for device {}", os2.str(), SerialNumber_));
-
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = CMD_UUID;
-		Cmd.SubmittedBy = Requester();
-		Cmd.Command = uCentralProtocol::PACKAGE;
-		Cmd.RunAt = 0;
-		Cmd.Details = ParamStream.str();
-
-		RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::package, false, Cmd, Params,
-										*Request, *Response, timeout, nullptr, nullptr, Logger_);
-
-		Poco::JSON::Object O, P;
-		Cmd.to_json(O);
-
-		Poco::Dynamic::Var resultsVar = O.get("results");
-		Poco::JSON::Object::Ptr resultsObj = resultsVar.extract<Poco::JSON::Object::Ptr>();
-
-		return ReturnObject(*resultsObj);
-	}
-
-	void RESTAPI_device_commandHandler::DeletePackages(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		if (UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("DELETE-PACKAGES", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		poco_debug(Logger_, fmt::format("DELETE-PACKAGES({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if (IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("DELETE-PACKAGES", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		const auto &Obj = ParsedBody_;
-		if (!Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			CallCanceled("DELETE-PACKAGES", CMD_UUID, CMD_RPC, RESTAPI::Errors::SerialNumberMismatch);
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-
-		poco_information(Logger_, fmt::format("DELETE_OBJECT: {} for device {}", os.str(), SerialNumber_));
-
-		GWObjects::PackageRemove	PR;
-		if (!PR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		Poco::JSON::Array::Ptr ArrayObj = Poco::SharedPtr<Poco::JSON::Array>(new Poco::JSON::Array);
-		for (const auto &i : PR.pkgs) {
-			Poco::JSON::Object::Ptr Obj =
-				Poco::SharedPtr<Poco::JSON::Object>(new Poco::JSON::Object);
-			i.to_json(*Obj);
-			ArrayObj->add(Obj);
-		}
-
-		Poco::JSON::Object Params;
-		Params.set(uCentralProtocol::OPERATION, "delete");
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::PACKAGES, ArrayObj);
-
-		std::ostringstream os2;
-		Params.stringify(os2);
-
-		poco_information(Logger_, fmt::format("DELETE_OBJECT2: {} for device {}", os2.str(), SerialNumber_));
-
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = CMD_UUID;
-		Cmd.SubmittedBy = Requester();
-		Cmd.Command = uCentralProtocol::PACKAGE;
-		Cmd.RunAt = 0;
-		Cmd.Details = ParamStream.str();
-
-		RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::package, false, Cmd, Params,
-										*Request, *Response, timeout, nullptr, nullptr, Logger_);
-
-		Poco::JSON::Object O, P;
-		Cmd.to_json(O);
-
-		Poco::Dynamic::Var resultsVar = O.get("results");
-		Poco::JSON::Object::Ptr resultsObj = resultsVar.extract<Poco::JSON::Object::Ptr>();
-
-		return ReturnObject(*resultsObj);
-	}
-
 	void RESTAPI_device_commandHandler::Ping(
 		const std::string &CMD_UUID, uint64_t CMD_RPC, std::chrono::milliseconds timeout,
 		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
@@ -939,31 +691,9 @@ namespace OpenWifi {
 				Params.stringify(ParamStream);
 				Cmd.Details = ParamStream.str();
 
-				// retrieve capabilities and encode/compress parameters, if required
-				Poco::JSON::Object ConfigParams = Params;
-				GWObjects::Capabilities Caps;
-				if (StorageService()->GetDeviceCapabilities(SerialNumber_, Caps)) {
-					Poco::JSON::Object CapsJson;
-					Caps.to_json(CapsJson);
-					auto DeviceCaps = CapsJson.getObject(uCentralProtocol::CAPABILITIES);
-					if (DeviceCaps->has("compress_cmd") && DeviceCaps->get("compress_cmd")) {
-						// compressed command capability present and it is set, compress parameters
-						Poco::JSON::Object CompressedParams;
-						std::string CompressedBase64Data;
-						std::uint64_t UncompressedDataLen = ParamStream.str().length();
-						if (Utils::CompressAndEncodeBase64(ParamStream.str(), CompressedBase64Data)) {
-							// set compressed, base 64 encoded data and length of uncompressed data
-							CompressedParams.set(uCentralProtocol::COMPRESS_64, CompressedBase64Data);
-							CompressedParams.set(uCentralProtocol::COMPRESS_SZ, UncompressedDataLen);
-							ConfigParams = CompressedParams;
-						}
-					}
-				}
-
-
 				// AP_WS_Server()->SetPendingUUID(SerialNumber_, NewUUID);
 				RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::configure, true,
-												   Cmd, ConfigParams, *Request, *Response, timeout,
+												   Cmd, Params, *Request, *Response, timeout,
 												   nullptr, this, Logger_);
 
 				if(!Cmd.Executed) {
@@ -1818,123 +1548,4 @@ namespace OpenWifi {
 										   Logger_);
 	}
 
-	// `fixedconfig` command is used set country propery on AP
-	// This handler uses `fixedconfig` command definitions
-	void RESTAPI_device_commandHandler::FixedConfig(
-		const std::string &CMD_UUID, uint64_t CMD_RPC, std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-		poco_debug(Logger_, fmt::format("FIXEDCONFIG({},{}): TID={} user={} serial={}", CMD_UUID, CMD_RPC,
-										TransactionId_, Requester(), SerialNumber_));
-		// do not allow `fixedconfig` command for simulated devices
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("FIXEDCONFIG", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		// setup and validate fixedconfig object
-		GWObjects::FixedConfig fixed_config;
-		if(!fixed_config.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		// setup command message
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::FIXEDCONFIG;
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = 0;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-
-		// send fixedconfig command to device and return status
-		return RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::fixedconfig, false, Cmd,
-										   *ParsedBody_, *Request, *Response, timeout, nullptr, this,
-										   Logger_);
-	}
-
-	void RESTAPI_device_commandHandler::CableDiagnostics(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		if(UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("CABLEDIAGNOSTICS", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		poco_debug(Logger_, fmt::format("CABLEDIAGNOSTICS({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("CABLEDIAGNOSTICS", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		GWObjects::CableDiagnostics	PR;
-		if(!PR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::CABLEDIAGNOSTICS;
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = PR.when;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-
-		return RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::cablediagnostics, false, Cmd,
-										   *ParsedBody_, *Request, *Response, timeout, nullptr, this,
-										   Logger_);
-	}
-
-	void RESTAPI_device_commandHandler::ReEnroll(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		if(UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("REENROLL", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		poco_debug(Logger_, fmt::format("REENROLL({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("REENROLL", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		GWObjects::ReEnroll PR;
-		if(!PR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::REENROLL;
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = PR.when;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-
-		return RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::reenroll, false, Cmd,
-										   *ParsedBody_, *Request, *Response, timeout, nullptr, this,
-										   Logger_);
-	}
 } // namespace OpenWifi

src/RESTAPI/RESTAPI_device_commandHandler.h

@@ -33,13 +33,6 @@ namespace OpenWifi {
 		void GetStatus();
 		void GetChecks();
 		void DeleteChecks();
-		void GetPackages(const std::string &UUID, uint64_t RPC,
-						 std::string pkg_name,
-						 std::chrono::milliseconds timeout,
-						 const GWObjects::DeviceRestrictions &R);
-		void DeletePackages(const std::string &UUID, uint64_t RPC,
-							std::chrono::milliseconds timeout,
-							const GWObjects::DeviceRestrictions &R);
 
 		bool IsDeviceSimulated(std::string &Serial);
 
@@ -77,14 +70,6 @@ namespace OpenWifi {
 					const GWObjects::DeviceRestrictions &R);
 		void PowerCycle(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
 					  const GWObjects::DeviceRestrictions &R);
-		void FixedConfig(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					  const GWObjects::DeviceRestrictions &R);
-		void CableDiagnostics(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					  const GWObjects::DeviceRestrictions &R);
-		void ReEnroll(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					  const GWObjects::DeviceRestrictions &R);
-		void PackageInstall(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					  const GWObjects::DeviceRestrictions &R);
 
 		static auto PathName() {
 			return std::list<std::string>{"/api/v1/device/{serialNumber}/{command}"};

src/RESTAPI/RESTAPI_file.cpp

@@ -22,15 +22,9 @@ namespace OpenWifi {
 
 		std::string FileType;
 		std::string FileContent;
-		int WaitingForFile = 0;
-		if (!StorageService()->GetAttachedFileContent(UUID, SerialNumber, FileContent, FileType, WaitingForFile) && !WaitingForFile) {
+		if (!StorageService()->GetAttachedFileContent(UUID, SerialNumber, FileContent, FileType) || FileContent.empty()) {
 			return NotFound();
 		}
-		else if (WaitingForFile) {
-			// waiting for file to be uploaded, return Accepted
-			return Accepted();
-		}
-
 		if (FileType == "pcap") {
 			SendFileContent(FileContent, "application/vnd.tcpdump.pcap", UUID + ".pcap");
 		}

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -12,9 +12,9 @@
 #include "Daemon.h"
 #ifdef TIP_GATEWAY_SERVICE
 #include "AP_WS_Server.h"
+#include "StorageService.h"
 #include "CapabilitiesCache.h"
 #include "RADIUSSessionTracker.h"
-#include "StorageService.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
@@ -31,8 +31,7 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
 		field_to_json(Obj, "deviceType", StorageService()->GetPlatform(SerialNumber));
-		field_to_json(Obj, "blackListed",
-					  StorageService()->IsBlackListed(Utils::MACToInt(SerialNumber)));
+		field_to_json(Obj, "blackListed", StorageService()->IsBlackListed(Utils::MACToInt(SerialNumber)));
 #endif
 		field_to_json(Obj, "macAddress", MACAddress);
 		field_to_json(Obj, "manufacturer", Manufacturer);
@@ -71,12 +70,12 @@ namespace OpenWifi::GWObjects {
 #ifdef TIP_GATEWAY_SERVICE
 		ConnectionState ConState;
 #ifdef USE_MEDUSA_CLIENT
-		auto Res = GS()->GetState(SerialNumber);
-		if (Res.has_value()) {
-			Res.value().to_json(SerialNumber, Obj);
+        auto Res = GS()->GetState(SerialNumber);
+        if (Res.has_value()) {
+            Res.value().to_json(SerialNumber,Obj);
 #else
-		if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
-			ConState.to_json(SerialNumber, Obj);
+        if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
+			ConState.to_json(SerialNumber,Obj);
 #endif
 		} else {
 			field_to_json(Obj, "ipAddress", "");
@@ -173,16 +172,17 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "recorded", Recorded);
 	}
 
-	bool HealthCheck::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "UUID", UUID);
-			field_from_json(Obj, "sanity", Sanity);
-			field_from_json(Obj, "recorded", Recorded);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool HealthCheck::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "UUID", UUID);
+            field_from_json(Obj, "sanity", Sanity);
+            field_from_json(Obj, "recorded", Recorded);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
 
 	void DefaultFirmware::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "deviceType", deviceType);
@@ -275,8 +275,7 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	void ConnectionState::to_json([[maybe_unused]] const std::string &SerialNumber,
-								  Poco::JSON::Object &Obj) {
+	void ConnectionState::to_json([[maybe_unused]] const std::string &SerialNumber, Poco::JSON::Object &Obj)  {
 		field_to_json(Obj, "ipAddress", Address);
 		field_to_json(Obj, "txBytes", TX);
 		field_to_json(Obj, "rxBytes", RX);
@@ -298,15 +297,14 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "connectionCompletionTime", connectionCompletionTime);
 		field_to_json(Obj, "totalConnectionTime", Utils::Now() - started);
 		field_to_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-		field_to_json(Obj, "certificateIssuerName", certificateIssuerName);
 		field_to_json(Obj, "connectReason", connectReason);
 		field_to_json(Obj, "uptime", uptime);
-		field_to_json(Obj, "compatible", Compatible);
+        field_to_json(Obj, "compatible", Compatible);
 
 #ifdef TIP_GATEWAY_SERVICE
 		hasRADIUSSessions = RADIUSSessionTracker()->HasSessions(SerialNumber);
 #endif
-		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions);
+		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
 		field_to_json(Obj, "hasGPS", hasGPS);
 		field_to_json(Obj, "sanity", sanity);
 		field_to_json(Obj, "memoryUsed", memoryUsed);
@@ -336,45 +334,44 @@ namespace OpenWifi::GWObjects {
 		}
 	}
 
-	bool ConnectionState::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "compatible", Compatible);
-			field_from_json(Obj, "ipAddress", Address);
-			field_from_json(Obj, "txBytes", TX);
-			field_from_json(Obj, "rxBytes", RX);
-			field_from_json(Obj, "messageCount", MessageCount);
-			field_from_json(Obj, "UUID", UUID);
-			field_from_json(Obj, "connected", Connected);
-			field_from_json(Obj, "firmware", Firmware);
-			field_from_json(Obj, "lastContact", LastContact);
-			field_from_json(Obj, "associations_2G", Associations_2G);
-			field_from_json(Obj, "associations_5G", Associations_5G);
-			field_from_json(Obj, "associations_6G", Associations_6G);
-			field_from_json(Obj, "webSocketClients", webSocketClients);
-			field_from_json(Obj, "websocketPackets", websocketPackets);
-			field_from_json(Obj, "kafkaClients", kafkaClients);
-			field_from_json(Obj, "kafkaPackets", kafkaPackets);
-			field_from_json(Obj, "locale", locale);
-			field_from_json(Obj, "started", started);
-			field_from_json(Obj, "sessionId", sessionId);
-			field_from_json(Obj, "connectionCompletionTime", connectionCompletionTime);
-			field_from_json(Obj, "totalConnectionTime", totalConnectionTime);
-			field_from_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-			field_from_json(Obj, "certificateIssuerName", certificateIssuerName);
-			field_from_json(Obj, "connectReason", connectReason);
-			field_from_json(Obj, "uptime", uptime);
-			field_from_json(Obj, "hasRADIUSSessions", hasRADIUSSessions);
-			field_from_json(Obj, "hasGPS", hasGPS);
-			field_from_json(Obj, "sanity", sanity);
-			field_from_json(Obj, "memoryUsed", memoryUsed);
-			field_from_json(Obj, "sanity", sanity);
-			field_from_json(Obj, "load", load);
-			field_from_json(Obj, "temperature", temperature);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
+    bool ConnectionState::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "compatible", Compatible);
+            field_from_json(Obj, "ipAddress", Address);
+            field_from_json(Obj, "txBytes", TX);
+            field_from_json(Obj, "rxBytes", RX);
+            field_from_json(Obj, "messageCount", MessageCount);
+            field_from_json(Obj, "UUID", UUID);
+            field_from_json(Obj, "connected", Connected);
+            field_from_json(Obj, "firmware", Firmware);
+            field_from_json(Obj, "lastContact", LastContact);
+            field_from_json(Obj, "associations_2G", Associations_2G);
+            field_from_json(Obj, "associations_5G", Associations_5G);
+            field_from_json(Obj, "associations_6G", Associations_6G);
+            field_from_json(Obj, "webSocketClients", webSocketClients);
+            field_from_json(Obj, "websocketPackets", websocketPackets);
+            field_from_json(Obj, "kafkaClients", kafkaClients);
+            field_from_json(Obj, "kafkaPackets", kafkaPackets);
+            field_from_json(Obj, "locale", locale);
+            field_from_json(Obj, "started", started);
+            field_from_json(Obj, "sessionId", sessionId);
+            field_from_json(Obj, "connectionCompletionTime", connectionCompletionTime);
+            field_from_json(Obj, "totalConnectionTime", totalConnectionTime);
+            field_from_json(Obj, "certificateExpiryDate", certificateExpiryDate);
+            field_from_json(Obj, "connectReason", connectReason);
+            field_from_json(Obj, "uptime", uptime);
+            field_from_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
+            field_from_json(Obj, "hasGPS", hasGPS);
+            field_from_json(Obj, "sanity", sanity);
+            field_from_json(Obj, "memoryUsed", memoryUsed);
+            field_from_json(Obj, "sanity", sanity);
+            field_from_json(Obj, "load", load);
+            field_from_json(Obj, "temperature", temperature);
+            return true;
+        } catch(const Poco::Exception &E) {
+        }
+        return false;
+    }
 
 	void DeviceConnectionStatistics::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "averageConnectionTime", averageConnectionTime);
@@ -802,123 +799,4 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	bool FixedConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serial", serialNumber);
-			field_from_json(Obj, "country", country);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool CableDiagnostics::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serial", serialNumber);
-			field_from_json(Obj, "when", when);
-			field_from_json(Obj, "ports", ports);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool ReEnroll::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serial", serialNumber);
-			field_from_json(Obj, "when", when);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool PackageInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "version", version);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void PackageInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "version", version);
-	}
-
-	void PackageList::to_json(Poco::JSON::Object &Obj) const {
-		Obj.set("serialNumber", serialNumber);
-
-		Poco::JSON::Array packageJsonArray;
-		for (const auto &pkg : packageArray) {
-			Poco::JSON::Object pkgObj;
-			pkg.to_json(pkgObj);
-			packageJsonArray.add(pkgObj);
-		}
-		Obj.set("packageArray", packageJsonArray);
-
-		Obj.set("FirstUpdate", Poco::UInt64(FirstUpdate));
-		Obj.set("LastUpdate", Poco::UInt64(LastUpdate));
-	}
-
-	bool ToBeInstalled::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "url", url);
-
-			Poco::URI uri(url);
-			std::string scheme = uri.getScheme();
-			if (scheme != "http" && scheme != "https") {
-				return false;
-			}
-
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void ToBeInstalled::to_json(Poco::JSON::Object &Obj) const {
-		Obj.set("name", name);
-		Obj.set("url", url);
-	}
-
-	bool PackageInstall::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "when", when);
-			field_from_json(Obj, "packages", pkgs);
-
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool ToBeRemoved::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "name", name);
-
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void ToBeRemoved::to_json(Poco::JSON::Object &Obj) const {
-		Obj.set("name", name);
-	}
-
-	bool PackageRemove::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "packages", pkgs);
-
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
 } // namespace OpenWifi::GWObjects

src/RESTObjects/RESTAPI_GWobjects.h

@@ -42,7 +42,6 @@ namespace OpenWifi::GWObjects {
 		uint64_t sessionId = 0;
 		double connectionCompletionTime = 0.0;
 		std::uint64_t certificateExpiryDate = 0;
-		std::string certificateIssuerName;
 		std::uint64_t hasRADIUSSessions = 0;
 		bool hasGPS = false;
 		std::uint64_t sanity=0;
@@ -533,70 +532,6 @@ namespace OpenWifi::GWObjects {
 		std::uint64_t 	when;
 		std::vector<PowerCyclePort> ports;
 
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	struct FixedConfig {
-		std::string 	serialNumber;
-		std::string 	country;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	struct CableDiagnostics {
-		std::string 	serialNumber;
-		std::uint64_t 	when;
-		std::vector<std::string> ports;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	struct ReEnroll {
-		std::string 	serialNumber;
-		std::uint64_t 	when;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	struct PackageInfo {
-		std::string	 name;
-		std::string	 version;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-	struct PackageList {
-		std::string	serialNumber;
-		std::vector<PackageInfo>	packageArray;
-		uint64_t 	FirstUpdate = 0;
-		uint64_t 	LastUpdate = 0;
-		std::string packageStringArray;
-
-		bool from_json(const Poco::JSON::Array::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-	struct ToBeInstalled {
-		std::string name;
-		std::string url;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-	struct PackageInstall {
-		std::string 	serialNumber;
-		std::uint64_t   when;
-		std::vector<ToBeInstalled> pkgs;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-	struct ToBeRemoved {
-		std::string		name;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-	struct PackageRemove {
-		std::string 	serialNumber;
-		std::uint64_t   when;
-		std::vector<ToBeRemoved> pkgs;
-
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 } // namespace OpenWifi::GWObjects

src/StorageService.h

@@ -243,7 +243,7 @@ namespace OpenWifi {
 									 const std::string &Type);
 		bool CancelWaitFile(std::string &UUID, std::string &ErrorText);
 		bool GetAttachedFileContent(std::string &UUID, const std::string &SerialNumber,
-									std::string &FileContent, std::string &Type, int& WaitingForFile);
+									std::string &FileContent, std::string &Type);
 		bool RemoveAttachedFile(std::string &UUID);
 		bool SetCommandResult(std::string &UUID, std::string &Result);
 		bool GetNewestCommands(std::string &SerialNumber, uint64_t HowMany,

src/TelemetryClient.cpp

@@ -120,16 +120,14 @@ namespace OpenWifi {
 		Poco::Buffer<char> IncomingFrame(0);
 
 		try {
-			int Op, flags, IncomingSize;
-
+			int Op, flags;
+			int IncomingSize;
 			IncomingSize = WS_->receiveFrame(IncomingFrame, flags);
 			Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
 
-			if (IncomingSize == -1) {
-				poco_trace(Logger(),
-					fmt::format("TELEMETRY-EMPTY({}): Empty frame, non-blocking try-again.", CId_));
-			} else if (IncomingSize == 0 && flags == 0 && Op == 0) {
-				poco_information(Logger(),
+			if (IncomingSize == 0 && flags == 0 && Op == 0) {
+				poco_information(
+					Logger(),
 					fmt::format("TELEMETRY-DISCONNECT({}): device has disconnected.", CId_));
 				MustDisconnect = true;
 			} else {
@@ -138,14 +136,12 @@ namespace OpenWifi {
 						fmt::format("TELEMETRY-WS-PING({}): received. PONG sent back.", CId_));
 					WS_->sendFrame("", 0,
 								   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+									   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
 				} else if (Op == Poco::Net::WebSocket::FRAME_OP_CLOSE) {
-					poco_information(Logger(),
+					poco_information(
+						Logger(),
 						fmt::format("TELEMETRY-DISCONNECT({}): device wants to disconnect.", CId_));
 					MustDisconnect = true;
-				} else if (Op == Poco::Net::WebSocket::FRAME_OP_CONT) {
-					poco_information(Logger(),
-						fmt::format("TELEMETRY-CONT({}): rx {} bytes.", CId_, IncomingSize));
 				}
 			}
 		} catch (...) {
@@ -158,4 +154,4 @@ namespace OpenWifi {
 		SendTelemetryShutdown();
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/ConfigurationValidator.cpp

@@ -276,8 +276,7 @@ static std::string DefaultAPSchema = R"foo(
                         "sae-mixed",
                         "wpa3",
                         "wpa3-192",
-                        "wpa3-mixed",
-                        "mpsk-radius"
+                        "wpa3-mixed"
                     ],
                     "examples": [
                         "psk2"
@@ -550,8 +549,7 @@ static std::string DefaultAPSchema = R"foo(
                         "5G",
                         "5G-lower",
                         "5G-upper",
-                        "6G",
-                        "HaLow"
+                        "6G"
                     ]
                 },
                 "bandwidth": {
@@ -624,10 +622,6 @@ static std::string DefaultAPSchema = R"foo(
                     ],
                     "default": 80
                 },
-                "enable": {
-                    "description": "Specifies radio is enabled/disabled.",
-                    "type": "boolean"
-                },
                 "require-mode": {
                     "description": "Stations that do no fulfill these HT modes will be rejected.",
                     "type": "string",
@@ -2312,8 +2306,7 @@ static std::string DefaultAPSchema = R"foo(
                             "5G",
                             "5G-lower",
                             "5G-upper",
-                            "6G",
-                            "HaLow"
+                            "6G"
                         ]
                     }
                 },
@@ -2417,24 +2410,12 @@ static std::string DefaultAPSchema = R"foo(
                 "encryption": {
                     "$ref": "#/$defs/interface.ssid.encryption"
                 },
-                "enhanced-mpsk": {
-                    "description": "Optionally disable MPSK",
-                    "type": "boolean",
-                    "default": true
-                },
                 "multi-psk": {
-                    "anyOf": [
-                        {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/$defs/interface.ssid.multi-psk"
-                            }
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ]
-		},
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/$defs/interface.ssid.multi-psk"
+                    }
+                },
                 "rrm": {
                     "$ref": "#/$defs/interface.ssid.rrm"
                 },
@@ -3751,8 +3732,7 @@ static std::string DefaultAPSchema = R"foo(
                             "5G",
                             "5G-lower",
                             "5G-upper",
-                            "6G",
-                            "HaLow"
+                            "6G"
                         ]
                     }
                 },
@@ -3787,7 +3767,7 @@ static std::string DefaultAPSchema = R"foo(
                     "enum": [
                         "polled",
                         "final",
-                        "raw"
+                        "raw-data"
                     ],
                     "default": "final"
                 },
@@ -3962,10 +3942,8 @@ static std::string DefaultAPSchema = R"foo(
                             "inactive-deauth",
                             "key-mismatch",
                             "beacon-report",
-                            "radar-detected",
-                            "ft-finish",
-                            "sta-authorized"
-			 ]
+                            "radar-detected"
+                        ]
                     }
                 }
             }
@@ -4453,8 +4431,7 @@ static std::string DefaultSWITCHSchema = R"foo(
                         "sae-mixed",
                         "wpa3",
                         "wpa3-192",
-                        "wpa3-mixed",
-                        "mpsk-radius"
+                        "wpa3-mixed"
                     ],
                     "examples": [
                         "psk2"
@@ -4668,18 +4645,15 @@ static std::string DefaultSWITCHSchema = R"foo(
             "type": "object",
             "properties": {
                 "port-mirror": {
-                    "description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
                     "type": "object",
                     "properties": {
                         "monitor-ports": {
-                            "description": "The list of ports that we want to mirror.",
                             "type": "array",
                             "items": {
                                 "type": "string"
                             }
                         },
                         "analysis-port": {
-                            "description": "The port that mirror'ed packets should be sent to.",
                             "type": "string"
                         }
                     }
@@ -4900,8 +4874,7 @@ static std::string DefaultSWITCHSchema = R"foo(
                         "5G",
                         "5G-lower",
                         "5G-upper",
-                        "6G",
-                        "HaLow"
+                        "6G"
                     ]
                 },
                 "bandwidth": {
@@ -4967,10 +4940,6 @@ static std::string DefaultSWITCHSchema = R"foo(
                     ],
                     "default": 80
                 },
-                "enable": {
-                    "description": "Specifies radio is enabled/disabled.",
-                    "type": "boolean"
-                },
                 "require-mode": {
                     "type": "string",
                     "enum": [
@@ -6543,8 +6512,7 @@ static std::string DefaultSWITCHSchema = R"foo(
                             "5G",
                             "5G-lower",
                             "5G-upper",
-                            "6G",
-                            "HaLow"
+                            "6G"
                         ]
                     }
                 },
@@ -6634,23 +6602,11 @@ static std::string DefaultSWITCHSchema = R"foo(
                 "encryption": {
                     "$ref": "#/$defs/interface.ssid.encryption"
                 },
-                "enhanced-mpsk": {
-                    "description": "Optionally disable MPSK",
-                    "type": "boolean",
-                    "default": true
-                },
                 "multi-psk": {
-                    "anyOf": [
-                        {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/$defs/interface.ssid.multi-psk"
-                            }
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ]
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/$defs/interface.ssid.multi-psk"
+                    }
                 },
                 "rrm": {
                     "$ref": "#/$defs/interface.ssid.rrm"
@@ -7772,8 +7728,7 @@ static std::string DefaultSWITCHSchema = R"foo(
                             "5G",
                             "5G-lower",
                             "5G-upper",
-                            "6G",
-                            "HaLow"
+                            "6G"
                         ]
                     }
                 },
@@ -7942,9 +7897,7 @@ static std::string DefaultSWITCHSchema = R"foo(
                             "inactive-deauth",
                             "key-mismatch",
                             "beacon-report",
-                            "radar-detected",
-                            "ft-finish",
-                            "sta-authorized"
+                            "radar-detected"
                         ]
                     }
                 }

src/framework/KafkaManager.cpp

@@ -118,10 +118,6 @@ namespace OpenWifi {
 						Producer.poll((std::chrono::milliseconds) 0);
 					}
 				}
-				if (Queue_.size() == 0) {
-					// message queue is empty, flush all previously sent messages
-					Producer.flush();
-				}
 			} catch (const cppkafka::HandleException &E) {
 				poco_warning(Logger_,
 							 fmt::format("Caught a Kafka exception (producer): {}", E.what()));
@@ -130,6 +126,10 @@ namespace OpenWifi {
 			} catch (...) {
 				poco_error(Logger_, "std::exception");
 			}
+			if (Queue_.size() == 0) {
+				// message queue is empty, flush all previously sent messages
+				Producer.flush();
+			}
 			Note = Queue_.waitDequeueNotification();
 		}
 		Producer.flush();

src/framework/MicroService.cpp

@@ -845,4 +845,4 @@ namespace OpenWifi {
 		}
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/MicroService.h

@@ -14,7 +14,6 @@
 #include <iostream>
 #include <random>
 #include <vector>
-#include <optional>
 
 // This must be defined for poco_debug and poco_trace macros to function.
 
@@ -41,7 +40,6 @@ namespace OpenWifi {
 #include "Poco/Util/OptionSet.h"
 #include "Poco/Util/PropertyFileConfiguration.h"
 #include "Poco/Util/ServerApplication.h"
-#include "Poco/ThreadPool.h"
 
 #include "framework/OpenWifiTypes.h"
 

src/framework/MicroServiceFuncs.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <string>
-#include <optional>
 
 #include "framework/OpenWifiTypes.h"
 

src/framework/RESTAPI_Handler.h

@@ -431,11 +431,6 @@ namespace OpenWifi {
 			}
 		}
 
-		inline void Accepted() {
-			PrepareResponse(Poco::Net::HTTPResponse::HTTP_ACCEPTED);
-			Response->send();
-		}
-
 		inline void SendCompressedTarFile(const std::string &FileName, const std::string &Content) {
 			Response->setStatus(Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK);
 			SetCommonHeaders();
@@ -557,8 +552,8 @@ namespace OpenWifi {
 
 		inline bool IsAuthorized(bool &Expired, bool &Contacted, bool SubOnly = false);
 
-		inline void ReturnObject(Poco::JSON::Object &Object, Poco::Net::HTTPResponse::HTTPStatus Status = Poco::Net::HTTPResponse::HTTP_OK) {
-			PrepareResponse(Status);
+		inline void ReturnObject(Poco::JSON::Object &Object) {
+			PrepareResponse();
 			if (Request != nullptr) {
 				//   can we compress ???
 				auto AcceptedEncoding = Request->find("Accept-Encoding");

src/framework/SubSystemServer.cpp

@@ -35,6 +35,7 @@ namespace OpenWifi {
 		P.verificationDepth = 9;
 		P.loadDefaultCAs = root_ca_.empty();
 		P.cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
+		P.dhUse2048Bits = true;
 		P.caLocation = cas_;
         // P.securityLevel =
 
@@ -67,16 +68,6 @@ namespace OpenWifi {
 				Context->addCertificateAuthority(Issuing);
 			}
 
-			if (!client_cas_.empty()) {
-				// add certificates specified in clientcas
-				std::vector<Poco::Crypto::X509Certificate> Certs =
-					Poco::Net::X509Certificate::readPEM(client_cas_);
-				for (const auto &cert : Certs) {
-					Context->addChainCertificate(cert);
-					Context->addCertificateAuthority(cert);
-				}
-			}
-
 			Poco::Crypto::RSAKey Key("", key_file_, key_file_password_);
 			Context->usePrivateKey(Key);
 
@@ -343,4 +334,4 @@ namespace OpenWifi {
 		}
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/SubSystemServer.h

@@ -45,7 +45,6 @@ namespace OpenWifi {
 		[[nodiscard]] inline auto KeyFile() const { return key_file_; };
 		[[nodiscard]] inline auto CertFile() const { return cert_file_; };
 		[[nodiscard]] inline auto RootCA() const { return root_ca_; };
-		[[nodiscard]] inline auto ClientCas() const { return client_cas_; };
 		[[nodiscard]] inline auto KeyFilePassword() const { return key_file_password_; };
 		[[nodiscard]] inline auto IssuerCertFile() const { return issuer_cert_file_; };
 		[[nodiscard]] inline auto Name() const { return name_; };

src/framework/UI_WebSocketClientServer.cpp

@@ -210,16 +210,10 @@ namespace OpenWifi {
 			n = Client->second->WS_->receiveFrame(IncomingFrame, flags);
 			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
 
-			if (n == -1) {
-				poco_warning(Logger(),
-					fmt::format("UI-EMPTY({}): {} Empty Frame flags {}.",
-								Client->second->Id_, Client->second->UserName_, flags));
-				return;
-			}
 			if (n == 0) {
 				poco_debug(Logger(),
-					fmt::format("CLOSE({}): {} UI Client is closing WS connection.",
-								Client->second->Id_, Client->second->UserName_));
+						   fmt::format("CLOSE({}): {} UI Client is closing WS connection.",
+									   Client->second->Id_, Client->second->UserName_));
 				return EndConnection(Client);
 			}
 
@@ -227,7 +221,7 @@ namespace OpenWifi {
 			case Poco::Net::WebSocket::FRAME_OP_PING: {
 				Client->second->WS_->sendFrame("", 0,
 											   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-											   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+												   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
 			} break;
 			case Poco::Net::WebSocket::FRAME_OP_PONG: {
 			} break;
@@ -237,11 +231,6 @@ namespace OpenWifi {
 									   Client->second->Id_, Client->second->UserName_));
 				return EndConnection(Client);
 			} break;
-			case Poco::Net::WebSocket::FRAME_OP_CONT: {
-				poco_warning(Logger(),
-							 fmt::format("CONT({}): {} Unexpected CONT Frame - Ignoring.",
-										 Client->second->Id_, Client->second->UserName_));
-			} break;
 			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 				constexpr const char *DropMessagesCommand = "drop-notifications";
 				IncomingFrame.append(0);
@@ -330,4 +319,4 @@ namespace OpenWifi {
 		}
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/ow_constants.h

@@ -433,10 +433,6 @@ namespace OpenWifi::RESTAPI::Errors {
 
 	static const struct msg InvalidRRMAction { 1192, "Invalid RRM Action." };
 
-	static const struct msg InvalidPackageURL { 1193, "Invalid URL, must start with http:// or https://." };
-	static const struct msg FailedToDownload { 1194, "Failed to download package." };
-	static const struct msg FailedToDecompress { 1195, "Failed to decompress package data."};
-
     static const struct msg SimulationDoesNotExist {
         7000, "Simulation Instance ID does not exist."
     };
@@ -554,10 +550,6 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char *DEBUG = "debug";
 	static const char *SCRIPT = "script";
 	static const char *TIMEOUT = "timeout";
-	static const char *PACKAGE = "package";
-	static const char *PACKAGES = "packages";
-	static const char *PACKAGEINST = "packageInstall";
-	static const char *PACKAGEDEL = "packageDelete";
 
 	static const char *NEWPASSWORD = "newPassword";
 	static const char *USERS = "users";
@@ -588,10 +580,6 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char *INTERVAL = "interval";
 	static const char *UI = "UI";
 	static const char *BANDWIDTH = "bandwidth";
-
-	static const char *FIXEDCONFIG = "fixedconfig";
-	static const char *CABLEDIAGNOSTICS = "cable-diagnostics";
-	static const char *REENROLL = "reenroll";
 } // namespace OpenWifi::RESTAPI::Protocol
 
 namespace OpenWifi::uCentralProtocol {
@@ -620,7 +608,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *CFGPENDING = "cfgpending";
 	static const char *RECOVERY = "recovery";
 	static const char *COMPRESS_64 = "compress_64";
-	static const char *COMPRESS_SZ = "compress_sz";
 	static const char *CAPABILITIES = "capabilities";
 	static const char *REQUEST_UUID = "request_uuid";
 	static const char *SANITY = "sanity";
@@ -677,9 +664,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *SIGNATURE = "signature";
 	static const char *INFO = "info";
 	static const char *DATE = "date";
-	static const char *PACKAGE = "package";
-	static const char *PACKAGES = "packages";
-	static const char *CATEGORY = "category";
 
 	static const char *SERIALNUMBER = "serialNumber";
 	static const char *COMPATIBLE = "compatible";
@@ -708,11 +692,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *RRM = "rrm";
 	static const char *ACTIONS = "actions";
 
-	static const char *FIXEDCONFIG = "fixedconfig";
-	static const char *CABLEDIAGNOSTICS = "cable-diagnostics";
-	static const char *REENROLL = "reenroll";
-
-	static const char *OPERATION = "op";
 } // namespace OpenWifi::uCentralProtocol
 
 namespace OpenWifi::uCentralProtocol::Events {
@@ -747,7 +726,7 @@ namespace OpenWifi::uCentralProtocol::Events {
 		ET_EVENT,
 		ET_WIFISCAN,
 		ET_ALARM,
-		ET_REBOOTLOG,
+		ET_REBOOTLOG
 	};
 
 	inline EVENT_MSG EventFromString(const std::string &Method) {
@@ -809,10 +788,6 @@ namespace OpenWifi::APCommands {
 		certupdate,
 		transfer,
 		powercycle,
-		fixedconfig,
-		cablediagnostics,
-		reenroll,
-		package,
 		unknown
 	};
 
@@ -827,9 +802,7 @@ namespace OpenWifi::APCommands {
 		RESTAPI::Protocol::EVENTQUEUE,	 RESTAPI::Protocol::TELEMETRY,
 		RESTAPI::Protocol::PING,		 RESTAPI::Protocol::SCRIPT,
 		RESTAPI::Protocol::RRM,		 	 RESTAPI::Protocol::CERTUPDATE,
-		RESTAPI::Protocol::TRANSFER,	 RESTAPI::Protocol::POWERCYCLE,
-		RESTAPI::Protocol::FIXEDCONFIG,  RESTAPI::Protocol::CABLEDIAGNOSTICS,
-		RESTAPI::Protocol::REENROLL,	 RESTAPI::Protocol::PACKAGE
+		RESTAPI::Protocol::TRANSFER,	 RESTAPI::Protocol::POWERCYCLE
 	};
 
 	inline const char *to_string(Commands Cmd) { return uCentralAPCommands[(uint8_t)Cmd]; }

src/framework/utils.cpp

@@ -590,26 +590,6 @@ namespace OpenWifi::Utils {
 		return false;
 	}
 
-	//
-	// Compress given data using utility function and encode it in base64 format.
-	//
-	bool CompressAndEncodeBase64(const std::string& UnCompressedData, std::string& CompressedBase64Data) {
-
-		unsigned long CompressedDataSize = UnCompressedData.size();
-		std::vector<Bytef> CompressedData(CompressedDataSize);
-		auto status = compress(&CompressedData[0], &CompressedDataSize,
-								(Bytef*) UnCompressedData.c_str(), UnCompressedData.size());
-		if (status == Z_OK) {
-			CompressedBase64Data = OpenWifi::Utils::base64encode(&CompressedData[0], CompressedDataSize);
-		}
-		else {
-			// failed to compress data
-			return false;
-		}
-
-		return true;
-	}
-
 	bool IsAlphaNumeric(const std::string &s) {
 		return std::all_of(s.begin(), s.end(), [](char c) -> bool { return isalnum(c); });
 	}
@@ -888,15 +868,78 @@ namespace OpenWifi::Utils {
         return password;
     }
 
-	/*
-	 Note that these 2 functions aren't used. They have been removed due to this deprecation warning:
-	// Function to query NAPTR records for a domain and return them in a vector
-	 #47 3.825 /owgw/src/framework/utils.cpp: In function 'std::vector<OpenWifi::Utils::NAPTRRecord> OpenWifi::Utils::getNAPTRRecords(const std::string&)':
-#47 3.825 /owgw/src/framework/utils.cpp:915:28: warning: 'int ns_sprintrr(const ns_msg*, const ns_rr*, const char*, const char*, char*, size_t)' is deprecated [-Wdeprecated-declarations]
+// Function to query NAPTR records for a domain and return them in a vector
+    std::vector<NAPTRRecord> getNAPTRRecords(const std::string& domain) {
+        std::vector<NAPTRRecord> naptrRecords;
+
+        unsigned char buf[4096];
+        ns_msg handle;
+        ns_initparse(buf, NS_PACKETSZ, &handle);
+
+        // Query NAPTR records for the given domain
+        int response = res_query(domain.c_str(), ns_c_in, ns_t_naptr, buf, sizeof(buf));
+        if (response < 0) {
+            return naptrRecords;
+        }
+
+        if(ns_initparse(buf, response, &handle) < 0) {
+            return naptrRecords;
+        }
+
+        // Iterate through the DNS response and extract NAPTR records
+        int count = ns_msg_count(handle, ns_s_an);
+        for (int i = 0; i < count; ++i) {
+            ns_rr rr;
+            if (ns_parserr(&handle, ns_s_an, i, &rr) == 0) {
+                char rdata[256];
+                ns_sprintrr(&handle, &rr, nullptr, nullptr, rdata, sizeof(rdata));
+                NAPTRRecord record;
+                std::istringstream os(rdata);
+                os  >> record.name >> record.ttl >> record.rclass >> record.rtype >> record.order >> record.preference >> record.flags
+                    >> record.service >> record.regexp >>  record.replacement;
+                naptrRecords.push_back(record);
+            }
+        }
+
+        return naptrRecords;
+    }
 
     std::vector<SrvRecord> getSRVRecords(const std::string& domain) {
-    #47 3.833 /owgw/src/framework/utils.cpp: In function 'std::vector<OpenWifi::Utils::SrvRecord> OpenWifi::Utils::getSRVRecords(const std::string&)':
-    #47 3.833 /owgw/src/framework/utils.cpp:952:28: warning: 'int ns_sprintrr(const ns_msg*, const ns_rr*, const char*, const char*, char*, size_t)' is deprecated [-Wdeprecated-declarations]
-	*/
+        std::vector<SrvRecord> srvRecords;
+
+        // Buffer to hold the DNS response
+        unsigned char buf[4096];
+        ns_msg handle;
+        ns_initparse(buf, NS_PACKETSZ, &handle);
+
+        // Query NAPTR records for the given domain
+        int response = res_query(domain.c_str(), ns_c_in, ns_t_srv, buf, sizeof(buf));
+        if (response < 0) {
+            std::cerr << "DNS query failed for " << domain << ": " << hstrerror(h_errno) << std::endl;
+            return srvRecords;
+        }
+
+        if(ns_initparse(buf, response, &handle) < 0) {
+            return srvRecords;
+        }
+
+        // Iterate through the DNS response and extract NAPTR records
+        int count = ns_msg_count(handle, ns_s_an);
+        for (int i = 0; i < count; ++i) {
+            ns_rr rr;
+            if (ns_parserr(&handle, ns_s_an, i, &rr) == 0) {
+                char rdata[256];
+                ns_sprintrr(&handle, &rr, nullptr, nullptr, rdata, sizeof(rdata));
+                SrvRecord record;
+                std::istringstream os(rdata);
+                os  >>  record.name >> record.ttl >> record.rclass >> record.rtype >> record.pref >> record.weight >>
+                    record.port >> record.srvname ;
+                srvRecords.push_back(record);
+            }
+        }
+
+        return srvRecords;
+    }
+
 
 } // namespace OpenWifi::Utils

src/framework/utils.h

@@ -151,8 +151,6 @@ namespace OpenWifi::Utils {
 	bool ExtractBase64CompressedData(const std::string &CompressedData,
 									 std::string &UnCompressedData, uint64_t compress_sz);
 
-	bool CompressAndEncodeBase64(const std::string& UnCompressedData, std::string& CompressedData);
-
 	inline bool match(const char* first, const char* second)
 	{
 		// If we reach at the end of both strings, we are done
@@ -298,10 +296,8 @@ namespace OpenWifi::Utils {
         std::string     replacement;
     };
 
-	// removed due to deprecation: see utils.cpp
-    // Function to query NAPTR records for a domain and return them in a vector
-    //std::vector<NAPTRRecord> getNAPTRRecords(const std::string& domain);
-
+// Function to query NAPTR records for a domain and return them in a vector
+    std::vector<NAPTRRecord> getNAPTRRecords(const std::string& domain);
     struct SrvRecord {
         std::string     name;
         std::string     ttl;
@@ -313,8 +309,7 @@ namespace OpenWifi::Utils {
         std::string     srvname;
     };
 
-	// removed due to deprecation: see utils.cpp
-    // std::vector<SrvRecord> getSRVRecords(const std::string& domain);
+    std::vector<SrvRecord> getSRVRecords(const std::string& domain);
 
     struct HostNameServerResult{
         std::string     Hostname;

src/rttys/RTTYS_server.cpp

@@ -14,7 +14,6 @@
 #include "nlohmann/json.hpp"
 
 #include "Poco/NObserver.h"
-#include <Poco/Net/Context.h>
 #include "Poco/Net/SocketNotification.h"
 #include "Poco/Net/NetException.h"
 #include "Poco/Net/WebSocketImpl.h"
@@ -72,7 +71,6 @@ namespace OpenWifi {
 				const auto &RootCas =
 					MicroServiceConfigPath("ucentral.websocket.host.0.rootca", "");
 				const auto &Cas = MicroServiceConfigPath("ucentral.websocket.host.0.cas", "");
-				const auto &ClientCasFile = MicroServiceConfigPath("ucentral.websocket.host.0.clientcas", "");
 
 				Poco::Net::Context::Params P;
 
@@ -88,7 +86,6 @@ namespace OpenWifi {
 				Poco::Crypto::X509Certificate Cert(CertFileName);
 				Poco::Crypto::X509Certificate Root(RootCaFileName);
 				Poco::Crypto::X509Certificate Issuing(IssuerFileName);
-                std::vector<Poco::Crypto::X509Certificate> ClientCasCerts;
 				Poco::Crypto::RSAKey Key("", KeyFileName, KeyPassword);
 
 				DeviceSecureContext->useCertificate(Cert);
@@ -96,11 +93,7 @@ namespace OpenWifi {
 				DeviceSecureContext->addCertificateAuthority(Root);
 				DeviceSecureContext->addChainCertificate(Issuing);
 				DeviceSecureContext->addCertificateAuthority(Issuing);
-                ClientCasCerts = Poco::Net::X509Certificate::readPEM(ClientCasFile);
-                for (const auto &cert : ClientCasCerts) {
-                    DeviceSecureContext->addChainCertificate(cert);
-                    DeviceSecureContext->addCertificateAuthority(cert);
-                }
+				DeviceSecureContext->addCertificateAuthority(Root);
 				DeviceSecureContext->enableSessionCache(true);
 				DeviceSecureContext->setSessionCacheSize(0);
 				DeviceSecureContext->setSessionTimeout(120);
@@ -580,16 +573,14 @@ namespace OpenWifi {
 		try {
 			Client = Clients_.find(pNf->socket().impl()->sockfd());
 			if (Client == end(Clients_)) {
-				poco_warning(Logger(),
-					fmt::format("Cannot find client socket: {}",
-								pNf->socket().impl()->sockfd()));
+				poco_warning(Logger(), fmt::format("Cannot find client socket: {}",
+												   pNf->socket().impl()->sockfd()));
 				return;
 			}
 			Connection = Client->second;
 			if(Connection->WSSocket_==nullptr || Connection->WSSocket_->impl()==nullptr) {
-				poco_warning(Logger(),
-					fmt::format("WebSocket is not valid: {}",
-							    Connection->SerialNumber_));
+				poco_warning(Logger(), fmt::format("WebSocket is no valid: {}",
+												   Connection->SerialNumber_));
 				return;
 			}
 
@@ -598,25 +589,15 @@ namespace OpenWifi {
 
 			auto ReceivedBytes = Connection->WSSocket_->receiveFrame(FrameBuffer, sizeof(FrameBuffer), flags);
 			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
-
-			if (ReceivedBytes == -1) {
-				poco_trace(Logger(),
-					fmt::format("WS-EMPTY{}: Non-blocking try-again empty Frame: flags {}",
-								Connection->SerialNumber_, flags));
-				return;
-			}
-
 			switch (Op) {
 
 			case Poco::Net::WebSocket::FRAME_OP_PING: {
 				Connection->WSSocket_->sendFrame("", 0,
-				    (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-					(int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+											   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
+												   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
 			} break;
-
 			case Poco::Net::WebSocket::FRAME_OP_PONG: {
 			} break;
-
 			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 				if (ReceivedBytes == 0) {
 					EndConnection(Connection,__func__,__LINE__);
@@ -643,29 +624,19 @@ namespace OpenWifi {
 					}
 				}
 			} break;
-
 			case Poco::Net::WebSocket::FRAME_OP_BINARY: {
 				if (ReceivedBytes == 0) {
 					EndConnection(Connection,__func__,__LINE__);
 					return;
 				} else {
 					poco_trace(Logger(),
-						fmt::format("Sending {} key strokes to device.", ReceivedBytes));
+							   fmt::format("Sending {} key strokes to device.", ReceivedBytes));
 					if (!RTTYS_server().KeyStrokes(Connection, FrameBuffer, ReceivedBytes)) {
 						EndConnection(Connection,__func__,__LINE__);
 						return;
 					}
 				}
 			} break;
-
-			case Poco::Net::WebSocket::FRAME_OP_CONT: {
-				// may have to handle this, but not sure whether it's a continuation for text or
-				// binary, seems to be a hole in the protocol.
-				poco_warning(Logger(),
-							 fmt::format("CONT Frame {} received, ignoring for now.",
-										 ReceivedBytes));
-			}
-
 			case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
 				EndConnection(Connection,__func__,__LINE__);
 				return;
@@ -711,8 +682,8 @@ namespace OpenWifi {
 		if (Connection->WSSocket_ != nullptr && Connection->WSSocket_->impl()!= nullptr) {
 			try {
 				Connection->WSSocket_->sendFrame(Buf, len,
-												 (int) Poco::Net::WebSocket::FRAME_FLAG_FIN |
-												 (int) Poco::Net::WebSocket::FRAME_OP_BINARY);
+												 Poco::Net::WebSocket::FRAME_FLAG_FIN |
+													 Poco::Net::WebSocket::FRAME_OP_BINARY);
 				return;
 			} catch (...) {
 				poco_error(Logger(), "SendData shutdown.");
@@ -1014,9 +985,8 @@ namespace OpenWifi {
 	}
 
 	bool RTTYS_server::SendToClient(Poco::Net::WebSocket &WebSocket, const u_char *Buf, int len) {
-		WebSocket.sendFrame(Buf, len,
-							(int) Poco::Net::WebSocket::FRAME_FLAG_FIN |
-							(int) Poco::Net::WebSocket::FRAME_OP_BINARY);
+		WebSocket.sendFrame(
+			Buf, len, Poco::Net::WebSocket::FRAME_FLAG_FIN | Poco::Net::WebSocket::FRAME_OP_BINARY);
 		return true;
 	}
 
@@ -1147,4 +1117,4 @@ namespace OpenWifi {
 	RTTYS_EndPoint::~RTTYS_EndPoint() {
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/storage/storage_command.cpp

@@ -644,7 +644,21 @@ namespace OpenWifi {
 			uint64_t Size = FileContent.str().size();
 
 			Poco::Data::Session Sess = Pool_->get();
+			Sess.begin();
+			Poco::Data::Statement Statement(Sess);
 
+			std::string StatementStr;
+
+			//	Get the existing command
+
+			StatementStr =
+				"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";
+
+			Statement << ConvertParams(StatementStr), Poco::Data::Keywords::use(WaitForFile),
+				Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(Size),
+				Poco::Data::Keywords::use(UUID);
+			Statement.execute();
+			Sess.commit();
 			if (Size < FileUploader()->MaxSize()) {
 
 				Poco::Data::BLOB TheBlob;
@@ -664,24 +678,9 @@ namespace OpenWifi {
 				Insert.execute();
 				Sess.commit();
 			} else {
-				poco_warning(Logger(),
-					fmt::format("File {} is too large ({} >= {} max bytes).",
-						UUID, Size, FileUploader()->MaxSize()));
+				poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
 			}
-
-			// update CommandList here to ensure that file us uploaded
-			Sess.begin();
-			Poco::Data::Statement Statement(Sess);
-			std::string StatementStr;
-			StatementStr =
-				"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";
-
-			Statement << ConvertParams(StatementStr), Poco::Data::Keywords::use(WaitForFile),
-				Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(Size),
-				Poco::Data::Keywords::use(UUID);
-			Statement.execute();
 			Sess.commit();
-
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -690,7 +689,7 @@ namespace OpenWifi {
 	}
 
 	bool Storage::GetAttachedFileContent(std::string &UUID, const std::string &SerialNumber,
-										 std::string &FileContent, std::string &Type, int &WaitingForFile) {
+										 std::string &FileContent, std::string &Type) {
 		try {
 			Poco::Data::BLOB L;
 			/*
@@ -703,10 +702,10 @@ namespace OpenWifi {
 			Poco::Data::Statement Select1(Sess);
 
 			std::string TmpSerialNumber;
-			std::string st1{"SELECT SerialNumber, Command , WaitingForFile FROM CommandList WHERE UUID=?"};
+			std::string st1{"SELECT SerialNumber, Command FROM CommandList WHERE UUID=?"};
 			std::string Command;
 			Select1 << ConvertParams(st1), Poco::Data::Keywords::into(TmpSerialNumber),
-				Poco::Data::Keywords::into(Command), Poco::Data::Keywords::into(WaitingForFile), Poco::Data::Keywords::use(UUID);
+				Poco::Data::Keywords::into(Command), Poco::Data::Keywords::use(UUID);
 			Select1.execute();
 
 			if (TmpSerialNumber != SerialNumber) {
@@ -826,4 +825,4 @@ namespace OpenWifi {
 		return false;
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/storage/storage_device.cpp

@@ -202,14 +202,15 @@ namespace OpenWifi {
 
 			std::string st;
 			std::string whereClause = "";
-			if (!platform.empty()) {
+			if(!platform.empty()) {
 				if (includeProvisioned == false) {
-					//whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='" + platform + "'");
-					whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='{}'", platform);
+
+					whereClause = fmt::format("WHERE entity='' and venue='' and DeviceType='" + platform + "'");
 				} else {
-					//whereClause = fmt::format("WHERE DeviceType='" + platform + "'");
-					whereClause = fmt::format("WHERE DeviceType='{}'", platform);
+					whereClause = fmt::format("WHERE DeviceType='" + platform + "'");
 				}
+			
+
 				//st = "SELECT SerialNumber From Devices WHERE DeviceType='" + platform + "' ";
 			} else {
 				if (includeProvisioned == false) {
@@ -217,7 +218,7 @@ namespace OpenWifi {
 				}
 				//st = "SELECT SerialNumber From Devices ";
 			}
-
+			
 			st = fmt::format("SELECT SerialNumber From Devices {}", whereClause);
 
 			if (orderBy.empty())
@@ -895,9 +896,9 @@ namespace OpenWifi {
 				if (includeProvisioned == false) {
 					whereClause = fmt::format("WHERE DeviceType='{}' and entity='' and venue=''",platform);
 				} else {
-					whereClause = fmt::format("WHERE DeviceType='{}'", platform);
+					whereClause = fmt::format("WHERE DeviceType='{}'", platform);				
 				}
-
+		
 			}
 
 			st =
@@ -906,7 +907,7 @@ namespace OpenWifi {
 							ComputeRange(From, HowMany));
 
 			//Logger().information(fmt::format(" GetDevices st is {} ", st));
-
+			
 			Select << ConvertParams(st), Poco::Data::Keywords::into(Records);
 			Select.execute();
 

src/storage/storage_tables.cpp

@@ -49,7 +49,8 @@ namespace OpenWifi {
 						"Data TEXT, "
 						"Recorded BIGINT, "
 						"INDEX StatSerial0 (SerialNumber)), ",
-					"INDEX StatSerial (SerialNumber ASC, Recorded ASC))", Poco::Data::Keywords::now;
+						"INDEX StatSerial (SerialNumber ASC, Recorded ASC))",
+					Poco::Data::Keywords::now;
 			}
 			return 0;
 		} catch (const Poco::Exception &E) {
@@ -153,7 +154,8 @@ namespace OpenWifi {
 				"alter table devices add column lastRecordedContact bigint",
 				"alter table devices add column simulated boolean",
 				"alter table devices add column certificateExpiryDate bigint",
-				"alter table devices add column connectReason TEXT"};
+				"alter table devices add column connectReason TEXT"
+			};
 
 			for (const auto &i : Script) {
 				try {
@@ -277,7 +279,9 @@ namespace OpenWifi {
 					Poco::Data::Keywords::now;
 			}
 
-			std::vector<std::string> Script{"alter table DefaultConfigs add column Platform text"};
+			std::vector<std::string> Script{
+				"alter table DefaultConfigs add column Platform text"
+			};
 
 			for (const auto &i : Script) {
 				try {