Chg: update image tag in helm values to v2.9.0

https://telecominfraproject.atlassian.net/browse/WIFI-12068

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owsec VERSION 3.0.0)
+project(owsec VERSION 2.9.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -42,7 +42,7 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
 endif()
 
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT -DBOOST_NO_CXX98_FUNCTION_BASE=1)
+add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 
 set(BUILD_SHARED_LIBS 1)
 
@@ -118,7 +118,7 @@ add_executable( owsec
         src/framework/RESTAPI_PartHandler.h
         src/framework/MicroService.cpp
         src/framework/MicroServiceExtra.h
-        src/framework/default_device_types.h
+
         src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
         src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
         src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
@@ -185,7 +185,6 @@ if(NOT SMALL_BUILD)
             CppKafka::cppkafka
             ${AWSSDK_LINK_LIBRARIES}
             fmt::fmt
-            resolv
             )
     if(UNIX AND NOT APPLE)
         target_link_libraries(owsec PUBLIC PocoJSON)

build

@@ -1 +1 @@
-6
+17

docker-entrypoint.sh

@@ -60,16 +60,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owsec"} \
   STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owsec"} \
   STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  USER_HELPER_EMAIL=${USER_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \
-  SUB_HELPER_EMAIL=${SUB_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \
-  GLOBAL_USER_HELPER_EMAIL=${GLOBAL_USER_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \
-  GLOBAL_SUB_HELPER_EMAIL=${GLOBAL_SUB_HELPER_EMAIL:-"openwifi@telecominfraproject.com"} \
-  USER_HELPER_SITE=${USER_HELPER_SITE:-"https://openwifi.telecominfraproject.com"} \
-  SUB_HELPER_SITE=${SUB_HELPER_SITE:-"https://openwifi.telecominfraproject.com"} \
-  USER_SYSTEM_LOGIN=${USER_SYSTEM_LOGIN:-"https://openwifi.telecominfraproject.com"} \
-  SUB_SYSTEM_LOGIN=${SUB_SYSTEM_LOGIN:-"https://openwifi.telecominfraproject.com"} \
-  USER_SIGNATURE=${USER_SIGNATURE:-"Telecom Infra Project"} \
-  SUB_SIGNATURE=${SUB_SIGNATURE:-"Telecom Infra Project"} \
   envsubst < /owsec.properties.tmpl > $OWSEC_CONFIG/owsec.properties
 fi
 

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owsec:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owsec
-    tag: v3.0.0-RC2
+    tag: v2.9.0
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

openpapi/owsec.yaml

@@ -565,6 +565,12 @@ components:
             - $ref: '#/components/schemas/StringList'
             - $ref: '#/components/schemas/TagValuePairList'
 
+    SystemCommandResults:
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/StringList'
+        - $ref: '#/components/schemas/TagValuePairList'
+
     SystemInfoResults:
       type: object
       properties:
@@ -593,33 +599,6 @@ components:
                 type: integer
                 format: int64
 
-    SystemResources:
-      type: object
-      properties:
-        numberOfFileDescriptors:
-          type: integer
-          format: int64
-        currRealMem:
-          type: integer
-          format: int64
-        peakRealMem:
-          type: integer
-          format: int64
-        currVirtMem:
-          type: integer
-          format: int64
-        peakVirtMem:
-          type: integer
-          format: int64
-
-    SystemCommandResults:
-      type: object
-      oneOf:
-        - $ref: '#/components/schemas/SystemResources'
-        - $ref: '#/components/schemas/SystemInfoResults'
-        - $ref: '#/components/schemas/StringList'
-        - $ref: '#/components/schemas/TagValuePairList'
-
     ProfileAction:
       type: object
       properties:
@@ -1131,12 +1110,6 @@ paths:
             type: string
             format: uuid
           required: true
-        - in: query
-          description: When used, signifies the the id is actually the email address of the user, and not its uuid
-          name: byEmail
-          schema:
-            type: boolean
-          required: false
       responses:
         200:
           $ref: '#/components/schemas/UserInfo'
@@ -1253,12 +1226,6 @@ paths:
             type: string
             format: uuid
           required: true
-        - in: query
-          description: When used, signifies the the id is actually the email address of the user, and not its uuid
-          name: byEmail
-          schema:
-            type: boolean
-          required: false
       responses:
         200:
           $ref: '#/components/schemas/UserInfo'
@@ -1882,6 +1849,19 @@ paths:
   #########################################################################################
   ##  The following calls are restricted to the private system side APIs
   #########################################################################################
+  /systemServices:
+    get:
+      tags:
+        - Security
+      summary: Retrieve the basic system information. This information is used between services only.
+      operationId: getSystemServices
+      responses:
+        200:
+          $ref: '#/components/schemas/InternalSystemServices'
+        403:
+          $ref: '#/components/responses/Unauthorized'
+        404:
+          $ref: '#/components/responses/NotFound'
 
   /validateToken:
     get:
@@ -1988,12 +1968,16 @@ paths:
             type: string
             enum:
               - info
-              - extraConfiguration
-              - resources
           required: true
+
       responses:
         200:
-          $ref: '#/components/schemas/SystemCommandResults'
+          description: Successful command execution
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/SystemInfoResults'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -2001,8 +1985,6 @@ paths:
 
   /systemSecret/{secret}:
     get:
-      tags:
-        - System Secrets
       description: Retrieve a specific secret
       operationId: getSecret
       parameters:
@@ -2047,8 +2029,6 @@ paths:
           $ref: '#/components/responses/NotFound'
 
     put:
-      tags:
-        - System Secrets
       description: Modify a specific secret
       operationId: modifySecret
       parameters:

owsec.properties

@@ -34,8 +34,8 @@ authentication.default.username = tip@ucentral.com
 authentication.default.password = 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf
 openwifi.system.data = $OWSEC_ROOT/data
 openwifi.system.uri.private = https://localhost:17001
-openwifi.system.uri.public = https://main.server.com:16001
+openwifi.system.uri.public = https://local.dpaas.arilia.com:16001
-openwifi.system.uri.ui = https://ucentral-ui.main.server.com
+openwifi.system.uri.ui = https://ucentral-ui.arilia.com
 openwifi.security.restapi.disable = false
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
@@ -64,19 +64,9 @@ mailer.loginmethod = login
 mailer.port = 587
 mailer.templates = $OWSEC_ROOT/templates
 
-helper.user.email = openwifi@telecominfraproject.com
-helper.sub.email = openwifi@telecominfraproject.com
-helper.user.global.email = openwifi@telecominfraproject.com
-helper.sub.global.email = openwifi@telecominfraproject.com
-helper.user.site = https://openwifi.telecominfraproject.com
-helper.sub.site = https://openwifi.telecominfraproject.com
-helper.user.login = https://openwifi.telecominfraproject.com
-helper.sub.login = https://openwifi.telecominfraproject.com
-helper.user.signature = Telecom Infra Project
-helper.sub.signature = Telecom Infra Project
 
 #############################
-# Generic information for all micro-services
+# Generic information for all micro services
 #############################
 #
 # NLB Support
@@ -90,7 +80,7 @@ alb.port = 16101
 openwifi.kafka.group.id = security
 openwifi.kafka.client.id = security1
 openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = kafka:9092
+openwifi.kafka.brokerlist = a1.arilia.com:9092
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
 openwifi.kafka.ssl.ca.location =
@@ -120,18 +110,18 @@ storage.type.sqlite.maxsessions = 128
 storage.type.postgresql.maxsessions = 64
 storage.type.postgresql.idletime = 60
 storage.type.postgresql.host = localhost
-storage.type.postgresql.username = owsec
+storage.type.postgresql.username = stephb
-storage.type.postgresql.password = owsec
+storage.type.postgresql.password = snoopy99
-storage.type.postgresql.database = owsec
+storage.type.postgresql.database = ucentral
 storage.type.postgresql.port = 5432
 storage.type.postgresql.connectiontimeout = 60
 
 storage.type.mysql.maxsessions = 64
 storage.type.mysql.idletime = 60
 storage.type.mysql.host = localhost
-storage.type.mysql.username = owsec
+storage.type.mysql.username = stephb
-storage.type.mysql.password = owsec
+storage.type.mysql.password = snoopy99
-storage.type.mysql.database = owsec
+storage.type.mysql.database = ucentral
 storage.type.mysql.port = 3306
 storage.type.mysql.connectiontimeout = 60
 

owsec.properties.tmpl

@@ -64,16 +64,6 @@ mailer.loginmethod = login
 mailer.port = ${MAILER_PORT}
 mailer.templates = ${MAILER_TEMPLATES}
 
-helper.user.email = ${USER_HELPER_EMAIL}
-helper.sub.email = ${SUB_HELPER_EMAIL}
-helper.user.global.email = ${GLOBAL_USER_HELPER_EMAIL}
-helper.sub.global.email = ${GLOBAL_SUB_HELPER_EMAIL}
-helper.user.site = ${USER_HELPER_SITE}
-helper.sub.site = ${SUB_HELPER_SITE}
-helper.user.login = ${USER_SYSTEM_LOGIN}
-helper.sub.login = ${SUB_SYSTEM_LOGIN}
-helper.user.signature = ${USER_SIGNATURE}
-helper.sub.signature = ${SUB_SIGNATURE}
 
 #############################
 # Generic information for all micro services

src/ActionLinkManager.cpp

@@ -28,13 +28,10 @@ namespace OpenWifi {
 		poco_information(Logger(), "Stopped...");
 	}
 
-
+	void ActionLinkManager::run() {
-    void ActionLinkManager::run() {
 		Running_ = true;
 		Utils::SetThreadName("action-mgr");
 
-        Poco::Thread::trySleep(10000);
-
 		while (Running_) {
 			Poco::Thread::trySleep(2000);
 			if (!Running_)
@@ -101,8 +98,10 @@ namespace OpenWifi {
 				} break;
 
 				case OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD: {
+					auto Signup = Poco::StringTokenizer(UInfo.signingUp, ":");
 					if (AuthService()->SendEmailToSubUser(i.id, UInfo.email,
-														  MessagingTemplates::SUB_FORGOT_PASSWORD,"")) {
+														  MessagingTemplates::SUB_FORGOT_PASSWORD,
+														  Signup.count() == 1 ? "" : Signup[0])) {
 						poco_information(
 							Logger(),
 							fmt::format("Send subscriber password reset link to {}", UInfo.email));
@@ -111,8 +110,10 @@ namespace OpenWifi {
 				} break;
 
 				case OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL: {
+					auto Signup = Poco::StringTokenizer(UInfo.signingUp, ":");
 					if (AuthService()->SendEmailToSubUser(
-							i.id, UInfo.email, MessagingTemplates::SUB_EMAIL_VERIFICATION,"")) {
+							i.id, UInfo.email, MessagingTemplates::SUB_EMAIL_VERIFICATION,
+							Signup.count() == 1 ? "" : Signup[0])) {
 						poco_information(
 							Logger(), fmt::format("Send subscriber email verification link to {}",
 												  UInfo.email));

src/AuthService.cpp

@@ -218,7 +218,7 @@ namespace OpenWifi {
 				Expired = (WT.created_ + WT.expires_in_) < now;
 				if (StorageService()->UserDB().GetUserById(UserId, UInfo.userinfo)) {
 					UInfo.webtoken = WT;
-					poco_trace(Logger(), fmt::format("TokenValidation success for TID={} Token={}",
+					poco_debug(Logger(), fmt::format("TokenValidation success for TID={} Token={}",
 													 TID, Utils::SanitizeToken(CallToken)));
 					return true;
 				}
@@ -342,8 +342,10 @@ namespace OpenWifi {
 				Obj.set("event", "remove-token");
 				Obj.set("id", MicroServiceID());
 				Obj.set("token", token);
+				std::stringstream ResultText;
+				Poco::JSON::Stringifier::stringify(Obj, ResultText);
 				KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,
-											MicroServicePrivateEndPoint(), Obj, false);
+											MicroServicePrivateEndPoint(), ResultText.str(), false);
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -798,6 +800,7 @@ namespace OpenWifi {
 
 		if (StorageService()->SubDB().GetUserByEmail(Email, UInfo)) {
 			switch (Reason) {
+
 			case MessagingTemplates::SUB_FORGOT_PASSWORD: {
 				MessageAttributes Attrs;
 				Attrs[RECIPIENT_EMAIL] = UInfo.email;

src/Daemon.cpp

@@ -37,9 +37,9 @@ namespace OpenWifi {
 			instance_ =
 				new Daemon(vDAEMON_PROPERTIES_FILENAME, vDAEMON_ROOT_ENV_VAR,
 						   vDAEMON_CONFIG_ENV_VAR, vDAEMON_APP_NAME, vDAEMON_BUS_TIMER,
-						   SubSystemVec{StorageService(), SMSSender(), AuthService(), ActionLinkManager(),
+						   SubSystemVec{StorageService(), SMSSender(), ActionLinkManager(),
 										SMTPMailerService(), RESTAPI_RateLimiter(), TotpCache(),
-										UI_WebSocketClientServer(), SecretStore()});
+										AuthService(), UI_WebSocketClientServer(), SecretStore()});
 		}
 		return instance_;
 	}

src/RESTAPI/RESTAPI_action_links.cpp

@@ -37,11 +37,11 @@ namespace OpenWifi {
 		if (Action == "password_reset")
 			return RequestResetPassword(Link);
 		else if (Action == "sub_password_reset")
-			return RequestResetPassword(Link);
+			return RequestSubResetPassword(Link);
 		else if (Action == "email_verification")
 			return DoEmailVerification(Link);
 		else if (Action == "sub_email_verification")
-			return DoEmailVerification(Link);
+			return DoSubEmailVerification(Link);
 		else if (Action == "signup_verification")
 			return DoNewSubVerification(Link);
 		else
@@ -101,6 +101,7 @@ namespace OpenWifi {
 	}
 
 	void RESTAPI_action_links::CompleteResetPassword() {
+		//  form has been posted...
 		RESTAPI_PartHandler PartHandler;
 		Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
 		if (!Form.empty()) {

src/RESTAPI/RESTAPI_routers.cpp

@@ -1,4 +1,4 @@
- //
+//
 // Created by stephane bourque on 2021-10-23.
 //
 

src/RESTAPI/RESTAPI_sms_handler.cpp

@@ -34,9 +34,7 @@ namespace OpenWifi {
 			return BadRequest(RESTAPI::Errors::SMSCouldNotValidate);
 		}
 
-        if(Internal_) {
+		if (UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-            poco_information(Logger(),fmt::format("Internal SMS request: TID={}", TransactionId_));
-        } else if (UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
 			UserInfo_.userinfo.userRole != SecurityObjects::PARTNER &&
 			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
 			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);

src/RESTAPI/RESTAPI_subuser_handler.cpp

@@ -185,7 +185,7 @@ namespace OpenWifi {
 			}
 		}
 
-		if (GetBoolParameter("forgotPassword") || GetBoolParameter("resetPassword")) {
+		if (GetBoolParameter("forgotPassword")) {
 			Existing.changePassword = true;
 			Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}",
 											Request->clientAddress().toString(), Existing.email));

src/RESTAPI/RESTAPI_user_handler.cpp

@@ -33,7 +33,7 @@ namespace OpenWifi {
 			return NotFound();
 		}
 
-		if (!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo, UInfo, ACLProcessor::READ)) {
+		if (!ACLProcessor::Can(UserInfo_.userinfo, UInfo, ACLProcessor::READ)) {
 			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
 		}
 

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -13,7 +13,6 @@
 #ifdef TIP_GATEWAY_SERVICE
 #include "AP_WS_Server.h"
 #include "CapabilitiesCache.h"
-#include "RADIUSSessionTracker.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
@@ -30,7 +29,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
 		field_to_json(Obj, "deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
-		field_to_json(Obj, "hasRADIUSSessions", RADIUSSessionTracker()->HasSessions(SerialNumber));
 #endif
 		field_to_json(Obj, "macAddress", MACAddress);
 		field_to_json(Obj, "manufacturer", Manufacturer);
@@ -56,9 +54,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "pendingConfiguration", pendingConfiguration);
 		field_to_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
 		field_to_json(Obj, "restrictionDetails", restrictionDetails);
-		field_to_json(Obj, "pendingUUID", pendingUUID);
-		field_to_json(Obj, "simulated", simulated);
-		field_to_json(Obj, "lastRecordedContact", lastRecordedContact);
 	}
 
 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -68,7 +63,7 @@ namespace OpenWifi::GWObjects {
 		ConnectionState ConState;
 
 		if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
-			ConState.to_json(SerialNumber,Obj);
+			ConState.to_json(Obj);
 		} else {
 			field_to_json(Obj, "ipAddress", "");
 			field_to_json(Obj, "txBytes", (uint64_t)0);
@@ -80,13 +75,6 @@ namespace OpenWifi::GWObjects {
 			field_to_json(Obj, "associations_2G", (uint64_t)0);
 			field_to_json(Obj, "associations_5G", (uint64_t)0);
 			field_to_json(Obj, "associations_6G", (uint64_t)0);
-			field_to_json(Obj, "hasRADIUSSessions", false);
-			field_to_json(Obj, "hasGPS", ConState.hasGPS);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "memoryUsed", ConState.memoryUsed);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "load", ConState.load);
-			field_to_json(Obj, "temperature", ConState.temperature);
 		}
 #endif
 	}
@@ -96,32 +84,20 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj, "serialNumber", SerialNumber);
 			field_from_json(Obj, "deviceType", DeviceType);
 			field_from_json(Obj, "macAddress", MACAddress);
-			field_from_json(Obj, "manufacturer", Manufacturer);
-			field_from_json(Obj, "UUID", UUID);
 			field_from_json(Obj, "configuration", Configuration);
 			field_from_json(Obj, "notes", Notes);
-			field_from_json(Obj, "createdTimestamp", CreationTimestamp);
+			field_from_json(Obj, "manufacturer", Manufacturer);
-			field_from_json(Obj, "lastConfigurationChange", LastConfigurationChange);
-			field_from_json(Obj, "lastConfigurationDownload", LastConfigurationDownload);
-			field_from_json(Obj, "lastFWUpdate", LastFWUpdate);
 			field_from_json(Obj, "owner", Owner);
 			field_from_json(Obj, "location", Location);
 			field_from_json(Obj, "venue", Venue);
-			field_from_json(Obj, "firmware", Firmware);
 			field_from_json(Obj, "compatible", Compatible);
-			field_from_json(Obj, "fwUpdatePolicy", FWUpdatePolicy);
-			field_from_json(Obj, "devicePassword", DevicePassword);
 			field_from_json(Obj, "subscriber", subscriber);
 			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "modified", modified);
 			field_from_json(Obj, "locale", locale);
 			field_from_json(Obj, "restrictedDevice", restrictedDevice);
 			field_from_json(Obj, "pendingConfiguration", pendingConfiguration);
 			field_from_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
 			field_from_json(Obj, "restrictionDetails", restrictionDetails);
-			field_from_json(Obj, "pendingUUID", pendingUUID);
-			field_from_json(Obj, "simulated", simulated);
-			field_from_json(Obj, "lastRecordedContact", lastRecordedContact);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -171,31 +147,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "lastModified", LastModified);
 	}
 
-	void DefaultFirmware::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "description", Description);
-		field_to_json(Obj, "uri", uri);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "imageCreationDate", imageCreationDate);
-		field_to_json(Obj, "created", Created);
-		field_to_json(Obj, "lastModified", LastModified);
-	}
-
-	bool DefaultFirmware::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "description", Description);
-			field_from_json(Obj, "uri", uri);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "imageCreationDate", imageCreationDate);
-			field_from_json(Obj, "created", Created);
-			field_from_json(Obj, "lastModified", LastModified);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 	void CommandDetails::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("details", Obj, Details);
 		EmbedDocument("results", Obj, Results);
@@ -214,8 +165,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "waitingForFile", WaitingForFile);
 		field_to_json(Obj, "attachFile", AttachDate);
 		field_to_json(Obj, "executionTime", executionTime);
-		field_to_json(Obj, "lastTry", lastTry);
-		field_to_json(Obj, "deferred", deferred);
 	}
 
 	bool DefaultConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -249,7 +198,7 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	void ConnectionState::to_json([[maybe_unused]] const std::string &SerialNumber, Poco::JSON::Object &Obj)  {
+	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "ipAddress", Address);
 		field_to_json(Obj, "txBytes", TX);
 		field_to_json(Obj, "rxBytes", RX);
@@ -271,22 +220,6 @@ 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, "connectReason", connectReason);
-
-#ifdef TIP_GATEWAY_SERVICE
-		hasRADIUSSessions = RADIUSSessionTracker()->HasSessions(SerialNumber);
-		AP_WS_Server()->ExtendedAttributes(SerialNumber, hasGPS, sanity,
-										   memoryUsed,
-										   load,
-										   temperature);
-#endif
-		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
-		field_to_json(Obj, "hasGPS", hasGPS);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "memoryUsed", memoryUsed);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "load", load);
-		field_to_json(Obj, "temperature", temperature);
 
 		switch (VerifiedCertificate) {
 		case NO_CERTIFICATE:
@@ -301,9 +234,6 @@ namespace OpenWifi::GWObjects {
 		case VERIFIED:
 			field_to_json(Obj, "verifiedCertificate", "VERIFIED");
 			break;
-		case SIMULATED:
-			field_to_json(Obj, "verifiedCertificate", "SIMULATED");
-			break;
 		default:
 			field_to_json(Obj, "verifiedCertificate", "NO_CERTIFICATE");
 			break;
@@ -430,10 +360,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "acctConfig", acctConfig);
 		field_to_json(Obj, "coaConfig", coaConfig);
 		field_to_json(Obj, "useByDefault", useByDefault);
-		field_to_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-		field_to_json(Obj, "poolProxyIp", poolProxyIp);
-		field_to_json(Obj, "radsecPoolType", radsecPoolType);
-		field_to_json(Obj, "enabled", enabled);
 	}
 
 	bool RadiusProxyPool::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -444,10 +370,6 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj, "acctConfig", acctConfig);
 			field_from_json(Obj, "coaConfig", coaConfig);
 			field_from_json(Obj, "useByDefault", useByDefault);
-			field_from_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-			field_from_json(Obj, "poolProxyIp", poolProxyIp);
-			field_from_json(Obj, "radsecPoolType", radsecPoolType);
-			field_from_json(Obj, "enabled", enabled);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -568,29 +490,6 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}
 
-	void RangeOptions::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "NO_IR", NO_IR);
-		field_to_json(Obj, "AUTO_BW", AUTO_BW);
-		field_to_json(Obj, "DFS", DFS);
-		field_to_json(Obj, "NO_OUTDOOR", NO_OUTDOOR);
-		field_to_json(Obj, "wmmrule_ETSI", wmmrule_ETSI);
-		field_to_json(Obj, "NO_OFDM", NO_OFDM);
-	}
-
-	void FrequencyRange::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "from", from);
-		field_to_json(Obj, "to", to);
-		field_to_json(Obj, "channelWidth", channelWidth);
-		field_to_json(Obj, "powerDb", powerDb);
-		field_to_json(Obj, "options", options);
-	}
-
-	void RegulatoryCountryInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "country", country);
-		field_to_json(Obj, "domain", domain);
-		field_to_json(Obj, "ranges", ranges);
-	}
-
 	void DeviceRestrictionsKeyInfo::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj, "vendor", vendor);
 		field_to_json(Obj, "algo", algo);
@@ -645,74 +544,4 @@ namespace OpenWifi::GWObjects {
 				(T.commands != commands) || (T.developer != developer) || (T.ssh != ssh) ||
 				(T.key_info != key_info) || (T.country != country));
 	}
-
-	void RADIUSSession::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "lastTransaction", lastTransaction);
-		field_to_json(Obj, "destination", destination);
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "userName", userName);
-		field_to_json(Obj, "accountingSessionId", accountingSessionId);
-		field_to_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-		field_to_json(Obj, "inputPackets", inputPackets);
-		field_to_json(Obj, "outputPackets", outputPackets);
-		field_to_json(Obj, "inputOctets", inputOctets);
-		field_to_json(Obj, "outputOctets", outputOctets);
-		field_to_json(Obj, "inputGigaWords", inputGigaWords);
-		field_to_json(Obj, "outputGigaWords", outputGigaWords);
-		field_to_json(Obj, "sessionTime", sessionTime);
-		field_to_json(Obj, "callingStationId", callingStationId);
-		field_to_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-		field_to_json(Obj, "interface", interface);
-		field_to_json(Obj, "secret", secret);
-		field_to_json(Obj, "nasId", nasId);
-		field_to_json(Obj, "calledStationId", calledStationId);
-	}
-
-	void RADIUSSessionList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "sessions", sessions);
-	}
-
-	void RadiusCoADMParameters::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "accountingSessionId", accountingSessionId);
-		field_to_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-		field_to_json(Obj, "callingStationId", callingStationId);
-		field_to_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-		field_to_json(Obj, "userName", userName);
-	}
-
-	bool RadiusCoADMParameters::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "accountingSessionId", accountingSessionId);
-			field_from_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-			field_from_json(Obj, "callingStationId", callingStationId);
-			field_from_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-			field_from_json(Obj, "userName", userName);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceTransferRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "server", server);
-			field_from_json(Obj, "port", port);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceCertificateUpdateRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "encodedCertificate", encodedCertificate);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 } // namespace OpenWifi::GWObjects

src/RESTObjects/RESTAPI_GWobjects.h

@@ -11,13 +11,9 @@
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
 
-#ifdef TIP_GATEWAY_SERVICE
-#include <RADIUS_helpers.h>
-#endif
-
 namespace OpenWifi::GWObjects {
 
-	enum CertificateValidation { NO_CERTIFICATE, VALID_CERTIFICATE, MISMATCH_SERIAL, VERIFIED, SIMULATED };
+	enum CertificateValidation { NO_CERTIFICATE, VALID_CERTIFICATE, MISMATCH_SERIAL, VERIFIED };
 
 	struct ConnectionState {
 		uint64_t MessageCount = 0;
@@ -42,15 +38,8 @@ namespace OpenWifi::GWObjects {
 		uint64_t sessionId = 0;
 		double connectionCompletionTime = 0.0;
 		std::uint64_t certificateExpiryDate = 0;
-		std::uint64_t hasRADIUSSessions = 0;
-		bool hasGPS = false;
-		std::uint64_t sanity=0;
-		std::double_t memoryUsed=0.0;
-		std::double_t load=0.0;
-		std::double_t temperature=0.0;
-		std::string 	connectReason;
 
-		void to_json(const std::string &SerialNumber, Poco::JSON::Object &Obj) ;
+		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct DeviceRestrictionsKeyInfo {
@@ -107,9 +96,6 @@ namespace OpenWifi::GWObjects {
 		std::string pendingConfiguration;
 		std::string pendingConfigurationCmd;
 		DeviceRestrictions restrictionDetails;
-		std::uint64_t pendingUUID = 0;
-		bool simulated=false;
-		std::uint64_t lastRecordedContact=0;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
@@ -182,26 +168,6 @@ namespace OpenWifi::GWObjects {
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
-	struct DefaultFirmware {
-		std::string deviceType;
-		std::string Description;
-		std::string uri;
-		std::string revision;
-		uint64_t imageCreationDate;
-		uint64_t Created;
-		uint64_t LastModified;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DefaultFirmwareList {
-		std::vector<DefaultFirmware>	firmwares;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 	struct CommandDetails {
 		std::string UUID;
 		std::string SerialNumber;
@@ -222,11 +188,7 @@ namespace OpenWifi::GWObjects {
 		uint64_t AttachSize = 0;
 		std::string AttachType;
 		double executionTime = 0.0;
-		std::uint64_t lastTry = 0;
-		bool deferred = false;
-
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct BlackListedDevice {
@@ -360,10 +322,6 @@ namespace OpenWifi::GWObjects {
 		RadiusProxyServerConfig acctConfig;
 		RadiusProxyServerConfig coaConfig;
 		bool useByDefault = false;
-		std::string 	radsecPoolType;
-		std::string 	poolProxyIp;
-		std::uint64_t 	radsecKeepAlive=25;
-		bool			enabled=true;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -376,139 +334,4 @@ namespace OpenWifi::GWObjects {
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
-	struct RangeOptions {
-		bool NO_IR=false;
-		bool AUTO_BW=false;
-		bool DFS=false;
-		bool NO_OUTDOOR=false;
-		bool wmmrule_ETSI=false;
-		bool NO_OFDM=false;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct FrequencyRange {
-		float from = 0.0;
-		float to = 0.0;
-		int channelWidth = 0;
-		int powerDb = 0;
-		RangeOptions    options;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RegulatoryCountryInfo {
-		std::string country;
-		std::string domain;
-		std::vector<FrequencyRange>   ranges;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	using RegulatoryInfoCountryMap = std::map<std::string,RegulatoryCountryInfo>;
-
-	struct RADIUSSession {
-		std::uint64_t 			started=0,
-								lastTransaction=0;
-		std::string 			serialNumber,
-								destination,
-								userName,
-					 			accountingSessionId,
-								accountingMultiSessionId,
-					 			callingStationId,
-								chargeableUserIdentity,
-								secret,
-								interface,
-								nasId;
-		std::uint64_t 			inputPackets = 0,
-								outputPackets = 0,
-								inputOctets = 0,
-								outputOctets = 0,
-								inputGigaWords = 0,
-								outputGigaWords = 0;
-		std::uint32_t 			sessionTime = 0;
-		std::string 			calledStationId;
-
-#ifdef TIP_GATEWAY_SERVICE
-		RADIUS::RadiusPacket	accountingPacket;
-#endif
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RADIUSSessionList {
-		std::vector<RADIUSSession>	sessions;
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RadiusCoADMParameters {
-		std::string 			accountingSessionId,
-								accountingMultiSessionId,
-								callingStationId,
-								chargeableUserIdentity,
-								userName;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	enum class RadiusPoolStrategy {
-		round_robin, random, weighted, unknown
-	};
-
-	enum class RadiusEndpointType {
-		generic, radsec, globalreach, orion, unknown
-	};
-
-	static inline RadiusEndpointType RadiusEndpointType(const std::string &T) {
-		if(T=="generic") return RadiusEndpointType::generic;
-		if(T=="radsec") return RadiusEndpointType::radsec;
-		if(T=="globalreach") return RadiusEndpointType::globalreach;
-		if(T=="orion") return RadiusEndpointType::orion;
-		return RadiusEndpointType::unknown;
-	}
-
-	static inline RadiusPoolStrategy RadiusPoolStrategy(const std::string &T) {
-		if(T=="round_robin") return RadiusPoolStrategy::round_robin;
-		if(T=="random") return RadiusPoolStrategy::random;
-		if(T=="weighted") return RadiusPoolStrategy::weighted;
-		return RadiusPoolStrategy::unknown;
-	}
-
-	static inline std::string to_string(enum RadiusEndpointType T) {
-		switch(T) {
-		case RadiusEndpointType::generic: return "generic";
-		case RadiusEndpointType::radsec: return "radsec";
-		case RadiusEndpointType::globalreach: return "globalreach";
-		case RadiusEndpointType::orion: return "orion";
-		default:
-			return "unknown";
-		}
-	}
-
-	static inline std::string to_string(enum RadiusPoolStrategy T) {
-		switch(T) {
-		case RadiusPoolStrategy::round_robin: return "round_robin";
-		case RadiusPoolStrategy::random: return "random";
-		case RadiusPoolStrategy::weighted: return "weighted";
-		default:
-			return "unknown";
-		}
-	}
-
-	struct DeviceTransferRequest {
-		std::string 	serialNumber;
-		std::string 	server;
-		std::uint64_t 	port;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DeviceCertificateUpdateRequest {
-		std::string 	serialNumber;
-		std::string 	encodedCertificate;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 } // namespace OpenWifi::GWObjects

src/RESTObjects/RESTAPI_OWLSobjects.cpp

@@ -78,22 +78,21 @@ namespace OpenWifi::OWLSObjects {
 		return false;
 	}
 
-    void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
+	void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
+		field_to_json(Obj, "id", id);
-        field_to_json(Obj, "simulationId", simulationId);
+		field_to_json(Obj, "simulationId", simulationId);
-        field_to_json(Obj, "state", state);
+		field_to_json(Obj, "state", state);
-        field_to_json(Obj, "tx", tx);
+		field_to_json(Obj, "tx", tx);
-        field_to_json(Obj, "rx", rx);
+		field_to_json(Obj, "rx", rx);
-        field_to_json(Obj, "msgsTx", msgsTx);
+		field_to_json(Obj, "msgsTx", msgsTx);
-        field_to_json(Obj, "msgsRx", msgsRx);
+		field_to_json(Obj, "msgsRx", msgsRx);
-        field_to_json(Obj, "liveDevices", liveDevices);
+		field_to_json(Obj, "liveDevices", liveDevices);
-        field_to_json(Obj, "timeToFullDevices", timeToFullDevices);
+		field_to_json(Obj, "timeToFullDevices", timeToFullDevices);
-        field_to_json(Obj, "startTime", startTime);
+		field_to_json(Obj, "startTime", startTime);
-        field_to_json(Obj, "endTime", endTime);
+		field_to_json(Obj, "endTime", endTime);
-        field_to_json(Obj, "errorDevices", errorDevices);
+		field_to_json(Obj, "errorDevices", errorDevices);
-        field_to_json(Obj, "owner", owner);
+		field_to_json(Obj, "owner", owner);
-        field_to_json(Obj, "expectedDevices", expectedDevices);
+	}
-    }
 
 	void Dashboard::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {}
 

src/RESTObjects/RESTAPI_OWLSobjects.h

@@ -43,24 +43,23 @@ namespace OpenWifi::OWLSObjects {
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
-    struct SimulationStatus {
+	struct SimulationStatus {
-        std::string id;
+		std::string id;
-        std::string simulationId;
+		std::string simulationId;
-        std::string state;
+		std::string state;
-        uint64_t tx;
+		uint64_t tx;
-        uint64_t rx;
+		uint64_t rx;
-        uint64_t msgsTx;
+		uint64_t msgsTx;
-        uint64_t msgsRx;
+		uint64_t msgsRx;
-        uint64_t liveDevices;
+		uint64_t liveDevices;
-        uint64_t timeToFullDevices;
+		uint64_t timeToFullDevices;
-        uint64_t startTime;
+		uint64_t startTime;
-        uint64_t endTime;
+		uint64_t endTime;
-        uint64_t errorDevices;
+		uint64_t errorDevices;
-        std::string owner;
+		std::string owner;
-        uint64_t expectedDevices;
 
-        void to_json(Poco::JSON::Object &Obj) const;
+		void to_json(Poco::JSON::Object &Obj) const;
-    };
+	};
 
 	struct Dashboard {
 		int O;

src/RESTObjects/RESTAPI_ProvObjects.cpp

@@ -1194,243 +1194,4 @@ namespace OpenWifi::ProvObjects {
 		return false;
 	}
 
-    void GLBLRAccountInfo::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "privateKey", privateKey);
-        field_to_json(Obj, "country", country);
-        field_to_json(Obj, "province", province);
-        field_to_json(Obj, "city", city);
-        field_to_json(Obj, "organization", organization);
-        field_to_json(Obj, "commonName", commonName);
-        field_to_json(Obj, "CSR", CSR);
-        field_to_json(Obj, "CSRPrivateKey", CSRPrivateKey);
-        field_to_json(Obj, "CSRPublicKey", CSRPublicKey);
-        field_to_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
-    }
-
-    bool GLBLRAccountInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "privateKey", privateKey);
-            field_from_json(Obj, "country", country);
-            field_from_json(Obj, "province", province);
-            field_from_json(Obj, "city", city);
-            field_from_json(Obj, "organization", organization);
-            field_from_json(Obj, "commonName", commonName);
-            field_from_json(Obj, "CSR", CSR);
-            field_from_json(Obj, "CSRPrivateKey", CSRPrivateKey);
-            field_from_json(Obj, "CSRPublicKey", CSRPublicKey);
-            field_from_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void GLBLRCertificateInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
-        field_to_json(Obj, "name", name);
-        field_to_json(Obj, "accountId", accountId);
-        field_to_json(Obj, "csr", csr);
-        field_to_json(Obj, "certificate", certificate);
-        field_to_json(Obj, "certificateChain", certificateChain);
-        field_to_json(Obj, "certificateId", certificateId);
-        field_to_json(Obj, "expiresAt", expiresAt);
-        field_to_json(Obj, "created", created);
-    }
-
-    bool GLBLRCertificateInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "id", id);
-            field_from_json(Obj, "name", name);
-            field_from_json(Obj, "accountId", accountId);
-            field_from_json(Obj, "csr", csr);
-            field_from_json(Obj, "certificate", certificate);
-            field_from_json(Obj, "certificateChain", certificateChain);
-            field_from_json(Obj, "certificateId", certificateId);
-            field_from_json(Obj, "expiresAt", expiresAt);
-            field_from_json(Obj, "created", created);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void GooglOrionAccountInfo::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "privateKey", privateKey);
-        field_to_json(Obj, "certificate", certificate);
-        field_to_json(Obj, "cacerts", cacerts);
-    }
-
-    bool GooglOrionAccountInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "privateKey", privateKey);
-            field_from_json(Obj, "certificate", certificate);
-            field_from_json(Obj, "cacerts", cacerts);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSServer::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Hostname", Hostname);
-        field_to_json(Obj, "IP", IP);
-        field_to_json(Obj, "Port", Port);
-        field_to_json(Obj, "Secret", Secret);
-    }
-
-    bool RADIUSServer::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Hostname", Hostname);
-            field_from_json(Obj, "IP", IP);
-            field_from_json(Obj, "Port", Port);
-            field_from_json(Obj, "Secret", Secret);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPointRadiusType::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Authentication", Authentication);
-        field_to_json(Obj, "Accounting", Accounting);
-        field_to_json(Obj, "CoA", CoA);
-        field_to_json(Obj, "AccountingInterval", AccountingInterval);
-    }
-
-    bool RADIUSEndPointRadiusType::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Authentication", Authentication);
-            field_from_json(Obj, "Accounting", Accounting);
-            field_from_json(Obj, "CoA", CoA);
-            field_from_json(Obj, "AccountingInterval", AccountingInterval);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPointRadsecType::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Hostname", Hostname);
-        field_to_json(Obj, "IP", IP);
-        field_to_json(Obj, "Port", Port);
-        field_to_json(Obj, "Secret", Secret);
-        field_to_json(Obj, "OpenRoamingType", OpenRoamingType);
-        field_to_json(Obj, "UseOpenRoamingAccount", UseOpenRoamingAccount);
-        field_to_json(Obj, "Weight", Weight);
-        field_to_json(Obj, "Certificate", Certificate);
-        field_to_json(Obj, "PrivateKey", PrivateKey);
-        field_to_json(Obj, "CaCerts", CaCerts);
-        field_to_json(Obj, "AllowSelfSigned", AllowSelfSigned);
-    }
-
-    bool RADIUSEndPointRadsecType::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Hostname", Hostname);
-            field_from_json(Obj, "IP", IP);
-            field_from_json(Obj, "Port", Port);
-            field_from_json(Obj, "Secret", Secret);
-            field_from_json(Obj, "OpenRoamingType", OpenRoamingType);
-            field_from_json(Obj, "UseOpenRoamingAccount", UseOpenRoamingAccount);
-            field_from_json(Obj, "Weight", Weight);
-            field_from_json(Obj, "Certificate", Certificate);
-            field_from_json(Obj, "PrivateKey", PrivateKey);
-            field_from_json(Obj, "CaCerts", CaCerts);
-            field_from_json(Obj, "AllowSelfSigned", AllowSelfSigned);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPoint::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "Type", Type);
-        field_to_json(Obj, "RadsecServers", RadsecServers);
-        field_to_json(Obj, "RadiusServers", RadiusServers);
-        field_to_json(Obj, "PoolStrategy", PoolStrategy);
-        field_to_json(Obj, "Index", Index);
-        field_to_json(Obj, "UsedBy", UsedBy);
-        field_to_json(Obj, "UseGWProxy", UseGWProxy);
-        field_to_json(Obj, "NasIdentifier", NasIdentifier);
-        field_to_json(Obj, "AccountingInterval", AccountingInterval);
-    }
-
-    bool RADIUSEndPoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "Type", Type);
-            field_from_json(Obj, "RadsecServers", RadsecServers);
-            field_from_json(Obj, "RadiusServers", RadiusServers);
-            field_from_json(Obj, "PoolStrategy", PoolStrategy);
-            field_from_json(Obj, "Index", Index);
-            field_from_json(Obj, "UsedBy", UsedBy);
-            field_from_json(Obj, "UseGWProxy", UseGWProxy);
-            field_from_json(Obj, "NasIdentifier", NasIdentifier);
-            field_from_json(Obj, "AccountingInterval", AccountingInterval);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndpointUpdateStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "lastUpdate", lastUpdate);
-        field_to_json(Obj, "lastConfigurationChange", lastConfigurationChange);
-    }
-
-    bool RADIUSEndpointUpdateStatus::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "lastUpdate", lastUpdate);
-            field_from_json(Obj, "lastConfigurationChange", lastConfigurationChange);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::Read() {
-        Poco::File  F(OpenWifi::MicroServiceDataDirectory()+"/RADIUSEndpointUpdateStatus.json");
-        try {
-            if (F.exists()) {
-                Poco::JSON::Parser P;
-                std::ifstream ifs(F.path(), std::ios_base::in | std::ios_base::binary);
-                auto Obj = P.parse(ifs);
-                return from_json(Obj.extract<Poco::JSON::Object::Ptr>());
-            }
-        } catch (...) {
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::Save() {
-        Poco::File  F(OpenWifi::MicroServiceDataDirectory()+"/RADIUSEndpointUpdateStatus.json");
-        try {
-            Poco::JSON::Object Obj;
-            to_json(Obj);
-            std::ofstream O(F.path(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
-            Poco::JSON::Stringifier::stringify(Obj, O);
-            return true;
-        } catch (...) {
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::ChangeConfiguration() {
-        Read();
-        lastConfigurationChange = Utils::Now();
-        return Save();
-    }
-
 } // namespace OpenWifi::ProvObjects

src/framework/ALBserver.cpp

@@ -26,7 +26,7 @@ namespace OpenWifi {
 			Response.set("Connection", "keep-alive");
 			Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
 			std::ostream &Answer = Response.send();
-			Answer << ALBHealthCheckServer()->CallbackText();
+			Answer << "process Alive and kicking!";
 		} catch (...) {
 		}
 	}

src/framework/ALBserver.h

@@ -37,8 +37,6 @@ namespace OpenWifi {
 		inline static std::atomic_uint64_t req_id_ = 1;
 	};
 
-	typedef std::string ALBHealthMessageCallback();
-
 	class ALBHealthCheckServer : public SubSystemServer {
 	  public:
 		ALBHealthCheckServer();
@@ -50,22 +48,10 @@ namespace OpenWifi {
 
 		int Start() override;
 		void Stop() override;
-		inline void RegisterExtendedHealthMessage(ALBHealthMessageCallback *F) {
-			Callback_=F;
-		};
-
-		inline std::string CallbackText() {
-			if(Callback_== nullptr) {
-				return "process Alive and kicking!";
-			} else {
-				return Callback_();
-			}
-		}
 
 	  private:
 		std::unique_ptr<Poco::Net::HTTPServer> Server_;
 		std::unique_ptr<Poco::Net::ServerSocket> Socket_;
-		ALBHealthMessageCallback	*Callback_= nullptr;
 		int Port_ = 0;
 		mutable std::atomic_bool Running_ = false;
 	};

src/framework/AppServiceRegistry.h

@@ -11,12 +11,10 @@
 
 #include "Poco/File.h"
 #include "Poco/StreamCopier.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/JSON/Parser.h"
 
 #include "framework/MicroServiceFuncs.h"
 
-// #include "nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 
 namespace OpenWifi {
 
@@ -30,11 +28,11 @@ namespace OpenWifi {
 				if (F.exists()) {
 					std::ostringstream OS;
 					std::ifstream IF(FileName);
-                    Poco::JSON::Parser  P;
+					Poco::StreamCopier::copyStream(IF, OS);
-					Registry_ = P.parse(IF).extract<Poco::JSON::Object::Ptr>();
+					Registry_ = nlohmann::json::parse(OS.str());
 				}
 			} catch (...) {
-				Registry_ = Poco::makeShared<Poco::JSON::Object>();
+				Registry_ = nlohmann::json::parse("{}");
 			}
 		}
 
@@ -46,47 +44,54 @@ namespace OpenWifi {
 		inline ~AppServiceRegistry() { Save(); }
 
 		inline void Save() {
+			std::istringstream IS(to_string(Registry_));
 			std::ofstream OF;
 			OF.open(FileName, std::ios::binary | std::ios::trunc);
-            Registry_->stringify(OF);
+			Poco::StreamCopier::copyStream(IS, OF);
 		}
 
-        void Set(const char *key, const std::vector<std::string> &V) {
+		inline void Set(const char *Key, uint64_t Value) {
-            Poco::JSON::Array   Arr;
+			Registry_[Key] = Value;
-            for(const auto &s:V) {
-                Arr.add(s);
-            }
-            Registry_->set(key,Arr);
-            Save();
-        }
-
-        template<class T> void Set(const char *key, const T &Value) {
-            Registry_->set(key,Value);
 			Save();
 		}
 
-        bool Get(const char *key, std::vector<std::string> &Value) {
+		inline void Set(const char *Key, const std::string &Value) {
-            if(Registry_->has(key) && !Registry_->isNull(key) && Registry_->isArray(key)) {
+			Registry_[Key] = Value;
-                auto Arr = Registry_->get(key);
+			Save();
-                for(const auto &v:Arr) {
+		}
-                    Value.emplace_back(v);
-                }
-                return true;
-            }
-            return false;
-        }
 
-        template<class T> bool Get(const char *key, T &Value) {
+		inline void Set(const char *Key, bool Value) {
-            if(Registry_->has(key) && !Registry_->isNull(key)) {
+			Registry_[Key] = Value;
-                Value = Registry_->getValue<T>(key);
+			Save();
-                return true;
+		}
-            }
+
-            return false;
+		inline bool Get(const char *Key, bool &Value) {
-        }
+			if (Registry_[Key].is_boolean()) {
+				Value = Registry_[Key].get<bool>();
+				return true;
+			}
+			return false;
+		}
+
+		inline bool Get(const char *Key, uint64_t &Value) {
+			if (Registry_[Key].is_number_unsigned()) {
+				Value = Registry_[Key].get<uint64_t>();
+				return true;
+			}
+			return false;
+		}
+
+		inline bool Get(const char *Key, std::string &Value) {
+			if (Registry_[Key].is_string()) {
+				Value = Registry_[Key].get<std::string>();
+				return true;
+			}
+			return false;
+		}
 
 	  private:
 		std::string FileName;
-		Poco::JSON::Object::Ptr Registry_;
+		nlohmann::json Registry_;
 	};
 
 	inline auto AppServiceRegistry() { return AppServiceRegistry::instance(); }

src/framework/ConfigurationValidator.cpp

@@ -34,17 +34,9 @@ static std::string DefaultUCentralSchema = R"foo(
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
     "properties": {
-        "strict": {
-            "type": "boolean",
-            "default": false
-        },
         "uuid": {
             "type": "integer"
         },
-        "public_ip_lookup": {
-            "type": "string",
-            "format": "uc-fqdn"
-        },
         "unit": {
             "$ref": "#/$defs/unit"
         },
@@ -118,20 +110,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "random-password": {
                     "type": "boolean",
                     "default": false
-                },
-                "beacon-advertisement": {
-                    "type": "object",
-                    "properties": {
-                        "device-name": {
-                            "type": "boolean"
-                        },
-                        "device-serial": {
-                            "type": "boolean"
-                        },
-                        "network-id": {
-                            "type": "integer"
-                        }
-                    }
                 }
             }
         },
@@ -240,52 +218,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "interface.ssid.encryption": {
-            "type": "object",
-            "properties": {
-                "proto": {
-                    "type": "string",
-                    "enum": [
-                        "none",
-                        "owe",
-                        "owe-transition",
-                        "psk",
-                        "psk2",
-                        "psk-mixed",
-                        "psk2-radius",
-                        "wpa",
-                        "wpa2",
-                        "wpa-mixed",
-                        "sae",
-                        "sae-mixed",
-                        "wpa3",
-                        "wpa3-192",
-                        "wpa3-mixed"
-                    ],
-                    "examples": [
-                        "psk2"
-                    ]
-                },
-                "key": {
-                    "type": "string",
-                    "maxLength": 63,
-                    "minLength": 8
-                },
-                "ieee80211w": {
-                    "type": "string",
-                    "enum": [
-                        "disabled",
-                        "optional",
-                        "required"
-                    ],
-                    "default": "disabled"
-                },
-                "key-caching": {
-                    "type": "boolean",
-                    "default": true
-                }
-            }
-        },
         "definitions": {
             "type": "object",
             "properties": {
@@ -702,6 +634,26 @@ static std::string DefaultUCentralSchema = R"foo(
                     "type": "string",
                     "format": "uc-timeout",
                     "default": "6h"
+                },
+                "relay-server": {
+                    "type": "string",
+                    "format": "ipv4",
+                    "example": "192.168.2.1"
+                },
+                "circuit-id-format": {
+                    "type": "string",
+                    "example": [
+                        "\\{Interface\\}:\\{VLAN-Id\\}:\\{SSID\\}:\\{Model\\}:\\{Name\\}:\\{AP-MAC\\}:\\{Location\\}",
+                        "\\{AP-MAC\\};\\{SSID\\};\\{Crypto\\}",
+                        "\\{Name\\} \\{ESSID\\}"
+                    ]
+                },
+                "remote-id-format": {
+                    "type": "string",
+                    "example": [
+                        "\\{Client-MAC-hex\\} \\{SSID\\}",
+                        "\\{AP-MAC-hex\\} \\{SSID\\}"
+                    ]
                 }
             }
         },
@@ -780,8 +732,7 @@ static std::string DefaultUCentralSchema = R"foo(
                     "type": "string",
                     "enum": [
                         "dynamic",
-                        "static",
+                        "static"
-                        "none"
                     ],
                     "examples": [
                         "static"
@@ -1071,6 +1022,52 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             ]
         },
+        "interface.ssid.encryption": {
+            "type": "object",
+            "properties": {
+                "proto": {
+                    "type": "string",
+                    "enum": [
+                        "none",
+                        "owe",
+                        "owe-transition",
+                        "psk",
+                        "psk2",
+                        "psk-mixed",
+                        "psk2-radius",
+                        "wpa",
+                        "wpa2",
+                        "wpa-mixed",
+                        "sae",
+                        "sae-mixed",
+                        "wpa3",
+                        "wpa3-192",
+                        "wpa3-mixed"
+                    ],
+                    "examples": [
+                        "psk2"
+                    ]
+                },
+                "key": {
+                    "type": "string",
+                    "maxLength": 63,
+                    "minLength": 8
+                },
+                "ieee80211w": {
+                    "type": "string",
+                    "enum": [
+                        "disabled",
+                        "optional",
+                        "required"
+                    ],
+                    "default": "disabled"
+                },
+                "key-caching": {
+                    "type": "boolean",
+                    "default": true
+                }
+            }
+        },
         "interface.ssid.multi-psk": {
             "type": "object",
             "properties": {
@@ -1235,32 +1232,6 @@ static std::string DefaultUCentralSchema = R"foo(
                         "secret"
                     ]
                 },
-                "secondary": {
-                    "type": "object",
-                    "properties": {
-                        "host": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1812
-                            ]
-                        },
-                        "secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        }
-                    }
-                },
                 "request-attribute": {
                     "type": "array",
                     "items": {
@@ -1338,25 +1309,6 @@ static std::string DefaultUCentralSchema = R"foo(
                                         "value": "Example Operator"
                                     }
                                 ]
-                            },
-                            {
-                                "type": "object",
-                                "properties": {
-                                    "id": {
-                                        "type": "integer",
-                                        "maximum": 255,
-                                        "minimum": 1
-                                    },
-                                    "hex-value": {
-                                        "type": "string"
-                                    }
-                                },
-                                "examples": [
-                                    {
-                                        "id": 32,
-                                        "value": "0a0b0c0d"
-                                    }
-                                ]
                             }
                         ]
                     }
@@ -1706,236 +1658,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "service.captive.click": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "click-to-continue"
-                }
-            }
-        },
-        "service.captive.radius": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "radius"
-                },
-                "auth-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "auth-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "auth-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "acct-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "acct-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-interval": {
-                    "type": "integer",
-                    "default": 600
-                }
-            }
-        },
-        "service.captive.credentials": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "credentials"
-                },
-                "credentials": {
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "username": {
-                                "type": "string"
-                            },
-                            "password": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "service.captive.uam": {
-            "type": "object",
-            "properties": {
-                "auth-mode": {
-                    "type": "string",
-                    "const": "uam"
-                },
-                "uam-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 3990
-                },
-                "uam-secret": {
-                    "type": "string"
-                },
-                "uam-server": {
-                    "type": "string"
-                },
-                "nasid": {
-                    "type": "string"
-                },
-                "nasmac": {
-                    "type": "string"
-                },
-                "auth-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "auth-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "auth-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-server": {
-                    "type": "string",
-                    "format": "uc-host",
-                    "examples": [
-                        "192.168.1.10"
-                    ]
-                },
-                "acct-port": {
-                    "type": "integer",
-                    "maximum": 65535,
-                    "minimum": 1024,
-                    "default": 1812
-                },
-                "acct-secret": {
-                    "type": "string",
-                    "examples": [
-                        "secret"
-                    ]
-                },
-                "acct-interval": {
-                    "type": "integer",
-                    "default": 600
-                },
-                "ssid": {
-                    "type": "string"
-                },
-                "mac-format": {
-                    "type": "string",
-                    "enum": [
-                        "aabbccddeeff",
-                        "aa-bb-cc-dd-ee-ff",
-                        "aa:bb:cc:dd:ee:ff",
-                        "AABBCCDDEEFF",
-                        "AA:BB:CC:DD:EE:FF",
-                        "AA-BB-CC-DD-EE-FF"
-                    ]
-                },
-                "final-redirect-url": {
-                    "type": "string",
-                    "enum": [
-                        "default",
-                        "uam"
-                    ]
-                },
-                "mac-auth": {
-                    "type": "boolean",
-                    "default": "default"
-                },
-                "radius-gw-proxy": {
-                    "type": "boolean",
-                    "default": false
-                }
-            }
-        },
-        "service.captive": {
-            "allOf": [
-                {
-                    "oneOf": [
-                        {
-                            "$ref": "#/$defs/service.captive.click"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.radius"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.credentials"
-                        },
-                        {
-                            "$ref": "#/$defs/service.captive.uam"
-                        }
-                    ]
-                },
-                {
-                    "type": "object",
-                    "properties": {
-                        "walled-garden-fqdn": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "walled-garden-ipaddr": {
-                            "type": "array",
-                            "items": {
-                                "type": "string",
-                                "format": "uc-ip"
-                            }
-                        },
-                        "web-root": {
-                            "type": "string",
-                            "format": "uc-base64"
-                        },
-                        "idle-timeout": {
-                            "type": "integer",
-                            "default": 600
-                        },
-                        "session-timeout": {
-                            "type": "integer"
-                        }
-                    }
-                }
-            ]
-        },
         "interface.ssid": {
             "type": "object",
             "properties": {
@@ -1988,10 +1710,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "isolate-clients": {
                     "type": "boolean"
                 },
-                "strict-forwarding": {
-                    "type": "boolean",
-                    "default": false
-                },
                 "power-save": {
                     "type": "boolean"
                 },
@@ -2039,11 +1757,6 @@ static std::string DefaultUCentralSchema = R"foo(
                     "decription": "This option allows embedding custom vendor specific IEs inside the beacons of a BSS in AP mode.",
                     "type": "string"
                 },
-                "tip-information-element": {
-                    "decription": "The device will broadcast the TIP vendor IE inside its beacons if this option is enabled.",
-                    "type": "boolean",
-                    "default": true
-                },
                 "fils-discovery-interval": {
                     "type": "integer",
                     "default": 20,
@@ -2065,14 +1778,7 @@ static std::string DefaultUCentralSchema = R"foo(
                     "$ref": "#/$defs/interface.ssid.rate-limit"
                 },
                 "roaming": {
-                    "anyOf": [
+                    "$ref": "#/$defs/interface.ssid.roaming"
-                        {
-                            "$ref": "#/$defs/interface.ssid.roaming"
-                        },
-                        {
-                            "type": "boolean"
-                        }
-                    ]
                 },
                 "radius": {
                     "$ref": "#/$defs/interface.ssid.radius"
@@ -2089,9 +1795,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 "access-control-list": {
                     "$ref": "#/$defs/interface.ssid.acl"
                 },
-                "captive": {
-                    "$ref": "#/$defs/service.captive"
-                },
                 "hostapd-bss-raw": {
                     "type": "array",
                     "items": {
@@ -2259,17 +1962,6 @@ static std::string DefaultUCentralSchema = R"foo(
                         ]
                     }
                 },
-                "vlan-awareness": {
-                    "type": "object",
-                    "properties": {
-                        "first": {
-                            "type": "integer"
-                        },
-                        "last": {
-                            "type": "integer"
-                        }
-                    }
-                },
                 "vlan": {
                     "$ref": "#/$defs/interface.vlan"
                 },
@@ -2392,10 +2084,6 @@ static std::string DefaultUCentralSchema = R"foo(
                     "examples": [
                         "01234567890123456789012345678901"
                     ]
-                },
-                "mutual-tls": {
-                    "type": "boolean",
-                    "default": true
                 }
             }
         },
@@ -2467,24 +2155,6 @@ static std::string DefaultUCentralSchema = R"foo(
                     "type": "boolean",
                     "default": false
                 },
-                "mode": {
-                    "type": "string",
-                    "enum": [
-                        "radius",
-                        "user"
-                    ]
-                },
-                "port-filter": {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "examples": [
-                            {
-                                "LAN1": null
-                            }
-                        ]
-                    }
-                },
                 "server-certificate": {
                     "type": "string"
                 },
@@ -2496,77 +2166,6 @@ static std::string DefaultUCentralSchema = R"foo(
                     "items": {
                         "$ref": "#/$defs/interface.ssid.radius.local-user"
                     }
-                },
-                "radius": {
-                    "type": "object",
-                    "properties": {
-                        "nas-identifier": {
-                            "type": "string"
-                        },
-                        "auth-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "auth-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1812
-                            ]
-                        },
-                        "auth-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        },
-                        "acct-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "acct-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1813
-                            ]
-                        },
-                        "acct-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        },
-                        "coa-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "coa-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1814
-                            ]
-                        },
-                        "coa-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        }
-                    }
                 }
             }
         },
@@ -2890,12 +2489,6 @@ static std::string DefaultUCentralSchema = R"foo(
                         }
                     }
                 },
-                "services": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
                 "classifier": {
                     "type": "array",
                     "items": {
@@ -3100,6 +2693,236 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
+        "service.captive.click": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "click-to-continue"
+                }
+            }
+        },
+        "service.captive.radius": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "radius"
+                },
+                "auth-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "auth-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "auth-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "acct-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "acct-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-interval": {
+                    "type": "integer",
+                    "default": 600
+                }
+            }
+        },
+        "service.captive.credentials": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "credentials"
+                },
+                "credentials": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "username": {
+                                "type": "string"
+                            },
+                            "password": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "service.captive.uam": {
+            "type": "object",
+            "properties": {
+                "auth-mode": {
+                    "type": "string",
+                    "const": "uam"
+                },
+                "uam-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 3990
+                },
+                "uam-secret": {
+                    "type": "string"
+                },
+                "uam-server": {
+                    "type": "string"
+                },
+                "nasid": {
+                    "type": "string"
+                },
+                "nasmac": {
+                    "type": "string"
+                },
+                "auth-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "auth-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "auth-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-server": {
+                    "type": "string",
+                    "format": "uc-host",
+                    "examples": [
+                        "192.168.1.10"
+                    ]
+                },
+                "acct-port": {
+                    "type": "integer",
+                    "maximum": 65535,
+                    "minimum": 1024,
+                    "default": 1812
+                },
+                "acct-secret": {
+                    "type": "string",
+                    "examples": [
+                        "secret"
+                    ]
+                },
+                "acct-interval": {
+                    "type": "integer",
+                    "default": 600
+                },
+                "ssid": {
+                    "type": "string"
+                },
+                "mac-format": {
+                    "type": "string",
+                    "enum": [
+                        "aabbccddeeff",
+                        "aa-bb-cc-dd-ee-ff",
+                        "aa:bb:cc:dd:ee:ff",
+                        "AABBCCDDEEFF",
+                        "AA:BB:CC:DD:EE:FF",
+                        "AA-BB-CC-DD-EE-FF"
+                    ]
+                },
+                "final-redirect-url": {
+                    "type": "string",
+                    "enum": [
+                        "default",
+                        "uam"
+                    ]
+                },
+                "mac-auth": {
+                    "type": "boolean",
+                    "default": "default"
+                },
+                "radius-gw-proxy": {
+                    "type": "boolean",
+                    "default": false
+                }
+            }
+        },
+        "service.captive": {
+            "allOf": [
+                {
+                    "oneOf": [
+                        {
+                            "$ref": "#/$defs/service.captive.click"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.radius"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.credentials"
+                        },
+                        {
+                            "$ref": "#/$defs/service.captive.uam"
+                        }
+                    ]
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "walled-garden-fqdn": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "walled-garden-ipaddr": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "format": "uc-ip"
+                            }
+                        },
+                        "web-root": {
+                            "type": "string",
+                            "format": "uc-base64"
+                        },
+                        "idle-timeout": {
+                            "type": "integer",
+                            "default": 600
+                        },
+                        "session-timeout": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            ]
+        },
         "service.gps": {
             "type": "object",
             "properties": {
@@ -3118,50 +2941,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 }
             }
         },
-        "service.dhcp-relay": {
-            "type": "object",
-            "properties": {
-                "select-ports": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "vlans": {
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "vlan": {
-                                "type": "number"
-                            },
-                            "relay-server": {
-                                "type": "string",
-                                "format": "uc-ip"
-                            },
-                            "circuit-id-format": {
-                                "type": "string",
-                                "enum": [
-                                    "vlan-id",
-                                    "ap-mac",
-                                    "ssid"
-                                ],
-                                "default": "vlan-id"
-                            },
-                            "remote-id-format": {
-                                "type": "string",
-                                "enum": [
-                                    "vlan-id",
-                                    "ap-mac",
-                                    "ssid"
-                                ],
-                                "default": "ap-mac"
-                            }
-                        }
-                    }
-                }
-            }
-        },
         "service": {
             "type": "object",
             "properties": {
@@ -3221,9 +3000,6 @@ static std::string DefaultUCentralSchema = R"foo(
                 },
                 "gps": {
                     "$ref": "#/$defs/service.gps"
-                },
-                "dhcp-relay": {
-                    "$ref": "#/$defs/service.dhcp-relay"
                 }
             }
         },

src/framework/EventBusManager.cpp

@@ -9,21 +9,23 @@
 
 namespace OpenWifi {
 
+	EventBusManager::EventBusManager(Poco::Logger &L) : Logger_(L) {}
+
 	void EventBusManager::run() {
 		Running_ = true;
 		Utils::SetThreadName("fmwk:EventMgr");
-		auto Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN));
+		auto Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
 		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
 									false);
 		while (Running_) {
 			Poco::Thread::trySleep((unsigned long)MicroServiceDaemonBusTimer());
 			if (!Running_)
 				break;
-			Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE));
+			Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
 			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(),
 										Msg, false);
 		}
-		Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE));
+		Msg = MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
 		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
 									false);
 	};

src/framework/EventBusManager.h

@@ -12,16 +12,6 @@ namespace OpenWifi {
 
 	class EventBusManager : public Poco::Runnable {
 	  public:
-		EventBusManager() :
-			Logger_(Poco::Logger::create(
-				"EventBusManager", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel())) {
-		}
-
-		static auto instance() {
-			static auto instance_ = new EventBusManager;
-			return instance_;
-		}
-
 		explicit EventBusManager(Poco::Logger &L);
 		void run() final;
 		void Start();
@@ -34,6 +24,4 @@ namespace OpenWifi {
 		Poco::Logger &Logger_;
 	};
 
-	inline auto EventBusManager() { return EventBusManager::instance(); }
-
 } // namespace OpenWifi

src/framework/KafkaManager.cpp

@@ -6,7 +6,6 @@
 
 #include "fmt/format.h"
 #include "framework/MicroServiceFuncs.h"
-#include "cppkafka/utils/consumer_dispatcher.h"
 
 namespace OpenWifi {
 
@@ -100,12 +99,9 @@ namespace OpenWifi {
 			try {
 				auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
 				if (Msg != nullptr) {
-					auto NewMessage = cppkafka::MessageBuilder(Msg->Topic());
+					Producer.produce(cppkafka::MessageBuilder(Msg->Topic())
-					NewMessage.key(Msg->Key());
+										 .key(Msg->Key())
-					NewMessage.partition(0);
+										 .payload(Msg->Payload()));
-					NewMessage.payload(Msg->Payload());
-					Producer.produce(NewMessage);
-					Producer.flush();
 				}
 			} catch (const cppkafka::HandleException &E) {
 				poco_warning(Logger_,
@@ -160,49 +156,43 @@ namespace OpenWifi {
 			}
 		});
 
-		// bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false);
+		bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false);
-		// auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize", 100);
+		auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize", 20);
 
 		Types::StringVec Topics;
-		std::for_each(Topics_.begin(),Topics_.end(),
+		KafkaManager()->Topics(Topics);
-					  [&](const std::string & T) { Topics.emplace_back(T); });
 		Consumer.subscribe(Topics);
 
 		Running_ = true;
-		std::vector<cppkafka::Message> MsgVec;
+		while (Running_) {
-
+			try {
-		Dispatcher_ = std::make_unique<cppkafka::ConsumerDispatcher>(Consumer);
+				std::vector<cppkafka::Message> MsgVec =
-
+					Consumer.poll_batch(BatchSize, std::chrono::milliseconds(100));
-		Dispatcher_->run(
+				for (auto const &Msg : MsgVec) {
-			// Callback executed whenever a new message is consumed
+					if (!Msg)
-			[&](cppkafka::Message msg) {
+						continue;
-				// Print the key (if any)
+					if (Msg.get_error()) {
-				std::lock_guard G(ConsumerMutex_);
+						if (!Msg.is_eof()) {
-				auto It = Notifiers_.find(msg.get_topic());
+							poco_error(Logger_,
-				if (It != Notifiers_.end()) {
+									   fmt::format("Error: {}", Msg.get_error().to_string()));
-					const auto &FL = It->second;
-					for (const auto &[CallbackFunc, _] : FL) {
-						try {
-							CallbackFunc(msg.get_key(), msg.get_payload());
-						} catch(const Poco::Exception &E) {
-
-						} catch(...) {
-
 						}
+						if (!AutoCommit)
+							Consumer.async_commit(Msg);
+						continue;
 					}
+					KafkaManager()->Dispatch(Msg.get_topic(), Msg.get_key(), Msg.get_payload());
+					if (!AutoCommit)
+						Consumer.async_commit(Msg);
 				}
-				Consumer.commit(msg);
+			} catch (const cppkafka::HandleException &E) {
-			},
+				poco_warning(Logger_,
-			// Whenever there's an error (other than the EOF soft error)
+							 fmt::format("Caught a Kafka exception (consumer): {}", E.what()));
-			[&Logger_](cppkafka::Error error) {
+			} catch (const Poco::Exception &E) {
-				poco_warning(Logger_,fmt::format("Error: {}", error.to_string()));
+				Logger_.log(E);
-			},
+			} catch (...) {
-			// Whenever EOF is reached on a partition, print this
+				poco_error(Logger_, "std::exception");
-			[&Logger_](cppkafka::ConsumerDispatcher::EndOfFile, const cppkafka::TopicPartition& topic_partition) {
-				poco_debug(Logger_,fmt::format("Partition {} EOF", topic_partition.get_partition()));
 			}
-		);
+		}
-
 		Consumer.unsubscribe();
 		poco_information(Logger_, "Stopped...");
 	}
@@ -222,7 +212,7 @@ namespace OpenWifi {
 		}
 	}
 
-	void KafkaProducer::Produce(const char *Topic, const std::string &Key,
+	void KafkaProducer::Produce(const std::string &Topic, const std::string &Key,
 								const std::string &Payload) {
 		std::lock_guard G(Mutex_);
 		Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
@@ -230,6 +220,7 @@ namespace OpenWifi {
 
 	void KafkaConsumer::Start() {
 		if (!Running_) {
+			Running_ = true;
 			Worker_.start(*this);
 		}
 	}
@@ -237,16 +228,29 @@ namespace OpenWifi {
 	void KafkaConsumer::Stop() {
 		if (Running_) {
 			Running_ = false;
-			if(Dispatcher_) {
+			Worker_.wakeUp();
-				Dispatcher_->stop();
-			}
 			Worker_.join();
 		}
 	}
 
-	std::uint64_t KafkaConsumer::RegisterTopicWatcher(const std::string &Topic,
+	void KafkaDispatcher::Start() {
+		if (!Running_) {
+			Running_ = true;
+			Worker_.start(*this);
+		}
+	}
+
+	void KafkaDispatcher::Stop() {
+		if (Running_) {
+			Running_ = false;
+			Queue_.wakeUpAll();
+			Worker_.join();
+		}
+	}
+
+	auto KafkaDispatcher::RegisterTopicWatcher(const std::string &Topic,
 											   Types::TopicNotifyFunction &F) {
-		std::lock_guard G(ConsumerMutex_);
+		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
 		if (It == Notifiers_.end()) {
 			Types::TopicNotifyFunctionList L;
@@ -255,12 +259,11 @@ namespace OpenWifi {
 		} else {
 			It->second.emplace(It->second.end(), std::make_pair(F, FunctionId_));
 		}
-		Topics_.insert(Topic);
 		return FunctionId_++;
 	}
 
-	void KafkaConsumer::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+	void KafkaDispatcher::UnregisterTopicWatcher(const std::string &Topic, int Id) {
-		std::lock_guard G(ConsumerMutex_);
+		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
 		if (It != Notifiers_.end()) {
 			Types::TopicNotifyFunctionList &L = It->second;
@@ -272,17 +275,56 @@ namespace OpenWifi {
 		}
 	}
 
+	void KafkaDispatcher::Dispatch(const std::string &Topic, const std::string &Key,
+								   const std::string &Payload) {
+		std::lock_guard G(Mutex_);
+		auto It = Notifiers_.find(Topic);
+		if (It != Notifiers_.end()) {
+			Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
+		}
+	}
+
+	void KafkaDispatcher::run() {
+		Poco::Logger &Logger_ =
+			Poco::Logger::create("KAFKA-DISPATCHER", KafkaManager()->Logger().getChannel());
+		poco_information(Logger_, "Starting...");
+		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
+		Utils::SetThreadName("kafka:dispatch");
+		while (Note && Running_) {
+			auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
+			if (Msg != nullptr) {
+				auto It = Notifiers_.find(Msg->Topic());
+				if (It != Notifiers_.end()) {
+					const auto &FL = It->second;
+					for (const auto &[CallbackFunc, _] : FL) {
+						CallbackFunc(Msg->Key(), Msg->Payload());
+					}
+				}
+			}
+			Note = Queue_.waitDequeueNotification();
+		}
+		poco_information(Logger_, "Stopped...");
+	}
+
+	void KafkaDispatcher::Topics(std::vector<std::string> &T) {
+		T.clear();
+		for (const auto &[TopicName, _] : Notifiers_)
+			T.push_back(TopicName);
+	}
+
 	int KafkaManager::Start() {
 		if (!KafkaEnabled_)
 			return 0;
 		ConsumerThr_.Start();
 		ProducerThr_.Start();
+		Dispatcher_.Start();
 		return 0;
 	}
 
 	void KafkaManager::Stop() {
 		if (KafkaEnabled_) {
 			poco_information(Logger(), "Stopping...");
+			Dispatcher_.Stop();
 			ProducerThr_.Stop();
 			ConsumerThr_.Stop();
 			poco_information(Logger(), "Stopped...");
@@ -290,27 +332,39 @@ namespace OpenWifi {
 		}
 	}
 
-	void KafkaManager::PostMessage(const char *topic, const std::string &key,
+	void KafkaManager::PostMessage(const std::string &topic, const std::string &key,
-								   const std::string & PayLoad, bool WrapMessage) {
+								   const std::string &PayLoad, bool WrapMessage) {
 		if (KafkaEnabled_) {
 			ProducerThr_.Produce(topic, key, WrapMessage ? WrapSystemId(PayLoad) : PayLoad);
 		}
 	}
 
-	void KafkaManager::PostMessage(const char *topic, const std::string &key,
+	void KafkaManager::Dispatch(const std::string &Topic, const std::string &Key,
-					 const Poco::JSON::Object &Object, bool WrapMessage) {
+								const std::string &Payload) {
+		Dispatcher_.Dispatch(Topic, Key, Payload);
+	}
+
+	[[nodiscard]] std::string KafkaManager::WrapSystemId(const std::string &PayLoad) {
+		return SystemInfoWrapper_ + PayLoad + "}";
+	}
+
+	uint64_t KafkaManager::RegisterTopicWatcher(const std::string &Topic,
+												Types::TopicNotifyFunction &F) {
 		if (KafkaEnabled_) {
-			std::ostringstream ObjectStr;
+			return Dispatcher_.RegisterTopicWatcher(Topic, F);
-			Object.stringify(ObjectStr);
+		} else {
-			ProducerThr_.Produce(topic, key, WrapMessage ? WrapSystemId(ObjectStr.str()) : ObjectStr.str());
+			return 0;
 		}
 	}
 
-	[[nodiscard]] std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, uint64_t Id) {
-		return fmt::format(	R"lit({{ "system" : {{ "id" : {}, "host" : "{}" }}, "payload" : {} }})lit",
+		if (KafkaEnabled_) {
-						   MicroServiceID(), MicroServicePrivateEndPoint(), PayLoad ) ;
+			Dispatcher_.UnregisterTopicWatcher(Topic, Id);
+		}
 	}
 
+	void KafkaManager::Topics(std::vector<std::string> &T) { Dispatcher_.Topics(T); }
+
 	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList &partitions) {
 		poco_information(
 			Logger(), fmt::format("Partition assigned: {}...", partitions.front().get_partition()));

src/framework/KafkaManager.h

@@ -6,7 +6,7 @@
 
 #include "Poco/Notification.h"
 #include "Poco/NotificationQueue.h"
-#include "Poco/JSON/Object.h"
+
 #include "framework/KafkaTopics.h"
 #include "framework/OpenWifiTypes.h"
 #include "framework/SubSystemServer.h"
@@ -18,15 +18,15 @@ namespace OpenWifi {
 
 	class KafkaMessage : public Poco::Notification {
 	  public:
-		KafkaMessage(const char * Topic, const std::string &Key, const std::string &Payload)
+		KafkaMessage(const std::string &Topic, const std::string &Key, const std::string &Payload)
 			: Topic_(Topic), Key_(Key), Payload_(Payload) {}
 
-		inline const char * Topic() { return Topic_; }
+		inline const std::string &Topic() { return Topic_; }
 		inline const std::string &Key() { return Key_; }
 		inline const std::string &Payload() { return Payload_; }
 
 	  private:
-		const char *Topic_;
+		std::string Topic_;
 		std::string Key_;
 		std::string Payload_;
 	};
@@ -36,10 +36,10 @@ namespace OpenWifi {
 		void run() override;
 		void Start();
 		void Stop();
-		void Produce(const char *Topic, const std::string &Key, const std::string & Payload);
+		void Produce(const std::string &Topic, const std::string &Key, const std::string &Payload);
 
 	  private:
-		std::mutex Mutex_;
+		std::recursive_mutex Mutex_;
 		Poco::Thread Worker_;
 		mutable std::atomic_bool Running_ = false;
 		Poco::NotificationQueue Queue_;
@@ -47,22 +47,33 @@ namespace OpenWifi {
 
 	class KafkaConsumer : public Poco::Runnable {
 	  public:
+		void run() override;
 		void Start();
 		void Stop();
 
 	  private:
-		std::mutex 				ConsumerMutex_;
+		std::recursive_mutex Mutex_;
-		Types::NotifyTable 		Notifiers_;
+		Poco::Thread Worker_;
-		Poco::Thread 			Worker_;
 		mutable std::atomic_bool Running_ = false;
-		uint64_t 				FunctionId_ = 1;
+	};
-		std::unique_ptr<cppkafka::ConsumerDispatcher> 	Dispatcher_;
-		std::set<std::string>	Topics_;
 
-		void run() override;
+	class KafkaDispatcher : public Poco::Runnable {
-		friend class KafkaManager;
+	  public:
-		std::uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
+		void Start();
+		void Stop();
+		auto RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
 		void UnregisterTopicWatcher(const std::string &Topic, int Id);
+		void Dispatch(const std::string &Topic, const std::string &Key, const std::string &Payload);
+		void run() override;
+		void Topics(std::vector<std::string> &T);
+
+	  private:
+		std::recursive_mutex Mutex_;
+		Types::NotifyTable Notifiers_;
+		Poco::Thread Worker_;
+		mutable std::atomic_bool Running_ = false;
+		uint64_t FunctionId_ = 1;
+		Poco::NotificationQueue Queue_;
 	};
 
 	class KafkaManager : public SubSystemServer {
@@ -80,25 +91,21 @@ namespace OpenWifi {
 		int Start() override;
 		void Stop() override;
 
-		void PostMessage(const char *topic, const std::string &key,
+		void PostMessage(const std::string &topic, const std::string &key,
 						 const std::string &PayLoad, bool WrapMessage = true);
-		void PostMessage(const char *topic, const std::string &key,
+		void Dispatch(const std::string &Topic, const std::string &Key, const std::string &Payload);
-						 const Poco::JSON::Object &Object, bool WrapMessage = true);
+		[[nodiscard]] std::string WrapSystemId(const std::string &PayLoad);
-
-		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
 		[[nodiscard]] inline bool Enabled() const { return KafkaEnabled_; }
-		inline std::uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
+		uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
-			return ConsumerThr_.RegisterTopicWatcher(Topic,F);
+		void UnregisterTopicWatcher(const std::string &Topic, uint64_t Id);
-		}
+		void Topics(std::vector<std::string> &T);
-		inline void UnregisterTopicWatcher(const std::string &Topic, uint64_t Id) {
-			return ConsumerThr_.UnregisterTopicWatcher(Topic,Id);
-		}
 
 	  private:
 		bool KafkaEnabled_ = false;
 		std::string SystemInfoWrapper_;
 		KafkaProducer ProducerThr_;
 		KafkaConsumer ConsumerThr_;
+		KafkaDispatcher Dispatcher_;
 
 		void PartitionAssignment(const cppkafka::TopicPartitionList &partitions);
 		void PartitionRevocation(const cppkafka::TopicPartitionList &partitions);

src/framework/KafkaTopics.h

@@ -10,33 +10,32 @@
 
 #include <string>
 namespace OpenWifi::KafkaTopics {
-	inline const char * HEALTHCHECK = "healthcheck";
+	static const std::string HEALTHCHECK{"healthcheck"};
-	inline const char * STATE = "state";
+	static const std::string STATE{"state"};
-	inline const char * CONNECTION = "connection";
+	static const std::string CONNECTION{"connection"};
-	inline const char * WIFISCAN = "wifiscan";
+	static const std::string WIFISCAN{"wifiscan"};
-	inline const char * ALERTS = "alerts";
+	static const std::string ALERTS{"alerts"};
-	inline const char * COMMAND = "command";
+	static const std::string COMMAND{"command"};
-	inline const char * SERVICE_EVENTS = "service_events";
+	static const std::string SERVICE_EVENTS{"service_events"};
-	inline const char * DEVICE_EVENT_QUEUE = "device_event_queue";
+	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
-	inline const char * DEVICE_TELEMETRY = "device_telemetry";
+	static const std::string DEVICE_TELEMETRY{"device_telemetry"};
-	inline const char * PROVISIONING_CHANGE = "provisioning_change";
+	static const std::string PROVISIONING_CHANGE{"provisioning_change"};
-	inline const char * RRM = "rrm";
 
 	namespace ServiceEvents {
-		inline const char * EVENT_JOIN = "join";
+		static const std::string EVENT_JOIN{"join"};
-		inline const char * EVENT_LEAVE = "leave";
+		static const std::string EVENT_LEAVE{"leave"};
-		inline const char * EVENT_KEEP_ALIVE = "keep-alive";
+		static const std::string EVENT_KEEP_ALIVE{"keep-alive"};
-		inline const char * EVENT_REMOVE_TOKEN = "remove-token";
+		static const std::string EVENT_REMOVE_TOKEN{"remove-token"};
 
 		namespace Fields {
-			inline const char * EVENT = "event";
+			static const std::string EVENT{"event"};
-			inline const char * ID = "id";
+			static const std::string ID{"id"};
-			inline const char * TYPE = "type";
+			static const std::string TYPE{"type"};
-			inline const char * PUBLIC = "publicEndPoint";
+			static const std::string PUBLIC{"publicEndPoint"};
-			inline const char * PRIVATE = "privateEndPoint";
+			static const std::string PRIVATE{"privateEndPoint"};
-			inline const char * KEY = "key";
+			static const std::string KEY{"key"};
-			inline const char * VRSN = "version";
+			static const std::string VRSN{"version"};
-			inline const char * TOKEN = "token";
+			static const std::string TOKEN{"token"};
 		} // namespace Fields
 	}	  // namespace ServiceEvents
 } // namespace OpenWifi::KafkaTopics

src/framework/MicroService.cpp

@@ -33,23 +33,9 @@ namespace OpenWifi {
 
 	void MicroService::Exit(int Reason) { std::exit(Reason); }
 
-    static std::string MakeServiceListString(const Types::MicroServiceMetaMap &Services) {
-        std::string SvcList;
-        for (const auto &Svc : Services) {
-            if (SvcList.empty())
-                SvcList = Svc.second.Type;
-            else
-                SvcList += ", " + Svc.second.Type;
-        }
-        return SvcList;
-    }
-
 	void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key,
 										  const std::string &Payload) {
 		std::lock_guard G(InfraMutex_);
-
-		Poco::Logger &BusLogger = EventBusManager()->Logger();
-
 		try {
 			Poco::JSON::Parser P;
 			auto Object = P.parse(Payload).extract<Poco::JSON::Object::Ptr>();
@@ -69,10 +55,13 @@ namespace OpenWifi {
 							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
 							auto PrivateEndPoint =
 								Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString();
-							if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE &&
+								Services_.find(PrivateEndPoint) != Services_.end()) {
+								Services_[PrivateEndPoint].LastUpdate = Utils::Now();
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
 								Services_.erase(PrivateEndPoint);
-								poco_information(
+								poco_debug(
-									BusLogger,
+									logger(),
 									fmt::format(
 										"Service {} ID={} leaving system.",
 										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
@@ -80,7 +69,14 @@ namespace OpenWifi {
 										ID));
 							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN ||
 									   Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
-								auto ServiceInfo = Types::MicroServiceMeta{
+								poco_debug(
+									logger(),
+									fmt::format(
+										"Service {} ID={} joining system.",
+										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
+											.toString(),
+										ID));
+								Services_[PrivateEndPoint] = Types::MicroServiceMeta{
 									.Id = ID,
 									.Type = Poco::toLower(
 										Object->get(KafkaTopics::ServiceEvents::Fields::TYPE)
@@ -98,46 +94,20 @@ namespace OpenWifi {
 												   .toString(),
 									.LastUpdate = Utils::Now()};
 
-                                auto s1 = MakeServiceListString(Services_);
+								std::string SvcList;
-								auto PreviousSize = Services_.size();
+								for (const auto &Svc : Services_) {
-								Services_[PrivateEndPoint] = ServiceInfo;
+									if (SvcList.empty())
-								auto CurrentSize = Services_.size();
+										SvcList = Svc.second.Type;
-								if(Event == KafkaTopics::ServiceEvents::EVENT_JOIN) {
+									else
-									if(!s1.empty()) {
+										SvcList += ", " + Svc.second.Type;
-										poco_information(
-											BusLogger,
-											fmt::format(
-												"Service {} ID={} is joining the system.",
-												Object
-													->get(
-														KafkaTopics::ServiceEvents::Fields::PRIVATE)
-													.toString(),
-												ID));
-									}
-									std::string SvcList;
-									for (const auto &Svc : Services_) {
-										if (SvcList.empty())
-											SvcList = Svc.second.Type;
-										else
-											SvcList += ", " + Svc.second.Type;
-									}
-									poco_information(
-										BusLogger,
-										fmt::format("Current list of microservices: {}", SvcList));
-								} else if(CurrentSize!=PreviousSize) {
-									poco_information(
-										BusLogger,
-										fmt::format(
-											"Service {} ID={} is being added back in.",
-											Object
-												->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
-												.toString(),
-											ID));
 								}
+								poco_information(
+									logger(),
+									fmt::format("Current list of microservices: {}", SvcList));
 							}
 						} else {
-							poco_information(
+							poco_error(
-								BusLogger,
+								logger(),
 								fmt::format("KAFKA-MSG: invalid event '{}', missing a field.",
 											Event));
 						}
@@ -148,39 +118,30 @@ namespace OpenWifi {
 								Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
 #endif
 						} else {
-							poco_information(
+							poco_error(
-								BusLogger,
+								logger(),
 								fmt::format("KAFKA-MSG: invalid event '{}', missing token", Event));
 						}
 					} else {
-						poco_information(BusLogger,
+						poco_error(logger(),
 								   fmt::format("Unknown Event: {} Source: {}", Event, ID));
 					}
 				}
 			} else {
-				std::ostringstream os;
+				poco_error(logger(), "Bad bus message.");
-				Object->stringify(std::cout);
-				poco_error(BusLogger, fmt::format("Bad bus message: {}", os.str()));
 			}
 
-			auto ServiceHint = Services_.begin();
+			auto i = Services_.begin();
 			auto now = Utils::Now();
-            auto si1 = Services_.size();
+			for (; i != Services_.end();) {
-            auto ss1 = MakeServiceListString(Services_);
+				if ((now - i->second.LastUpdate) > 60) {
-			while(ServiceHint!=Services_.end()) {
+					i = Services_.erase(i);
-				if ((now - ServiceHint->second.LastUpdate) > 120) {
-					poco_information(BusLogger, fmt::format("ZombieService: Removing service {}, ", ServiceHint->second.PublicEndPoint));
-					ServiceHint = Services_.erase(ServiceHint);
 				} else
-					++ServiceHint;
+					++i;
 			}
-            if(Services_.size() != si1) {
-                auto ss2 = MakeServiceListString(Services_);
-                poco_information(BusLogger, fmt::format("Current list of microservices: {} -> {}", ss1, ss2));
-            }
 
 		} catch (const Poco::Exception &E) {
-			BusLogger.log(E);
+			logger().log(E);
 		}
 	}
 
@@ -449,7 +410,7 @@ namespace OpenWifi {
 			try {
 				DataDir.createDirectory();
 			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
+				logger().log(E);
 			}
 		}
 		WWWAssetsDir_ = ConfigPath("openwifi.restapi.wwwassets", "");
@@ -567,12 +528,14 @@ namespace OpenWifi {
 		for (auto i : SubSystems_) {
 			i->Start();
 		}
-		EventBusManager()->Start();
+		EventBusManager_ = std::make_unique<EventBusManager>(Poco::Logger::create(
+			"EventBusManager", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel()));
+		EventBusManager_->Start();
 	}
 
 	void MicroService::StopSubSystemServers() {
 		AddActivity("Stopping");
-		EventBusManager()->Stop();
+		EventBusManager_->Stop();
 		for (auto i = SubSystems_.rbegin(); i != SubSystems_.rend(); ++i) {
 			(*i)->Stop();
 		}
@@ -732,7 +695,7 @@ namespace OpenWifi {
 			auto APIKEY = Request.get("X-API-KEY");
 			return APIKEY == MyHash_;
 		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
+			logger().log(E);
 		}
 		return false;
 	}

src/framework/MicroService.h

@@ -201,6 +201,7 @@ namespace OpenWifi {
 		Poco::JWT::Signer Signer_;
 		Poco::Logger &Logger_;
 		Poco::ThreadPool TimerPool_{"timer:pool", 2, 32};
+		std::unique_ptr<EventBusManager> EventBusManager_;
 	};
 
 	inline MicroService *MicroService::instance_ = nullptr;

src/framework/MicroServiceFuncs.cpp

@@ -5,8 +5,6 @@
 #include "framework/MicroServiceFuncs.h"
 #include "framework/MicroService.h"
 
-#include "framework/ALBserver.h"
-
 namespace OpenWifi {
 	const std::string &MicroServiceDataDirectory() { return MicroService::instance().DataDir(); }
 
@@ -49,11 +47,11 @@ namespace OpenWifi {
 
 	void MicroServiceReload(const std::string &Type) { MicroService::instance().Reload(Type); }
 
-	Types::StringVec MicroServiceGetLogLevelNames() {
+	const Types::StringVec MicroServiceGetLogLevelNames() {
 		return MicroService::instance().GetLogLevelNames();
 	}
 
-	Types::StringVec MicroServiceGetSubSystems() {
+	const Types::StringVec MicroServiceGetSubSystems() {
 		return MicroService::instance().GetSubSystems();
 	}
 
@@ -81,7 +79,7 @@ namespace OpenWifi {
 
 	std::string MicroServiceGetUIURI() { return MicroService::instance().GetUIURI(); }
 
-	SubSystemVec MicroServiceGetFullSubSystems() {
+	const SubSystemVec MicroServiceGetFullSubSystems() {
 		return MicroService::instance().GetFullSubSystems();
 	}
 
@@ -89,7 +87,7 @@ namespace OpenWifi {
 
 	std::uint64_t MicroServiceDaemonBusTimer() { return MicroService::instance().DaemonBusTimer(); }
 
-	std::string MicroServiceMakeSystemEventMessage(const char *Type) {
+	std::string MicroServiceMakeSystemEventMessage(const std::string &Type) {
 		return MicroService::instance().MakeSystemEventMessage(Type);
 	}
 
@@ -125,12 +123,4 @@ namespace OpenWifi {
 		return MicroService::instance().AllowExternalMicroServices();
 	}
 
-	void MicroServiceALBCallback( std::string Callback()) {
-		return ALBHealthCheckServer()->RegisterExtendedHealthMessage(Callback);
-	}
-
-	std::string MicroServiceAccessKey() {
-		return MicroService::instance().Hash();
-	}
-
 } // namespace OpenWifi

src/framework/MicroServiceFuncs.h

@@ -22,7 +22,6 @@ namespace OpenWifi {
 	std::string MicroServicePublicEndPoint();
 	std::string MicroServiceConfigGetString(const std::string &Key,
 											const std::string &DefaultValue);
-	std::string MicroServiceAccessKey();
 	bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue);
 	std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue);
 	std::string MicroServicePrivateEndPoint();
@@ -32,8 +31,8 @@ namespace OpenWifi {
 	void MicroServiceLoadConfigurationFile();
 	void MicroServiceReload();
 	void MicroServiceReload(const std::string &Type);
-	Types::StringVec MicroServiceGetLogLevelNames();
+	const Types::StringVec MicroServiceGetLogLevelNames();
-	Types::StringVec MicroServiceGetSubSystems();
+	const Types::StringVec MicroServiceGetSubSystems();
 	Types::StringPairVec MicroServiceGetLogLevels();
 	bool MicroServiceSetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level);
 	void MicroServiceGetExtraConfiguration(Poco::JSON::Object &Answer);
@@ -41,10 +40,10 @@ namespace OpenWifi {
 	std::uint64_t MicroServiceUptimeTotalSeconds();
 	std::uint64_t MicroServiceStartTimeEpochTime();
 	std::string MicroServiceGetUIURI();
-	SubSystemVec MicroServiceGetFullSubSystems();
+	const SubSystemVec MicroServiceGetFullSubSystems();
 	std::string MicroServiceCreateUUID();
 	std::uint64_t MicroServiceDaemonBusTimer();
-	std::string MicroServiceMakeSystemEventMessage(const char *Type);
+	std::string MicroServiceMakeSystemEventMessage(const std::string &Type);
 	Poco::ThreadPool &MicroServiceTimerPool();
 	std::string MicroServiceConfigPath(const std::string &Key, const std::string &DefaultValue);
 	std::string MicroServiceWWWAssetsDir();
@@ -54,5 +53,4 @@ namespace OpenWifi {
 	std::string MicroServiceGetPublicAPIEndPoint();
 	void MicroServiceDeleteOverrideConfiguration();
 	bool AllowExternalMicroServices();
-	void MicroServiceALBCallback( std::string Callback());
 } // namespace OpenWifi

src/framework/OpenWifiTypes.h

@@ -28,9 +28,6 @@ namespace OpenWifi::Types {
 	typedef std::string UUID_t;
 	typedef std::vector<UUID_t> UUIDvec_t;
 	typedef std::map<std::string, std::map<uint32_t, uint64_t>> Counted3DMapSII;
-	typedef std::vector<int64_t> IntList;
-	typedef std::vector<uint64_t> UIntList;
-	typedef std::vector<double> DoubleList;
 
 	struct MicroServiceMeta {
 		uint64_t Id = 0;

src/framework/RESTAPI_Handler.h

@@ -574,37 +574,7 @@ namespace OpenWifi {
 			Poco::JSON::Stringifier::stringify(Object, Answer);
 		}
 
-        inline void ReturnObject(const std::vector<std::string> &Strings) {
+		inline void ReturnRawJSON(const std::string &json_doc) {
-            Poco::JSON::Array   Arr;
-            for(const auto &String:Strings) {
-                Arr.add(String);
-            }
-            std::ostringstream os;
-            Arr.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        template<class T> void ReturnObject(const std::vector<T> &Objects) {
-            Poco::JSON::Array   Arr;
-            for(const auto &Object:Objects) {
-                Poco::JSON::Object O;
-                Object.to_json(O);
-                Arr.add(O);
-            }
-            std::ostringstream os;
-            Arr.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        template<class T> void ReturnObject(const T &Object) {
-            Poco::JSON::Object  O;
-            Object.to_json(O);
-            std::ostringstream os;
-            O.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        inline void ReturnRawJSON(const std::string &json_doc) {
 			PrepareResponse();
 			if (Request != nullptr) {
 				//   can we compress ???

src/framework/RESTAPI_SystemCommand.h

@@ -24,63 +24,50 @@ namespace OpenWifi {
 							 Server, TransactionId, Internal) {}
 		static auto PathName() { return std::list<std::string>{"/api/v1/system"}; }
 
-		inline void DoGet() final {
+		inline void DoGet() {
 			std::string Arg;
-			if (HasParameter("command", Arg)) {
+			if (HasParameter("command", Arg) && Arg == "info") {
-				if (Arg == "info") {
+				Poco::JSON::Object Answer;
-					Poco::JSON::Object Answer;
+				Answer.set(RESTAPI::Protocol::VERSION, MicroServiceVersion());
-					Answer.set(RESTAPI::Protocol::VERSION, MicroServiceVersion());
+				Answer.set(RESTAPI::Protocol::UPTIME, MicroServiceUptimeTotalSeconds());
-					Answer.set(RESTAPI::Protocol::UPTIME, MicroServiceUptimeTotalSeconds());
+				Answer.set(RESTAPI::Protocol::START, MicroServiceStartTimeEpochTime());
-					Answer.set(RESTAPI::Protocol::START, MicroServiceStartTimeEpochTime());
+				Answer.set(RESTAPI::Protocol::OS, Poco::Environment::osName());
-					Answer.set(RESTAPI::Protocol::OS, Poco::Environment::osName());
+				Answer.set(RESTAPI::Protocol::PROCESSORS, Poco::Environment::processorCount());
-					Answer.set(RESTAPI::Protocol::PROCESSORS, Poco::Environment::processorCount());
+				Answer.set(RESTAPI::Protocol::HOSTNAME, Poco::Environment::nodeName());
-					Answer.set(RESTAPI::Protocol::HOSTNAME, Poco::Environment::nodeName());
+				Answer.set(RESTAPI::Protocol::UI, MicroServiceGetUIURI());
-					Answer.set(RESTAPI::Protocol::UI, MicroServiceGetUIURI());
 
-					Poco::JSON::Array Certificates;
+				Poco::JSON::Array Certificates;
-					auto SubSystems = MicroServiceGetFullSubSystems();
+				auto SubSystems = MicroServiceGetFullSubSystems();
-					std::set<std::string> CertNames;
+				std::set<std::string> CertNames;
 
-					for (const auto &i : SubSystems) {
+				for (const auto &i : SubSystems) {
-						auto Hosts = i->HostSize();
+					auto Hosts = i->HostSize();
-						for (uint64_t j = 0; j < Hosts; ++j) {
+					for (uint64_t j = 0; j < Hosts; ++j) {
-							auto CertFileName = i->Host(j).CertFile();
+						auto CertFileName = i->Host(j).CertFile();
-							if (!CertFileName.empty()) {
+						if (!CertFileName.empty()) {
-								Poco::File F1(CertFileName);
+							Poco::File F1(CertFileName);
-								if (F1.exists()) {
+							if (F1.exists()) {
-									auto InsertResult = CertNames.insert(CertFileName);
+								auto InsertResult = CertNames.insert(CertFileName);
-									if (InsertResult.second) {
+								if (InsertResult.second) {
-										Poco::JSON::Object Inner;
+									Poco::JSON::Object Inner;
-										Poco::Path F(CertFileName);
+									Poco::Path F(CertFileName);
-										Inner.set("filename", F.getFileName());
+									Inner.set("filename", F.getFileName());
-										Poco::Crypto::X509Certificate C(CertFileName);
+									Poco::Crypto::X509Certificate C(CertFileName);
-										auto ExpiresOn = C.expiresOn();
+									auto ExpiresOn = C.expiresOn();
-										Inner.set("expiresOn", ExpiresOn.timestamp().epochTime());
+									Inner.set("expiresOn", ExpiresOn.timestamp().epochTime());
-										Certificates.add(Inner);
+									Certificates.add(Inner);
-									}
 								}
 							}
 						}
 					}
-					Answer.set("certificates", Certificates);
-					return ReturnObject(Answer);
-				}
-				if (Arg == "extraConfiguration") {
-					Poco::JSON::Object Answer;
-					MicroServiceGetExtraConfiguration(Answer);
-					return ReturnObject(Answer);
-				}
-				if (Arg == "resources") {
-					Poco::JSON::Object Answer;
-					Answer.set("numberOfFileDescriptors", Utils::get_open_fds());
-					std::uint64_t currRealMem, peakRealMem, currVirtMem, peakVirtMem;
-					Utils::getMemory(currRealMem, peakRealMem, currVirtMem, peakVirtMem);
-					Answer.set("currRealMem", currRealMem);
-					Answer.set("peakRealMem", peakRealMem);
-					Answer.set("currVirtMem", currVirtMem);
-					Answer.set("peakVirtMem", peakVirtMem);
-					return ReturnObject(Answer);
 				}
+				Answer.set("certificates", Certificates);
+				return ReturnObject(Answer);
+			}
+			if (GetBoolParameter("extraConfiguration")) {
+				Poco::JSON::Object Answer;
+				MicroServiceGetExtraConfiguration(Answer);
+				return ReturnObject(Answer);
 			}
 			BadRequest(RESTAPI::Errors::InvalidCommand);
 		}

src/framework/RESTAPI_utils.h

@@ -14,15 +14,8 @@
 #include "framework/OpenWifiTypes.h"
 #include "framework/utils.h"
 
-#include <RESTObjects/RESTAPI_SecurityObjects.h>
-
 namespace OpenWifi::RESTAPI_utils {
 
-	inline bool IsRootOrAdmin(const SecurityObjects::UserInfo &UI) {
-		return 	UI.userRole==SecurityObjects::ROOT ||
-				UI.userRole==SecurityObjects::ADMIN;
-	}
-
 	inline void EmbedDocument(const std::string &ObjName, Poco::JSON::Object &Obj,
 							  const std::string &ObjStr) {
 		std::string D = ObjStr.empty() ? "{}" : ObjStr;
@@ -102,20 +95,6 @@ namespace OpenWifi::RESTAPI_utils {
 		Obj.set(Field, A);
 	}
 
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::DoubleList &V) {
-		Poco::JSON::Array A;
-		for (const auto &i : V)
-			A.add(i);
-		Obj.set(Field, A);
-	}
-
-	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::IntList &V) {
-		Poco::JSON::Array A;
-		for (const auto &i : V)
-			A.add(i);
-		Obj.set(Field, A);
-	}
-
 	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::TagList &V) {
 		Poco::JSON::Array A;
 		for (const auto &i : V)
@@ -298,28 +277,6 @@ namespace OpenWifi::RESTAPI_utils {
 		}
 	}
 
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
-								Types::DoubleList &Value) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
-			Value.clear();
-			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
-				Value.push_back(i);
-			}
-		}
-	}
-
-	inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
-								Types::IntList &Value) {
-		if (Obj->isArray(Field) && !Obj->isNull(Field)) {
-			Value.clear();
-			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
-			for (const auto &i : *A) {
-				Value.push_back(i);
-			}
-		}
-	}
-
 	template <class T>
 	void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field,
 						 std::vector<T> &Value) {

src/framework/StorageClass.h

@@ -22,8 +22,9 @@ namespace OpenWifi {
 
 	class StorageClass : public SubSystemServer {
 	  public:
+		StorageClass() noexcept : SubSystemServer("StorageClass", "STORAGE-SVR", "storage") {}
 
-        inline int Start() override {
+		int Start() override {
 			std::lock_guard Guard(Mutex_);
 
 			Logger().notice("Starting.");
@@ -39,24 +40,17 @@ namespace OpenWifi {
 			return 0;
 		}
 
-		inline void Stop() override { Pool_->shutdown(); }
+		void Stop() override { Pool_->shutdown(); }
 
 		DBType Type() const { return dbType_; };
 
-        StorageClass() noexcept : SubSystemServer("StorageClass", "STORAGE-SVR", "storage") {
-
-        }
-
-		Poco::Data::SessionPool &Pool() { return *Pool_; }
-
 	  private:
 		inline int Setup_SQLite();
 		inline int Setup_MySQL();
 		inline int Setup_PostgreSQL();
 
-
+	  protected:
-    protected:
+		std::unique_ptr<Poco::Data::SessionPool> Pool_;
-		std::shared_ptr<Poco::Data::SessionPool> Pool_;
 		Poco::Data::SQLite::Connector SQLiteConn_;
 		Poco::Data::PostgreSQL::Connector PostgresConn_;
 		Poco::Data::MySQL::Connector MySQLConn_;
@@ -87,7 +81,7 @@ namespace OpenWifi {
 		//        Poco::Data::SessionPool(SQLiteConn_.name(), DBName, 8,
 		//                                                                                     (int)NumSessions,
 		//                                                                                     (int)IdleTime));
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(SQLiteConn_.name(), DBName, 8,
+		Pool_ = std::make_unique<Poco::Data::SessionPool>(SQLiteConn_.name(), DBName, 8,
 														  (int)NumSessions, (int)IdleTime);
 		return 0;
 	}
@@ -108,7 +102,7 @@ namespace OpenWifi {
 									";compress=true;auto-reconnect=true";
 
 		Poco::Data::MySQL::Connector::registerConnector();
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(MySQLConn_.name(), ConnectionStr, 8,
+		Pool_ = std::make_unique<Poco::Data::SessionPool>(MySQLConn_.name(), ConnectionStr, 8,
 														  NumSessions, IdleTime);
 
 		return 0;
@@ -132,7 +126,7 @@ namespace OpenWifi {
 									" connect_timeout=" + ConnectionTimeout;
 
 		Poco::Data::PostgreSQL::Connector::registerConnector();
-		Pool_ = std::make_shared<Poco::Data::SessionPool>(PostgresConn_.name(), ConnectionStr, 8,
+		Pool_ = std::make_unique<Poco::Data::SessionPool>(PostgresConn_.name(), ConnectionStr, 8,
 														  NumSessions, IdleTime);
 
 		return 0;

src/framework/SubSystemServer.cpp

@@ -37,7 +37,6 @@ namespace OpenWifi {
 		P.cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
 		P.dhUse2048Bits = true;
 		P.caLocation = cas_;
-        // P.securityLevel =
 
 		auto Context = Poco::AutoPtr<Poco::Net::Context>(
 			new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
@@ -54,6 +53,7 @@ namespace OpenWifi {
 
 			Context->useCertificate(Cert);
 			Context->addChainCertificate(Root);
+
 			Context->addCertificateAuthority(Root);
 
 			if (level_ == Poco::Net::Context::VERIFY_STRICT) {
@@ -76,18 +76,18 @@ namespace OpenWifi {
 				L.fatal(fmt::format("Wrong Certificate({}) for Key({})", cert_file_, key_file_));
 			}
 
-            SSL_CTX_set_verify(SSLCtx, level_==Poco::Net::Context::VERIFY_NONE ? SSL_VERIFY_NONE : SSL_VERIFY_PEER, nullptr);
+			SSL_CTX_set_verify(SSLCtx, SSL_VERIFY_PEER, nullptr);
 
 			if (level_ == Poco::Net::Context::VERIFY_STRICT) {
 				SSL_CTX_set_client_CA_list(SSLCtx, SSL_load_client_CA_file(client_cas_.c_str()));
-                SSL_CTX_enable_ct(SSLCtx, SSL_CT_VALIDATION_STRICT);
 			}
+			SSL_CTX_enable_ct(SSLCtx, SSL_CT_VALIDATION_STRICT);
 			SSL_CTX_dane_enable(SSLCtx);
 
 			Context->enableSessionCache();
 			Context->setSessionCacheSize(0);
 			Context->setSessionTimeout(60);
-			Context->enableExtendedCertificateVerification( level_!= Poco::Net::Context::VERIFY_NONE );
+			Context->enableExtendedCertificateVerification(true);
 			Context->disableStatelessSessionResumption();
 		}
 

src/framework/default_device_types.h

@@ -1,63 +0,0 @@
-//
-// Created by stephane bourque on 2023-04-19.
-//
-
-#pragma once
-
-#include <vector>
-#include <string>
-
-namespace OpenWifi {
-	inline  const std::vector<std::pair<std::string, std::string>> DefaultDeviceTypeList{
-		{"actiontec_web7200", "AP"},
-		{"cig_wf186w", "AP"},
-		{"cig_wf188n", "AP"},
-		{"cig_wf194c4", "AP"},
-		{"cig_wf196", "AP"},
-		{"cig_wf196-ca", "AP"},
-		{"cig_wf196-ca-ath12", "AP"},
-		{"cig_wf196-us", "AP"},
-		{"cig_wf610d", "AP"},
-		{"cig_wf660a", "AP"},
-		{"cig_wf808", "AP"},
-		{"cybertan_eww622-a1", "AP"},
-		{"edgecore_eap101", "AP"},
-		{"edgecore_eap101-ath12", "AP"},
-		{"edgecore_eap102", "AP"},
-		{"edgecore_eap104", "AP"},
-		{"edgecore_eap104-ath12", "AP"},
-		{"edgecore_ecs4100-12ph", "AP"},
-		{"edgecore_ecw5211", "AP"},
-		{"edgecore_ecw5410", "AP"},
-		{"edgecore_oap100", "AP"},
-		{"edgecore_spw2ac1200", "SWITCH"},
-		{"edgecore_spw2ac1200-lan-poe", "SWITCH"},
-		{"edgecore_ssw2ac2600", "SWITCH"},
-		{"hfcl_ion4", "AP"},
-		{"hfcl_ion4x", "AP"},
-		{"hfcl_ion4x_2", "AP"},
-		{"hfcl_ion4xe", "AP"},
-		{"hfcl_ion4xi", "AP"},
-		{"indio_um-305ac", "AP"},
-		{"indio_um-305ax", "AP"},
-		{"indio_um-310ax-v1", "AP"},
-		{"indio_um-325ac", "AP"},
-		{"indio_um-510ac-v3", "AP"},
-		{"indio_um-510axm-v1", "AP"},
-		{"indio_um-510axp-v1", "AP"},
-		{"indio_um-550ac", "AP"},
-		{"linksys_e8450-ubi", "AP"},
-		{"linksys_ea6350-v4", "AP"},
-		{"linksys_ea8300", "AP"},
-		{"liteon_wpx8324", "AP"},
-		{"meshpp_s618_cp01", "AP"},
-		{"meshpp_s618_cp03", "AP"},
-		{"udaya_a5-id2", "AP"},
-		{"wallys_dr40x9", "AP"},
-		{"wallys_dr6018", "AP"},
-		{"wallys_dr6018_v4", "AP"},
-		{"x64_vm", "AP"},
-		{"yuncore_ax840", "AP"},
-		{"yuncore_fap640", "AP"},
-		{"yuncore_fap650", "AP"}};
-}

src/framework/orm.h

@@ -576,8 +576,8 @@ namespace ORM {
 		bool UpdateRecord(field_name_t FieldName, const T &Value, const RecordType &R) {
 			try {
 				assert(ValidFieldName(FieldName));
+
 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Update(Session);
 
 				RecordTuple RT;
@@ -593,7 +593,6 @@ namespace ORM {
 				Update.execute();
 				if (Cache_)
 					Cache_->UpdateCache(R);
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
@@ -663,7 +662,6 @@ namespace ORM {
 				assert(ValidFieldName(FieldName));
 
 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Delete(Session);
 
 				std::string St = "delete from " + TableName_ + " where " + FieldName + "=?";
@@ -673,7 +671,6 @@ namespace ORM {
 				Delete.execute();
 				if (Cache_)
 					Cache_->Delete(FieldName, Value);
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
@@ -685,13 +682,11 @@ namespace ORM {
 			try {
 				assert(!WhereClause.empty());
 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Delete(Session);
 
 				std::string St = "delete from " + TableName_ + " where " + WhereClause;
 				Delete << St;
 				Delete.execute();
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);

src/framework/ow_constants.h

@@ -40,7 +40,6 @@ namespace OpenWifi {
 	};
 }
 
-#define DBGLINE     std::cout << __LINE__ << ":" << __FILE__ << ", " << __func__ << std::endl;
 namespace OpenWifi::RESTAPI::Errors {
 	struct msg {
 		uint64_t err_num;
@@ -398,49 +397,6 @@ namespace OpenWifi::RESTAPI::Errors {
 	static const struct msg FirmwareBDInProgress {
 		1170, "Firmware DB update already in progress."
 	};
-	static const struct msg SimulatedDeviceNotSupported {
-		1171, "Command not supported on simulated device."
-	};
-
-    static const struct msg VenuesNameAlreadyExists {
-            1172, "The venue name already exists."
-    };
-
-    static const struct msg InvalidGlobalReachAccount {
-            1173, "Invalid Global Reach account information."
-    };
-    static const struct msg CannotCreateCSR {
-            1174, "Cannot create a CSR certificate."
-    };
-
-    static const struct msg DefFirmwareNameExists { 1175, "Firmware name already exists." };
-    static const struct msg NotAValidECKey { 1176, "Not a valid Signing Key." };
-	static const struct msg NotAValidRadiusPoolType { 1177, "Not a valid RADIUS pool type." };
-    static const struct msg InvalidRadiusTypeEndpoint { 1178, "Invalid RADIUS Server Endpoint type." };
-    static const struct msg InvalidRadiusEndpointPoolStrategy { 1179, "Invalid RADIUS Server Endpoint Pool strategy." };
-    static const struct msg EndpointMustHaveOneTypeOfServers { 1180, "All servers must be either RADIUS or RADSEC." };
-    static const struct msg RadiusEndpointIndexInvalid { 1181, "Index must be an address between 0.0.1.1 and 0.0.2.254" };
-    static const struct msg RadiusEndpointIndexMustBeUnique { 1182, "Index must be unique." };
-    static const struct msg OrionAccountMustExist { 1183, "Orion account must exist." };
-    static const struct msg GlobalReachCertMustExist { 1184, "Global Reach certificate must exist." };
-    static const struct msg InvalidRadsecMainCertificate { 1185, "Invalid Radsec main certificate." };
-    static const struct msg InvalidRadsecCaCertificate { 1186, "Invalid Radsec CA certificates." };
-    static const struct msg InvalidRadsecPrivteKey { 1187, "Invalid Radsec Private key." };
-    static const struct msg InvalidRadsecIPAddress { 1188, "Invalid Radsec IP Address." };
-    static const struct msg InvalidRadsecPort { 1189, "Invalid Radsec Port." };
-    static const struct msg InvalidRadsecSecret { 1190, "Invalid Radsec Secret." };
-    static const struct msg InvalidRadiusServer { 1191, "Invalid Radius Server." };
-
-	static const struct msg InvalidRRMAction { 1192, "Invalid RRM Action." };
-
-    static const struct msg SimulationDoesNotExist {
-        7000, "Simulation Instance ID does not exist."
-    };
-
-    static const struct msg SimulationIsAlreadyRunning {
-        7001, "There is an instance of this simulation already running.."
-    };
-
 
 } // namespace OpenWifi::RESTAPI::Errors
 
@@ -563,10 +519,6 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char *CONTENTDISPOSITION = "Content-Disposition";
 	static const char *CONTENTTYPE = "Content-Type";
 
-	static const char *TRANSFER = "transfer";
-	static const char *CERTUPDATE = "certupdate";
-	static const char *RRM = "rrm";
-
 	static const char *REQUIREMENTS = "requirements";
 	static const char *PASSWORDPATTERN = "passwordPattern";
 	static const char *ACCESSPOLICY = "accessPolicy";
@@ -602,7 +554,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *HEALTHCHECK = "healthcheck";
 	static const char *LOG = "log";
 	static const char *CRASHLOG = "crashlog";
-	static const char *REBOOTLOG = "rebootLog";
 	static const char *PING = "ping";
 	static const char *CFGPENDING = "cfgpending";
 	static const char *RECOVERY = "recovery";
@@ -661,8 +612,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *DEVICEUPDATE = "deviceupdate";
 	static const char *FWSIGNATURE = "FWsignature";
 	static const char *SIGNATURE = "signature";
-	static const char *INFO = "info";
-	static const char *DATE = "date";
 
 	static const char *SERIALNUMBER = "serialNumber";
 	static const char *COMPATIBLE = "compatible";
@@ -684,12 +633,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *RADIUSCOA = "coa";
 	static const char *RADIUSDST = "dst";
 	static const char *IES = "ies";
-
-	static const char *TRANSFER = "transfer";
-	static const char *CERTUPDATE = "certupdate";
-	static const char *RRM = "rrm";
-	static const char *ACTIONS = "actions";
-
 } // namespace OpenWifi::uCentralProtocol
 
 namespace OpenWifi::uCentralProtocol::Events {
@@ -699,7 +642,6 @@ namespace OpenWifi::uCentralProtocol::Events {
 	static const char *HEALTHCHECK = "healthcheck";
 	static const char *LOG = "log";
 	static const char *CRASHLOG = "crashlog";
-	static const char *REBOOTLOG = "rebootLog";
 	static const char *PING = "ping";
 	static const char *CFGPENDING = "cfgpending";
 	static const char *RECOVERY = "recovery";
@@ -723,8 +665,7 @@ namespace OpenWifi::uCentralProtocol::Events {
 		ET_VENUEBROADCAST,
 		ET_EVENT,
 		ET_WIFISCAN,
-		ET_ALARM,
+		ET_ALARM
-		ET_REBOOTLOG
 	};
 
 	inline EVENT_MSG EventFromString(const std::string &Method) {
@@ -755,10 +696,8 @@ namespace OpenWifi::uCentralProtocol::Events {
 		else if (strcmp(WIFISCAN, Method.c_str()) == 0)
 			return ET_WIFISCAN;
 		else if (strcmp(ALARM, Method.c_str()) == 0)
-			return ET_ALARM;
+			return ET_WIFISCAN;
-		else if (strcmp(REBOOTLOG, Method.c_str()) == 0)
+		return ET_ALARM;
-			return ET_REBOOTLOG;
-		return ET_UNKNOWN;
 	};
 } // namespace OpenWifi::uCentralProtocol::Events
 
@@ -782,9 +721,6 @@ namespace OpenWifi::APCommands {
 		telemetry,
 		ping,
 		script,
-		rrm,
-		certupdate,
-		transfer,
 		unknown
 	};
 
@@ -797,10 +733,7 @@ namespace OpenWifi::APCommands {
 		RESTAPI::Protocol::LEDS,		 RESTAPI::Protocol::TRACE,
 		RESTAPI::Protocol::REQUEST,		 RESTAPI::Protocol::WIFISCAN,
 		RESTAPI::Protocol::EVENTQUEUE,	 RESTAPI::Protocol::TELEMETRY,
-		RESTAPI::Protocol::PING,		 RESTAPI::Protocol::SCRIPT,
+		RESTAPI::Protocol::PING,		 RESTAPI::Protocol::SCRIPT};
-		RESTAPI::Protocol::RRM,		 	 RESTAPI::Protocol::CERTUPDATE,
-		RESTAPI::Protocol::TRANSFER
-	};
 
 	inline const char *to_string(Commands Cmd) { return uCentralAPCommands[(uint8_t)Cmd]; }
 

src/framework/utils.cpp

@@ -3,19 +3,10 @@
 //
 
 #include "Poco/Path.h"
-#include "Poco/TemporaryFile.h"
+
-#include "Poco/Crypto/ECKey.h"
 #include "framework/AppServiceRegistry.h"
 #include "framework/utils.h"
 
-#include <iostream>
-#include <cstdlib>
-#include <ctime>
-#include <string>
-#include <algorithm>
-
-#include <resolv.h>
-
 namespace OpenWifi::Utils {
 
 	bool NormalizeMac(std::string &Mac) {
@@ -36,10 +27,6 @@ namespace OpenWifi::Utils {
 				std::all_of(Serial.begin(), Serial.end(), [](auto i) { return std::isxdigit(i); }));
 	}
 
-	[[nodiscard]] bool ValidSerialNumbers(const std::vector<std::string> &numbers) {
-		return std::all_of(numbers.begin(),numbers.end(),[](auto &number) {return ValidSerialNumber(number);});
-	}
-
 	[[nodiscard]] bool ValidUUID(const std::string &UUID) {
 		if (UUID.size() > 36)
 			return false;
@@ -141,15 +128,6 @@ namespace OpenWifi::Utils {
 		return std::regex_match(Hostname, HostNameRegex);
 	}
 
-	[[nodiscard]] bool ValidNumber(const std::string &number, bool isSigned)
-	{
-		static std::regex IntRegex("^-?[0-9]\\d*(\\.\\d+)?$");
-		if(!isSigned) {
-			IntRegex = "^[0-9]\\d*(\\.\\d+)?$";
-		}
-		return std::regex_match(number, IntRegex);
-	}
-
 	[[nodiscard]] std::string ToHex(const std::vector<unsigned char> &B) {
 		std::string R;
 		R.reserve(B.size() * 2);
@@ -617,329 +595,4 @@ namespace OpenWifi::Utils {
 		return DT.timestamp().epochTime();
 	}
 
-    static std::string FileToString(const std::string &Filename) {
-        std::ifstream   ifs(Filename.c_str(),std::ios_base::in|std::ios_base::binary);
-        std::ostringstream os;
-        Poco::StreamCopier::copyStream(ifs,os);
-        return os.str();
-    }
-
-    bool CreateX509CSR(const CSRCreationParameters & Parameters, CSRCreationResults & Results) {
-        int             ret = 0;
-        RSA             *r = nullptr;
-        BIGNUM          *bne = nullptr;
-
-        int             nVersion = 0;
-        unsigned long   e = RSA_F4;
-
-        X509_REQ        *x509_req = nullptr;
-        X509_NAME       *x509_name = nullptr;
-        EVP_PKEY        *pKey = nullptr;
-//        RSA             *tem = nullptr;
-//        BIO             *bio_err = nullptr;
-
-        const char      *szCountry = Parameters.Country.c_str();
-        const char      *szProvince = Parameters.Province.c_str();
-        const char      *szCity = Parameters.City.c_str();
-        const char      *szOrganization = Parameters.Organization.c_str();
-        const char      *szCommon = Parameters.CommonName.c_str();
-
-        Poco::TemporaryFile     CsrPath, PubKey, PrivateKey;
-        std::string             Result;
-        std::ifstream           ifs;
-        std::ostringstream      ss;
-        BIO                     *bp_public = nullptr,
-                *bp_private = nullptr,
-                *bp_csr = nullptr;
-
-        // 1. generate rsa key
-        bne = BN_new();
-        ret = BN_set_word(bne,e);
-        if(ret != 1){
-            goto free_all;
-        }
-
-        r = RSA_new();
-        ret = RSA_generate_key_ex(r, Parameters.bits, bne, nullptr);
-        if(ret != 1){
-            goto free_all;
-        }
-
-        bp_public = BIO_new_file(PubKey.path().c_str(), "w+");
-        ret = PEM_write_bio_RSAPublicKey(bp_public, r);
-        if(ret != 1) {
-            goto free_all;
-        }
-
-        bp_private = BIO_new_file(PrivateKey.path().c_str(), "w+");
-        ret = PEM_write_bio_RSAPrivateKey(bp_private, r, NULL, NULL, 0, NULL, NULL);
-        if(ret != 1) {
-            goto free_all;
-        }
-
-// 2. set version of x509 req
-        x509_req = X509_REQ_new();
-        ret = X509_REQ_set_version(x509_req, nVersion);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 3. set subject of x509 req
-        x509_name = X509_REQ_get_subject_name(x509_req);
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"C", MBSTRING_ASC, (const unsigned char*)szCountry, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"ST", MBSTRING_ASC, (const unsigned char*)szProvince, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"L", MBSTRING_ASC, (const unsigned char*)szCity, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"O", MBSTRING_ASC, (const unsigned char*)szOrganization, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"CN", MBSTRING_ASC, (const unsigned char*)szCommon, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 4. set public key of x509 req
-        pKey = EVP_PKEY_new();
-        EVP_PKEY_assign_RSA(pKey, r);
-        r = nullptr;   // will be free rsa when EVP_PKEY_free(pKey)
-
-        ret = X509_REQ_set_pubkey(x509_req, pKey);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 5. set sign key of x509 req
-        ret = X509_REQ_sign(x509_req, pKey, EVP_sha1());    // return x509_req->signature->length
-        if (ret <= 0){
-            goto free_all;
-        }
-
-        bp_csr = BIO_new_file(CsrPath.path().c_str(),"w");
-        ret = PEM_write_bio_X509_REQ(bp_csr, x509_req);
-
-// 6. free
-        free_all:
-        X509_REQ_free(x509_req);
-        BIO_free_all(bp_csr);
-        BIO_free_all(bp_public);
-        BIO_free_all(bp_private);
-
-        EVP_PKEY_free(pKey);
-        BN_free(bne);
-        if(ret==1) {
-            Results.CSR = FileToString(CsrPath.path());
-            Results.PrivateKey = FileToString(PrivateKey.path());
-            Results.PublicKey = FileToString(PubKey.path());
-        }
-
-        return ret;
-    }
-
-    bool VerifyECKey(const std::string &key) {
-        try {
-            Poco::TemporaryFile F;
-
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << key;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::ECKey>(
-                    new Poco::Crypto::ECKey("", F.path(),""));
-
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool VerifyRSAKey([[
-    maybe_unused]] const std::string &key) {
-        try {
-            Poco::TemporaryFile F;
-
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << key;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::RSAKey>(
-                    new Poco::Crypto::RSAKey("", F.path(),""));
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool VerifyPrivateKey(const std::string &key) {
-        return VerifyECKey(key) || VerifyRSAKey(key);
-    }
-
-    bool ValidX509Certificate([[
-                              maybe_unused]] const std::string &Cert) {
-        try {
-            Poco::TemporaryFile F;
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << Cert;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::X509Certificate>(
-                    new Poco::Crypto::X509Certificate(F.path()));
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool ValidX509Certificate([[
-                              maybe_unused]] const std::vector<std::string> &Certs) {
-        auto F = [](const std::string &C) -> bool { return ValidX509Certificate(C); };
-        return std::all_of(Certs.begin(),Certs.end(), F);
-    }
-
-    std::string generateStrongPassword(int minLength, int maxLength, int numDigits, int minLowercase, int minSpecial, int minUppercase) {
-        // Define character sets for each category
-        const std::string lowercaseChars = "abcdefghijklmnopqrstuvwxyz";
-        const std::string uppercaseChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        const std::string digitChars = "0123456789";
-        const std::string specialChars = "!@#$%^&*()_+[]{}|;:,.<>?";
-
-        // Check if parameters are valid
-        if (minLength < 1 || minLength > maxLength || minLowercase + minUppercase + numDigits + minSpecial > maxLength) {
-            return "Invalid parameters";
-        }
-
-        // Initialize random seed
-        std::random_device rd;
-        std::mt19937 g(rd());
-
-        // Initialize the password string
-        std::string password;
-
-        // Generate the required number of each character type
-        for (int i = 0; i < minLowercase; ++i) {
-            password += lowercaseChars[g() % lowercaseChars.length()];
-        }
-        for (int i = 0; i < minUppercase; ++i) {
-            password += uppercaseChars[g() % uppercaseChars.length()];
-        }
-        for (int i = 0; i < numDigits; ++i) {
-            password += digitChars[g() % digitChars.length()];
-        }
-        for (int i = 0; i < minSpecial; ++i) {
-            password += specialChars[g() % specialChars.length()];
-        }
-
-        // Calculate how many more characters are needed
-        int remainingLength = maxLength - (int)password.length();
-
-        // Generate random characters to fill the remaining length
-        for (int i = 0; i < remainingLength; ++i) {
-            int category = g() % 4; // Randomly select a category
-            if (category == 0) {
-                password += lowercaseChars[g() % lowercaseChars.length()];
-            } else if (category == 1) {
-                password += uppercaseChars[g() % uppercaseChars.length()];
-            } else if (category == 2) {
-                password += digitChars[g() % digitChars.length()];
-            } else {
-                password += specialChars[g() % specialChars.length()];
-            }
-        }
-
-        // Shuffle the password to randomize the character order
-        std::shuffle(password.begin(), password.end(),g);
-
-        return password;
-    }
-
-// 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) {
-        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

@@ -13,8 +13,6 @@
 #include <string>
 #include <thread>
 
-#include <dirent.h>
-
 #include "Poco/Base64Decoder.h"
 #include "Poco/Base64Encoder.h"
 #include "Poco/File.h"
@@ -70,10 +68,8 @@ namespace OpenWifi::Utils {
 	};
 
 	[[nodiscard]] bool ValidSerialNumber(const std::string &Serial);
-	[[nodiscard]] bool ValidSerialNumbers(const std::vector<std::string> &Serial);
 	[[nodiscard]] bool ValidUUID(const std::string &UUID);
 	[[nodiscard]] bool ValidHostname(const std::string &hostname);
-	[[nodiscard]] bool ValidNumber(const std::string &number, bool isSigned);
 
 	template <typename... Args> std::string ComputeHash(Args &&...args) {
 		Poco::SHA2Engine E;
@@ -150,256 +146,4 @@ namespace OpenWifi::Utils {
 
 	bool ExtractBase64CompressedData(const std::string &CompressedData,
 									 std::string &UnCompressedData, uint64_t compress_sz);
-
-	inline bool match(const char* first, const char* second)
-	{
-		// If we reach at the end of both strings, we are done
-		if (*first == '\0' && *second == '\0')
-			return true;
-
-		// Make sure to eliminate consecutive '*'
-		if (*first == '*') {
-			while (*(first + 1) == '*')
-				first++;
-		}
-
-		// Make sure that the characters after '*' are present
-		// in second string. This function assumes that the
-		// first string will not contain two consecutive '*'
-		if (*first == '*' && *(first + 1) != '\0'
-			&& *second == '\0')
-			return false;
-
-		// If the first string contains '?', or current
-		// characters of both strings match
-		if (*first == '?' || *first == *second)
-			return match(first + 1, second + 1);
-
-		// If there is *, then there are two possibilities
-		// a) We consider current character of second string
-		// b) We ignore current character of second string.
-		if (*first == '*')
-			return match(first + 1, second)
-				   || match(first, second + 1);
-		return false;
-	}
-
-	static inline std::uint64_t GetValue(FILE *file) {
-		unsigned long v=0;
-		char factor[32];
-		if(fscanf(file, " %lu %31s", &v, factor)==2) {
-			switch (factor[0]) {
-			case 'k':
-				return v * 1000;
-			case 'M':
-				return v * 1000000;
-			case 'G':
-				return v * 1000000000;
-			}
-		}
-		return v;
-	}
-
-	inline bool getMemory(
-		std::uint64_t &currRealMem, std::uint64_t &peakRealMem,
-		std::uint64_t &currVirtMem, std::uint64_t &peakVirtMem) {
-
-		// stores each word in status file
-		char buffer[1024] = "";
-
-		currRealMem = peakRealMem = currVirtMem = peakVirtMem = 0;
-
-		// linux file contains this-process info
-		FILE * file = std::fopen("/proc/self/status", "r");
-		if (file == nullptr) {
-			return false;
-		}
-
-		// read the entire file, recording mems in kB
-		while (fscanf(file, " %1023s", buffer) == 1) {
-
-			if (strcmp(buffer, "VmRSS:") == 0) {
-				currRealMem= GetValue(file);
-			} else if (strcmp(buffer, "VmHWM:") == 0) {
-				peakRealMem= GetValue(file);
-			} else if (strcmp(buffer, "VmSize:") == 0) {
-				currVirtMem= GetValue(file);
-			} else if (strcmp(buffer, "VmPeak:") == 0) {
-				peakVirtMem= GetValue(file);
-			}
-		}
-		fclose(file);
-
-		return true;
-	}
-
-	inline int get_open_fds() {
-		DIR *dp = opendir("/proc/self/fd");
-		struct dirent *de;
-		int count = -3; // '.', '..', dp
-
-		if (dp == nullptr)
-			return -1;
-		while ((de = readdir(dp)) != nullptr)
-			count++;
-		(void)closedir(dp);
-
-		return count;
-	}
-
-    inline std::uint32_t IPtoInt(const std::string &A) {
-        Poco::Net::IPAddress    IP;
-        std::uint32_t Result=0;
-
-        if(Poco::Net::IPAddress::tryParse(A,IP)) {
-            for(const auto i:IP.toBytes()) {
-                Result <<= 8;
-                Result += i;
-            }
-        }
-        return Result;
-    }
-
-    inline bool ValidIP(const std::string &IPstr) {
-        Poco::Net::IPAddress    IP;
-        return Poco::Net::IPAddress::tryParse(IPstr,IP);
-    }
-
-    struct CSRCreationParameters {
-        std::string Country, Province, City,
-                    Organization, CommonName;
-        int         bits=2048;
-    };
-
-    struct CSRCreationResults {
-        std::string     CSR, PublicKey, PrivateKey;
-    };
-
-    bool CreateX509CSR(const CSRCreationParameters & Parameters, CSRCreationResults & Results);
-    std::string generateStrongPassword(int minLength, int maxLength, int numDigits, int minLowercase, int minSpecial, int minUppercase);
-    bool VerifyECKey(const std::string &key);
-    bool VerifyRSAKey(const std::string &key);
-    bool VerifyPrivateKey(const std::string &key);
-    bool ValidX509Certificate(const std::string &Cert);
-    bool ValidX509Certificate(const std::vector<std::string> &Certs);
-
-    struct NAPTRRecord {
-        std::string     name;
-        std::string     ttl;
-        std::string     rclass;
-        std::string     rtype;
-        uint32_t        order=0;
-        uint32_t        preference=0;
-        std::string     flags;
-        std::string     service;
-        std::string     regexp;
-        std::string     replacement;
-    };
-
-// 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;
-        std::string     rclass;
-        std::string     rtype;
-        uint32_t        pref = 0;
-        uint32_t        weight = 0;
-        uint32_t        port = 0;
-        std::string     srvname;
-    };
-
-    std::vector<SrvRecord> getSRVRecords(const std::string& domain);
-
-    struct HostNameServerResult{
-        std::string     Hostname;
-        uint32_t        Port;
-    };
-
-	class CompressedString {
-	  public:
-		CompressedString() {
-			DecompressedSize_ = 0;
-		};
-
-		explicit CompressedString(const std::string &Data) : DecompressedSize_(Data.size()) {
-			CompressIt(Data);
-		}
-
-		CompressedString(const CompressedString &Data) {
-			this->DecompressedSize_ = Data.DecompressedSize_;
-			this->CompressedData_ = Data.CompressedData_;
-		}
-
-		CompressedString& operator=(const CompressedString& rhs) {
-			if (this != &rhs) {
-				this->DecompressedSize_ = rhs.DecompressedSize_;
-				this->CompressedData_ = rhs.CompressedData_;
-			}
-			return *this;
-		}
-
-		CompressedString& operator=(CompressedString&& rhs) {
-			if (this != &rhs) {
-				this->DecompressedSize_ = rhs.DecompressedSize_;
-				this->CompressedData_ = rhs.CompressedData_;
-			}
-			return *this;
-		}
-
-		~CompressedString() = default;
-
-		operator std::string() const {
-			return DecompressIt();
-		}
-
-		CompressedString &operator=(const std::string &Data) {
-			DecompressedSize_ = Data.size();
-			CompressIt(Data);
-			return *this;
-		}
-
-		auto CompressedSize() const { return CompressedData_.size(); }
-		auto DecompressedSize() const { return DecompressedSize_; }
-
-	  private:
-		std::string     CompressedData_;
-		std::size_t     DecompressedSize_;
-
-		inline void CompressIt(const std::string &Data) {
-			z_stream strm; // = {0};
-			CompressedData_.resize(Data.size());
-			strm.next_in = (Bytef *)Data.data();
-			strm.avail_in = Data.size();
-			strm.next_out = (Bytef *)CompressedData_.data();
-			strm.avail_out = Data.size();
-			strm.zalloc = Z_NULL;
-			strm.zfree = Z_NULL;
-			strm.opaque = Z_NULL;
-			deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY);
-			deflate(&strm, Z_FINISH);
-			deflateEnd(&strm);
-			CompressedData_.resize(strm.total_out);
-		}
-
-		[[nodiscard]] std::string DecompressIt() const {
-			std::string Result;
-			if(DecompressedSize_!=0) {
-				Result.resize(DecompressedSize_);
-				z_stream strm ; //= {0};
-				strm.next_in = (Bytef *)CompressedData_.data();
-				strm.avail_in = CompressedData_.size();
-				strm.next_out = (Bytef *)Result.data();
-				strm.avail_out = Result.size();
-				strm.zalloc = Z_NULL;
-				strm.zfree = Z_NULL;
-				strm.opaque = Z_NULL;
-				inflateInit2(&strm, 15 + 32);
-				inflate(&strm, Z_FINISH);
-				inflateEnd(&strm);
-			}
-			return Result;
-		}
-	};
-
 } // namespace OpenWifi::Utils

templates/email_verification.html

@@ -435,18 +435,18 @@
                                                     regarding this application,
                                                     please contact us at
                                                     <a
-                                                        href="mailto:${USER_HELPER_EMAIL}"
+                                                        href="mailto:tip-keys@arilia.com"
                                                         target="_blank"
                                                     >
-                                                        ${USER_HELPER_EMAIL}
+                                                        tip-keys@arilia.com
                                                     </a>
                                                     . For question regarding the
                                                     Telecom Infra Project,
                                                     please contact us at
                                                     <a
-                                                        href="mailto:${GLOBAL_USER_HELPER_EMAIL}"
+                                                        href="mailto:info@telecominfraproject.com"
                                                     >
-                                                        ${GLOBAL_USER_HELPER_EMAIL}
+                                                        info@telecominfraproject.com
                                                     </a>
                                                     .
                                                 </p>
@@ -456,7 +456,7 @@
                                         <tr>
                                             <td>
                                                 <p>Thank You!</p>
-                                                <p>${USER_SIGNATURE}</p>
+                                                <p>Arilia Wireless Inc.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -502,13 +502,13 @@
                                                     <tr>
                                                         <p class="align-center">
                                                             Copyright 2023
-                                                            ${USER_SIGNATURE},
+                                                            Arilia Wireless Inc,
                                                             All rights reserved.
                                                         </p>
                                                         <a
-                                                            href="https://${USER_HELPER_SITE}"
+                                                            href="https://arilia.com"
                                                             target="_blank"
-                                                            >${USER_HELPER_SITE}</a
+                                                            >www.arilia.com</a
                                                         >
                                                     </tr>
                                                 </tbody>

templates/password_reset.html

@@ -431,18 +431,18 @@
                                                     regarding this application,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${USER_HELPER_EMAIL}"
+                                                        href="mailto:tip-keys@arilia.com"
-                                                            target="_blank"
+                                                        target="_blank"
                                                     >
-                                                        ${USER_HELPER_EMAIL}
+                                                        tip-keys@arilia.com
                                                     </a>
                                                     . For question regarding the
                                                     Telecom Infra Project,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${GLOBAL_USER_HELPER_EMAIL}"
+                                                        href="mailto:info@telecominfraproject.com"
                                                     >
-                                                        ${GLOBAL_USER_HELPER_EMAIL}
+                                                        info@telecominfraproject.com
                                                     </a>
                                                     .
                                                 </p>
@@ -452,7 +452,7 @@
                                         <tr>
                                             <td>
                                                 <p>Thank You!</p>
-                                                <p>${USER_SIGNATURE}</p>
+                                                <p>Arilia Wireless Inc.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -494,19 +494,19 @@
                                                 style="min-width: 100%"
                                             >
                                                 <tbody>
-                                                <tr></tr>
+                                                    <tr></tr>
-                                                <tr>
+                                                    <tr>
-                                                    <p class="align-center">
+                                                        <p class="align-center">
-                                                        Copyright 2023
+                                                            Copyright 2023
-                                                        ${USER_SIGNATURE},
+                                                            Arilia Wireless Inc,
-                                                        All rights reserved.
+                                                            All rights reserved.
-                                                    </p>
+                                                        </p>
-                                                    <a
+                                                        <a
-                                                            href="https://${USER_HELPER_SITE}"
+                                                            href="https://arilia.com"
                                                             target="_blank"
-                                                    >${USER_HELPER_SITE}</a
+                                                            >www.arilia.com</a
-                                                    >
+                                                        >
-                                                </tr>
+                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </td>

templates/signup_verification.html

@@ -435,18 +435,18 @@
                                                     regarding this application,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${USER_HELPER_EMAIL}"
+                                                        href="mailto:tip-keys@arilia.com"
-                                                            target="_blank"
+                                                        target="_blank"
                                                     >
-                                                        ${USER_HELPER_EMAIL}
+                                                        tip-keys@arilia.com
                                                     </a>
                                                     . For question regarding the
                                                     Telecom Infra Project,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${GLOBAL_USER_HELPER_EMAIL}"
+                                                        href="mailto:info@telecominfraproject.com"
                                                     >
-                                                        ${GLOBAL_USER_HELPER_EMAIL}
+                                                        info@telecominfraproject.com
                                                     </a>
                                                     .
                                                 </p>
@@ -456,7 +456,7 @@
                                         <tr>
                                             <td>
                                                 <p>Thank You!</p>
-                                                <p>${USER_SIGNATURE}</p>
+                                                <p>Arilia Wireless Inc.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -498,19 +498,19 @@
                                                 style="min-width: 100%"
                                             >
                                                 <tbody>
-                                                <tr></tr>
+                                                    <tr></tr>
-                                                <tr>
+                                                    <tr>
-                                                    <p class="align-center">
+                                                        <p class="align-center">
-                                                        Copyright 2023
+                                                            Copyright 2023
-                                                        ${USER_SIGNATURE},
+                                                            Arilia Wireless Inc,
-                                                        All rights reserved.
+                                                            All rights reserved.
-                                                    </p>
+                                                        </p>
-                                                    <a
+                                                        <a
-                                                            href="https://${USER_HELPER_SITE}"
+                                                            href="https://arilia.com"
                                                             target="_blank"
-                                                    >${USER_HELPER_SITE}</a
+                                                            >www.arilia.com</a
-                                                    >
+                                                        >
-                                                </tr>
+                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </td>

templates/sub_email_verification.html

@@ -1,527 +0,0 @@
-<html>
-<head>
-    <title>Email Confirmation</title>
-    <style>
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%;
-        }
-
-        body {
-            color: #414141;
-            background-color: #f6f6f6;
-            font-family: sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%;
-        }
-
-        table {
-            border-collapse: separate;
-            width: 100%;
-            text-align: center;
-        }
-
-        table td {
-            font-family: sans-serif;
-            font-size: 14px;
-            color: #414141;
-            vertical-align: top;
-        }
-
-        .body {
-            background-color: white;
-            width: 100%;
-        }
-
-        .container {
-            display: block;
-            margin: 0 auto !important;
-            max-width: 580px;
-            padding: 10px;
-            width: 580px;
-        }
-
-        .content {
-            box-sizing: border-box;
-            display: block;
-            margin: 0 auto;
-            max-width: 580px;
-            padding: 10px;
-        }
-
-        .main {
-            background: #ffffff;
-            border-radius: 0px;
-            width: 600px;
-            max-width: 100%;
-            border: 1px solid #d4d4d4;
-            padding-left: 45px;
-            padding-right: 45px;
-        }
-
-        .wrapper {
-            box-sizing: border-box;
-            padding: 40px 20px;
-        }
-
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-
-        .footer {
-            clear: both;
-            margin-top: 10px;
-            text-align: center;
-            width: 100%;
-        }
-
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #999999;
-            font-size: 12px;
-            text-align: center;
-        }
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #414141;
-            font-family: sans-serif;
-            font-weight: 400;
-            line-height: 1.4;
-            margin: 0;
-            margin-bottom: 30px;
-        }
-
-        h2 {
-            font-weight: 600;
-        }
-
-        h1 {
-            font-size: 35px;
-            font-weight: 300;
-            text-align: center;
-            text-transform: capitalize;
-        }
-
-        p,
-        ul,
-        ol {
-            font-family: sans-serif;
-            font-size: 14px;
-            font-weight: normal;
-            margin: 0;
-            color: #414141;
-            margin-bottom: 15px;
-        }
-
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px;
-            color: #414141;
-        }
-
-        a {
-            color: #29818c !important;
-            text-decoration: none;
-            border-bottom: 1px solid #d2d2d2;
-        }
-
-        .footer a {
-            color: #999999 !important;
-        }
-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-
-        .btn {
-            box-sizing: border-box;
-            width: 100%;
-        }
-
-        tbody {
-            text-align: left;
-        }
-
-        .btn > tbody > tr > td {
-            padding-bottom: 15px;
-        }
-
-        .btn table {
-            width: auto;
-        }
-
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 20px;
-            text-align: center;
-        }
-
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #489e94;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #29818c;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 120px;
-            text-decoration: none;
-            font-weight: 600;
-            text-transform: uppercase;
-        }
-
-        .btn-primary a {
-            transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1)
-            0ms,
-            box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,
-            border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
-            margin: auto;
-            background-color: #29818c;
-            border-color: #29818c;
-            color: #ffffff !important;
-        }
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-
-        .align-center {
-            text-align: center;
-        }
-
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            visibility: hidden;
-            width: 0;
-        }
-
-        hr {
-            border: 0;
-            border-bottom: 1px solid #d4d4d4;
-        }
-
-        .grayFont {
-            color: #999999;
-        }
-
-        .bold {
-            font-weight: 600;
-        }
-
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-
-        @media only screen and (max-width: 620px) {
-            table[class='body'] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important;
-            }
-            table[class='body'] p,
-            table[class='body'] ul,
-            table[class='body'] ol,
-            table[class='body'] td,
-            table[class='body'] span,
-            table[class='body'] a {
-                font-size: 16px !important;
-            }
-            table[class='body'] .wrapper,
-            table[class='body'] .article {
-                padding: 10px !important;
-            }
-            table[class='body'] .content {
-                padding: 0 !important;
-            }
-            table[class='body'] .container {
-                padding: 0 !important;
-                width: 100% !important;
-            }
-            table[class='body'] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important;
-            }
-            table[class='body'] .btn table {
-                width: 100% !important;
-            }
-            table[class='body'] .btn a {
-                width: 100% !important;
-            }
-            table[class='body'] .img-responsive {
-                height: auto !important;
-                max-width: 100% !important;
-                width: auto !important;
-            }
-        }
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-
-        @media all {
-            .ExternalClass {
-                width: 100%;
-            }
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%;
-            }
-            .apple-link a {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important;
-            }
-            .btn-primary a:hover {
-                background-color: rgb(50, 110, 103) !important;
-                border-color: rgb(50, 110, 103) !important;
-            }
-        }
-    </style>
-</head>
-<body class="">
-<span class="preheader"></span>
-<table
-        d=""
-        role="presentation"
-        border="0"
-        cellpadding="0"
-        cellspacing="0"
-        class="body"
->
-    <tr>
-        <td class="container">
-            <div class="content">
-                <!-- START CENTERED WHITE CONTAINER -->
-
-                <table
-                        border="0"
-                        cellpadding="0"
-                        cellspacing="0"
-                        width="100%"
-                        style="min-width: 100%"
-                >
-                    <tbody>
-                    <tr>
-                        <td valign="top" style="padding: 0px">
-                            <table
-                                    align="center"
-                                    style="text-align: center"
-                                    width="100%"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                                    style="min-width: 100%"
-                            >
-                                <tbody>
-                                <tr>
-                                    <td
-                                            valign="top"
-                                            class="align-center"
-                                            style="
-                                                            padding-right: 0px;
-                                                            padding-left: 48px;
-                                                            padding-top: 0;
-                                                            padding-bottom: 0;
-                                                        "
-                                    >
-                                        <img
-                                                align="center"
-                                                alt="OpenWifi"
-                                                src="${LOGO}"
-                                                style="
-                                                                max-width: 100%;
-                                                                padding-bottom: 0;
-                                                                display: inline !important;
-                                                                vertical-align: bottom;
-                                                            "
-                                        />
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                <table role="presentation" class="main">
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table
-                                    role="presentation"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                            >
-                                <tr>
-                                    <td>
-                                        <h2>
-                                            Confirm Your Email Address
-                                            to Get Started
-                                        </h2>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>Dear ${RECIPIENT_EMAIL} ,</p>
-                                        <p>
-                                            Before you can access the
-                                            system, you must validate
-                                            your e-mail address. Please
-                                            click on the button below to
-                                            complete this task.
-                                        </p>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td
-                                            style="
-                                                    padding-top: 15px;
-                                                    padding-bottom: 40px;
-                                                "
-                                            class="btn btn-primary"
-                                    >
-                                        <a
-                                                href="${ACTION_LINK}"
-                                                target="_blank"
-                                        >Confirm Email Address</a
-                                        >
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <hr
-                                                style="
-                                                        margin-top: 0px;
-                                                        margin-bottom: 30px;
-                                                    "
-                                        />
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>
-                                            For questions & support
-                                            regarding this application,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${SUB_HELPER_EMAIL}"
-                                                    target="_blank"
-                                            >
-                                                ${SUB_HELPER_EMAIL}
-                                            </a>
-                                            . For question regarding the
-                                            Telecom Infra Project,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${GLOBAL_SUB_HELPER_EMAIL}"
-                                            >
-                                                ${GLOBAL_SUB_HELPER_EMAIL}
-                                            </a>
-                                            .
-                                        </p>
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td>
-                                        <p>Thank You!</p>
-                                        <p>${SUB_SIGNATURE}</p>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <table
-                                            role="presentation"
-                                            border="0"
-                                            cellpadding="0"
-                                            cellspacing="0"
-                                            class="btn btn-primary"
-                                    >
-                                        <tbody></tbody>
-                                    </table>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- END CENTERED WHITE CONTAINER -->
-
-                <div class="footer">
-                    <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            width="100%"
-                            style="min-width: 100; margin-top: 30px"
-                    >
-                        <tbody>
-                        <tr>
-                            <td valign="top" style="padding: 0px">
-                                <table
-                                        align="left"
-                                        width="100%"
-                                        border="0"
-                                        cellpadding="0"
-                                        cellspacing="0"
-                                        style="min-width: 100%"
-                                >
-                                    <tbody>
-                                    <tr></tr>
-                                    <tr>
-                                        <p class="align-center">
-                                            Copyright 2023
-                                            ${SUB_SIGNATURE},
-                                            All rights reserved.
-                                        </p>
-                                        <a
-                                                href="https://${SUB_HELPER_SITE}"
-                                                target="_blank"
-                                        >${SUB_HELPER_SITE}</a
-                                        >
-                                    </tr>
-                                    </tbody>
-                                </table>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>

templates/sub_email_verification.txt

@@ -1,9 +0,0 @@
-Dear ${RECIPIENT_EMAIL},
-
-    Before you can access the system, you must validate your e-mail address. Please click on the link below to complete this task.
-
-        ${ACTION_LINK}
-
-    And follow the instructions.
-
-Thank you!

templates/sub_password_reset.html

@@ -1,523 +0,0 @@
-<html>
-<head>
-    <title>Password Reset</title>
-    <style>
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%;
-        }
-
-        body {
-            color: #414141;
-            background-color: #f6f6f6;
-            font-family: sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%;
-        }
-
-        table {
-            border-collapse: separate;
-            width: 100%;
-            text-align: center;
-        }
-
-        table td {
-            font-family: sans-serif;
-            font-size: 14px;
-            color: #414141;
-            vertical-align: top;
-        }
-
-        .body {
-            background-color: white;
-            width: 100%;
-        }
-
-        .container {
-            display: block;
-            margin: 0 auto !important;
-            max-width: 580px;
-            padding: 10px;
-            width: 580px;
-        }
-
-        .content {
-            box-sizing: border-box;
-            display: block;
-            margin: 0 auto;
-            max-width: 580px;
-            padding: 10px;
-        }
-
-        .main {
-            background: #ffffff;
-            border-radius: 0px;
-            width: 600px;
-            max-width: 100%;
-            border: 1px solid #d4d4d4;
-            padding-left: 45px;
-            padding-right: 45px;
-        }
-
-        .wrapper {
-            box-sizing: border-box;
-            padding: 40px 20px;
-        }
-
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-
-        .footer {
-            clear: both;
-            margin-top: 10px;
-            text-align: center;
-            width: 100%;
-        }
-
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #999999;
-            font-size: 12px;
-            text-align: center;
-        }
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #414141;
-            font-family: sans-serif;
-            font-weight: 400;
-            line-height: 1.4;
-            margin: 0;
-            margin-bottom: 30px;
-        }
-
-        h2 {
-            font-weight: 600;
-        }
-
-        h1 {
-            font-size: 35px;
-            font-weight: 300;
-            text-align: center;
-            text-transform: capitalize;
-        }
-
-        p,
-        ul,
-        ol {
-            font-family: sans-serif;
-            font-size: 14px;
-            font-weight: normal;
-            margin: 0;
-            color: #414141;
-            margin-bottom: 15px;
-        }
-
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px;
-            color: #414141;
-        }
-
-        a {
-            color: #29818c !important;
-            text-decoration: none;
-            border-bottom: 1px solid #d2d2d2;
-        }
-
-        .footer a {
-            color: #999999 !important;
-        }
-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-
-        .btn {
-            box-sizing: border-box;
-            width: 100%;
-        }
-
-        tbody {
-            text-align: left;
-        }
-
-        .btn > tbody > tr > td {
-            padding-bottom: 15px;
-        }
-
-        .btn table {
-            width: auto;
-        }
-
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 20px;
-            text-align: center;
-        }
-
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #489e94;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #29818c;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 120px;
-            text-decoration: none;
-            font-weight: 600;
-            text-transform: uppercase;
-        }
-
-        .btn-primary a {
-            transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1)
-            0ms,
-            box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,
-            border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
-            margin: auto;
-            background-color: #29818c;
-            border-color: #29818c;
-            color: #ffffff !important;
-        }
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-
-        .align-center {
-            text-align: center;
-        }
-
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            visibility: hidden;
-            width: 0;
-        }
-
-        hr {
-            border: 0;
-            border-bottom: 1px solid #d4d4d4;
-        }
-
-        .grayFont {
-            color: #999999;
-        }
-
-        .bold {
-            font-weight: 600;
-        }
-
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-
-        @media only screen and (max-width: 620px) {
-            table[class='body'] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important;
-            }
-            table[class='body'] p,
-            table[class='body'] ul,
-            table[class='body'] ol,
-            table[class='body'] td,
-            table[class='body'] span,
-            table[class='body'] a {
-                font-size: 16px !important;
-            }
-            table[class='body'] .wrapper,
-            table[class='body'] .article {
-                padding: 10px !important;
-            }
-            table[class='body'] .content {
-                padding: 0 !important;
-            }
-            table[class='body'] .container {
-                padding: 0 !important;
-                width: 100% !important;
-            }
-            table[class='body'] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important;
-            }
-            table[class='body'] .btn table {
-                width: 100% !important;
-            }
-            table[class='body'] .btn a {
-                width: 100% !important;
-            }
-            table[class='body'] .img-responsive {
-                height: auto !important;
-                max-width: 100% !important;
-                width: auto !important;
-            }
-        }
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-
-        @media all {
-            .ExternalClass {
-                width: 100%;
-            }
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%;
-            }
-            .apple-link a {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important;
-            }
-            .btn-primary a:hover {
-                background-color: rgb(50, 110, 103) !important;
-                border-color: rgb(50, 110, 103) !important;
-            }
-        }
-    </style>
-</head>
-<body class="">
-<span class="preheader"></span>
-<table
-        d=""
-        role="presentation"
-        border="0"
-        cellpadding="0"
-        cellspacing="0"
-        class="body"
->
-    <tr>
-        <td class="container">
-            <div class="content">
-                <!-- START CENTERED WHITE CONTAINER -->
-
-                <table
-                        border="0"
-                        cellpadding="0"
-                        cellspacing="0"
-                        width="100%"
-                        style="min-width: 100%"
-                >
-                    <tbody>
-                    <tr>
-                        <td valign="top" style="padding: 0px">
-                            <table
-                                    align="center"
-                                    style="text-align: center"
-                                    width="100%"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                                    style="min-width: 100%"
-                            >
-                                <tbody>
-                                <tr>
-                                    <td
-                                            valign="top"
-                                            class="align-center"
-                                            style="
-                                                            padding-right: 0px;
-                                                            padding-left: 48px;
-                                                            padding-top: 0;
-                                                            padding-bottom: 0;
-                                                        "
-                                    >
-                                        <img
-                                                align="center"
-                                                alt="OpenWifi"
-                                                src="${LOGO}"
-                                                style="
-                                                                max-width: 100%;
-                                                                padding-bottom: 0;
-                                                                display: inline !important;
-                                                                vertical-align: bottom;
-                                                            "
-                                        />
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                <table role="presentation" class="main">
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table
-                                    role="presentation"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                            >
-                                <tr>
-                                    <td>
-                                        <h2>Password Reset</h2>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>Dear ${RECIPIENT_EMAIL} ,</p>
-                                        <p>
-                                            You have requested us to
-                                            reset your password. Please
-                                            click on the link below and
-                                            follow the instructions.
-                                        </p>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td
-                                            style="
-                                                    padding-top: 15px;
-                                                    padding-bottom: 40px;
-                                                "
-                                            class="btn btn-primary"
-                                    >
-                                        <a
-                                                href="${ACTION_LINK}"
-                                                target="_blank"
-                                        >Reset Password</a
-                                        >
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <hr
-                                                style="
-                                                        margin-top: 0px;
-                                                        margin-bottom: 30px;
-                                                    "
-                                        />
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>
-                                            For questions & support
-                                            regarding this application,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${SUB_HELPER_EMAIL}"
-                                                    target="_blank"
-                                            >
-                                                ${SUB_HELPER_EMAIL}
-                                            </a>
-                                            . For question regarding the
-                                            Telecom Infra Project,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${GLOBAL_SUB_HELPER_EMAIL}"
-                                            >
-                                                ${GLOBAL_SUB_HELPER_EMAIL}
-                                            </a>
-                                            .
-                                        </p>
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td>
-                                        <p>Thank You!</p>
-                                        <p>${SUB_SIGNATURE}</p>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <table
-                                            role="presentation"
-                                            border="0"
-                                            cellpadding="0"
-                                            cellspacing="0"
-                                            class="btn btn-primary"
-                                    >
-                                        <tbody></tbody>
-                                    </table>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- END CENTERED WHITE CONTAINER -->
-
-                <div class="footer">
-                    <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            width="100%"
-                            style="min-width: 100; margin-top: 30px"
-                    >
-                        <tbody>
-                        <tr>
-                            <td valign="top" style="padding: 0px">
-                                <table
-                                        align="left"
-                                        width="100%"
-                                        border="0"
-                                        cellpadding="0"
-                                        cellspacing="0"
-                                        style="min-width: 100%"
-                                >
-                                    <tbody>
-                                    <tr></tr>
-                                    <tr>
-                                        <p class="align-center">
-                                            Copyright 2023
-                                            ${SUB_SIGNATURE},
-                                            All rights reserved.
-                                        </p>
-                                        <a
-                                                href="https://${SUB_HELPER_SITE}"
-                                                target="_blank"
-                                        >${SUB_HELPER_SITE}</a
-                                        >
-                                    </tr>
-                                    </tbody>
-                                </table>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>

templates/sub_password_reset.txt

@@ -1,9 +0,0 @@
-Dear ${RECIPIENT_EMAIL},
-
-    You have requested us to reset your password. Please click on the link below
-
-        ${ACTION_LINK}
-
-    And follow the instructions.
-
-Thank you!

templates/sub_verification_code.html

@@ -1,515 +0,0 @@
-<html>
-<head>
-    <title>Verification Code</title>
-    <style>
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%;
-        }
-
-        body {
-            color: #414141;
-            background-color: #f6f6f6;
-            font-family: sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%;
-        }
-
-        table {
-            border-collapse: separate;
-            width: 100%;
-            text-align: center;
-        }
-
-        table td {
-            font-family: sans-serif;
-            font-size: 14px;
-            color: #414141;
-            vertical-align: top;
-        }
-
-        .body {
-            background-color: white;
-            width: 100%;
-        }
-
-        .container {
-            display: block;
-            margin: 0 auto !important;
-            max-width: 580px;
-            padding: 10px;
-            width: 580px;
-        }
-
-        .content {
-            box-sizing: border-box;
-            display: block;
-            margin: 0 auto;
-            max-width: 580px;
-            padding: 10px;
-        }
-
-        .main {
-            background: #ffffff;
-            border-radius: 0px;
-            width: 600px;
-            max-width: 100%;
-            border: 1px solid #d4d4d4;
-            padding-left: 45px;
-            padding-right: 45px;
-        }
-
-        .wrapper {
-            box-sizing: border-box;
-            padding: 40px 20px;
-        }
-
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-
-        .footer {
-            clear: both;
-            margin-top: 10px;
-            text-align: center;
-            width: 100%;
-        }
-
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #999999;
-            font-size: 12px;
-            text-align: center;
-        }
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #414141;
-            font-family: sans-serif;
-            font-weight: 400;
-            line-height: 1.4;
-            margin: 0;
-            margin-bottom: 30px;
-        }
-
-        h2 {
-            font-weight: 600;
-        }
-
-        h1 {
-            font-size: 35px;
-            font-weight: 300;
-            text-align: center;
-            text-transform: capitalize;
-        }
-
-        p,
-        ul,
-        ol {
-            font-family: sans-serif;
-            font-size: 14px;
-            font-weight: normal;
-            margin: 0;
-            color: #414141;
-            margin-bottom: 15px;
-        }
-
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px;
-            color: #414141;
-        }
-
-        a {
-            color: #29818c !important;
-            text-decoration: none;
-            border-bottom: 1px solid #d2d2d2;
-        }
-
-        .footer a {
-            color: #999999 !important;
-        }
-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-
-        .btn {
-            box-sizing: border-box;
-            width: 100%;
-        }
-
-        tbody {
-            text-align: left;
-        }
-
-        .btn > tbody > tr > td {
-            padding-bottom: 15px;
-        }
-
-        .btn table {
-            width: auto;
-        }
-
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 20px;
-            text-align: center;
-        }
-
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #489e94;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #29818c;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 120px;
-            text-decoration: none;
-            font-weight: 600;
-            text-transform: uppercase;
-        }
-
-        .btn-primary a {
-            transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1)
-            0ms,
-            box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,
-            border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
-            margin: auto;
-            background-color: #29818c;
-            border-color: #29818c;
-            color: #ffffff !important;
-        }
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-
-        .align-center {
-            text-align: center;
-        }
-
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            visibility: hidden;
-            width: 0;
-        }
-
-        hr {
-            border: 0;
-            border-bottom: 1px solid #d4d4d4;
-        }
-
-        .grayFont {
-            color: #999999;
-        }
-
-        .bold {
-            font-weight: 600;
-        }
-
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-
-        @media only screen and (max-width: 620px) {
-            table[class='body'] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important;
-            }
-            table[class='body'] p,
-            table[class='body'] ul,
-            table[class='body'] ol,
-            table[class='body'] td,
-            table[class='body'] span,
-            table[class='body'] a {
-                font-size: 16px !important;
-            }
-            table[class='body'] .wrapper,
-            table[class='body'] .article {
-                padding: 10px !important;
-            }
-            table[class='body'] .content {
-                padding: 0 !important;
-            }
-            table[class='body'] .container {
-                padding: 0 !important;
-                width: 100% !important;
-            }
-            table[class='body'] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important;
-            }
-            table[class='body'] .btn table {
-                width: 100% !important;
-            }
-            table[class='body'] .btn a {
-                width: 100% !important;
-            }
-            table[class='body'] .img-responsive {
-                height: auto !important;
-                max-width: 100% !important;
-                width: auto !important;
-            }
-        }
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-
-        @media all {
-            .ExternalClass {
-                width: 100%;
-            }
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%;
-            }
-            .apple-link a {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important;
-            }
-            .btn-primary a:hover {
-                background-color: rgb(50, 110, 103) !important;
-                border-color: rgb(50, 110, 103) !important;
-            }
-        }
-    </style>
-</head>
-<body class="">
-<span class="preheader"></span>
-<table
-        d=""
-        role="presentation"
-        border="0"
-        cellpadding="0"
-        cellspacing="0"
-        class="body"
->
-    <tr>
-        <td class="container">
-            <div class="content">
-                <!-- START CENTERED WHITE CONTAINER -->
-
-                <table
-                        border="0"
-                        cellpadding="0"
-                        cellspacing="0"
-                        width="100%"
-                        style="min-width: 100%"
-                >
-                    <tbody>
-                    <tr>
-                        <td valign="top" style="padding: 0px">
-                            <table
-                                    align="center"
-                                    style="text-align: center"
-                                    width="100%"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                                    style="min-width: 100%"
-                            >
-                                <tbody>
-                                <tr>
-                                    <td
-                                            valign="top"
-                                            class="align-center"
-                                            style="
-                                                            padding-right: 0px;
-                                                            padding-left: 48px;
-                                                            padding-top: 0;
-                                                            padding-bottom: 0;
-                                                        "
-                                    >
-                                        <img
-                                                align="center"
-                                                alt="OpenWifi"
-                                                src="${LOGO}"
-                                                style="
-                                                                max-width: 100%;
-                                                                padding-bottom: 0;
-                                                                display: inline !important;
-                                                                vertical-align: bottom;
-                                                            "
-                                        />
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                <table role="presentation" class="main">
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table
-                                    role="presentation"
-                                    border="0"
-                                    cellpadding="0"
-                                    cellspacing="0"
-                            >
-                                <tr>
-                                    <td>
-                                        <h2>Your Login Validation Code</h2>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>Dear ${RECIPIENT_EMAIL} ,</p>
-                                        <p>
-                                            You have requested your login validation. Please enter the following code on the login screen:
-                                        </p>
-                                        <p>
-                                        <div style="text-align: center;">
-                                            <h3 style="margin-bottom: 0px; font-weight: bold;">${CHALLENGE_CODE}</h3>
-                                        </div>
-                                        </p>
-                                        <p>
-                                            If you are not trying to login, please login and change your password. Someone may be trying to
-                                            access your account illegally.
-                                        </p>
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td>
-                                        <hr
-                                                style="
-                                                        margin-top: 0px;
-                                                        margin-bottom: 30px;
-                                                    "
-                                        />
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p>
-                                            For questions & support
-                                            regarding this application,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${SUB_HELPER_EMAIL}"
-                                                    target="_blank"
-                                            >
-                                                ${SUB_HELPER_EMAIL}
-                                            </a>
-                                            . For question regarding the
-                                            Telecom Infra Project,
-                                            please contact us at
-                                            <a
-                                                    href="mailto:${GLOBAL_SUB_HELPER_EMAIL}"
-                                            >
-                                                ${GLOBAL_SUB_HELPER_EMAIL}
-                                            </a>
-                                            .
-                                        </p>
-                                    </td>
-                                </tr>
-
-                                <tr>
-                                    <td>
-                                        <p>Thank You!</p>
-                                        <p>${SUB_SIGNATURE}</p>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <table
-                                            role="presentation"
-                                            border="0"
-                                            cellpadding="0"
-                                            cellspacing="0"
-                                            class="btn btn-primary"
-                                    >
-                                        <tbody></tbody>
-                                    </table>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- END CENTERED WHITE CONTAINER -->
-
-                <div class="footer">
-                    <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            width="100%"
-                            style="min-width: 100; margin-top: 30px"
-                    >
-                        <tbody>
-                        <tr>
-                            <td valign="top" style="padding: 0px">
-                                <table
-                                        align="left"
-                                        width="100%"
-                                        border="0"
-                                        cellpadding="0"
-                                        cellspacing="0"
-                                        style="min-width: 100%"
-                                >
-                                    <tbody>
-                                    <tr></tr>
-                                    <tr>
-                                        <p class="align-center">
-                                            Copyright 2023
-                                            ${SUB_SIGNATURE},
-                                            All rights reserved.
-                                        </p>
-                                        <a
-                                                href="https://${SUB_HELPER_SITE}"
-                                                target="_blank"
-                                        >${SUB_HELPER_SITE}</a
-                                        >
-                                    </tr>
-                                    </tbody>
-                                </table>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>

templates/sub_verification_code.txt

@@ -1,10 +0,0 @@
-Dear ${RECIPIENT_EMAIL},
-
-    You have requested your login validation. Please enter the following code on the login screen:
-
-        ${CHALLENGE_CODE}
-
-    If you are not trying to login, please login and change your password. Someone may be trying to
-    access your account illegally.
-
-Thank you!

templates/verification_code.html

@@ -423,18 +423,18 @@
                                                     regarding this application,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${USER_HELPER_EMAIL}"
+                                                        href="mailto:tip-keys@arilia.com"
-                                                            target="_blank"
+                                                        target="_blank"
                                                     >
-                                                        ${USER_HELPER_EMAIL}
+                                                        tip-keys@arilia.com
                                                     </a>
                                                     . For question regarding the
                                                     Telecom Infra Project,
                                                     please contact us at
                                                     <a
-                                                            href="mailto:${GLOBAL_USER_HELPER_EMAIL}"
+                                                        href="mailto:info@telecominfraproject.com"
                                                     >
-                                                        ${GLOBAL_USER_HELPER_EMAIL}
+                                                        info@telecominfraproject.com
                                                     </a>
                                                     .
                                                 </p>
@@ -444,7 +444,7 @@
                                         <tr>
                                             <td>
                                                 <p>Thank You!</p>
-                                                <p>${USER_SIGNATURE}</p>
+                                                <p>Arilia Wireless Inc.</p>
                                             </td>
                                         </tr>
                                         <tr>
@@ -490,13 +490,13 @@
                                                     <tr>
                                                         <p class="align-center">
                                                             Copyright 2023
-                                                            ${USER_SIGNATURE},
+                                                            Arilia Wireless Inc,
                                                             All rights reserved.
                                                         </p>
                                                         <a
-                                                                href="https://${USER_HELPER_SITE}"
+                                                            href="https://arilia.com"
-                                                                target="_blank"
+                                                            target="_blank"
-                                                        >${USER_HELPER_SITE}</a
+                                                            >www.arilia.com</a
                                                         >
                                                     </tr>
                                                 </tbody>

wwwassets/footer.html

@@ -2,10 +2,10 @@
 <div class="footer">
   <p>
     For questions & support regarding this application, please contact us at
-    <a href="mailto:${USER_HELPER_EMAIL}" target="_blank">${USER_HELPER_EMAIL}</a>.
+    <a href="mailto:tip-keys@arilia.com" target="_blank">tip-keys@arilia.com</a>.
     For question regarding the Telecom Infra Project, please contact us at
-    <a href="mailto:${GLOBAL_USER_HELPER_EMAIL}">
+    <a href="mailto:info@telecominfraproject.com">
-      ${GLOBAL_USER_HELPER_EMAIL}
+        info@telecominfraproject.com
     </a>.
   </p>
 </div>

wwwassets/password_reset.html

@@ -16,7 +16,6 @@
 <div class="info-card">
     <h2 class="info-title">Reset Password</h2>
     <form action="/api/v1/actionLink?action=password_reset" method="post" onsubmit="return validatePassword()" class="form-container">
-        <input type="hidden" id="custId" name="id" value="${UUID}">
         <div class="form-control">
             <label class="form-label" for="password1" ><b>New Password</b></label>
             <input class="form-input" id="password1" type="password" placeholder="New password" name="password1" pattern="${PASSWORD_VALIDATION}" required>

wwwassets/sub_common.css

@@ -1,171 +0,0 @@
-body {font-family: Arial, Helvetica, sans-serif;}
-
-input[type=text], input[type=password] {
-  width: 100%;
-  padding: 12px 20px;
-  margin: 8px 0;
-  display: inline-block;
-  border: 1px solid #ccc;
-  box-sizing: border-box;
-}
-
-button {
-  background-color: #04AA6D;
-  color: white;
-  padding: 14px 20px;
-  margin: 8px 0;
-  border: none;
-  cursor: pointer;
-  width: 100%;
-}
-
-button:hover {
-  opacity: 0.8;
-}
-
-.logo-grid {
-  display: grid;
-  grid-template-columns: 20% 60% 20%;
-  margin-top: calc(10vh)
-}
-
-.logo-grid > div > img {
-  width: 100%;
-  height: 100%;
-  max-height: 200px;
-  object-fit: contain;
-}
-
-
-.info-card {
-  padding: 30px;
-  box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
-  display: block;
-  width: 50%;
-  min-width: 400px;
-  border: 1em;
-  background-color: white;
-  width: 40%;
-  height: auto;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: auto;
-  margin-top: 50px;
-  position: relative;
-  border-radius: 15px;
-}
-
-.info-list {
-  margin-left: 5%;
-}
-
-.info-title {
-  margin-left: 5%;
-  color: #63B3ED;
-}
-
-.flex-box {
-  display: flex;
-  flex-direction: row;
-  justify-content: left;
-  align-items: center;
-  margin-left: 5%;
-  margin-top: 6px;
-  margin-bottom: 6px;
-  min-height: 30px
-}
-
-.flex-box > h3 {
-  margin-right: 4px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-.container {
-  padding: 16px;
-}
-
-span.password1 {
-  float: right;
-  padding-top: 16px;
-}
-
-body {
-  background-color: #ebedef;
-}
-
-/* Change styles for span and cancel button on extra small screens */
-@media screen and (max-width: 300px) {
-  span.password1 {
-    display: block;
-    float: none;
-  }
-  .cancelbtn {
-    width: 100%;
-  }
-}
-
-.form-container {
-  border: 0px;
-  margin-left: 5%;
-}
-
-.form-label {
-    float: left;
-}
-
-.form-input {
-  border-radius: 15px;
-}
-
-.form-control {
-  margin-bottom: 6px;
-}
-
-.form-submit-btn {
-    display: inline-flex;
-    appearance: none;
-    -webkit-box-align: center;
-    align-items: center;
-    -webkit-box-pack: center;
-    justify-content: center;
-    -webkit-user-select: none;
-    position: relative;
-    white-space: nowrap;
-    vertical-align: middle;
-    outline-color: transparent;
-    outline-style: solid;
-    outline-width: 2px;
-    outline-offset: 2px;
-    line-height: 1.2;
-    border-top-left-radius: 15px;
-    border-top-right-radius: 15px;
-    border-bottom-right-radius: 15px;
-    border-bottom-left-radius: 15px;
-    height: 45px;
-    background-color:#4299E1;
-    font-size: 15px;
-    padding-inline-start: 16px;
-    padding-inline-end: 16px;
-    width: 100%;
-    margin-bottom: 20px;
-    color: white;
-    margin-top: 20px;
-}
-
-.footer{
-  display: flex;
-  flex-direction: row;
-  justify-content: left;
-  align-items: center;
-  margin-left: 5%;
-}
-
-hr.rounded {
-  margin-top: 40px;
-  margin-bottom: 0px;
-  margin-left: 5%;
-  margin-right: 5%;
-  border-top: 1px solid #bbb;
-  border-radius: 5px;
-}

wwwassets/sub_footer.html

@@ -2,10 +2,10 @@
 <div class="footer">
   <p>
     For questions & support regarding this application, please contact us at
-    <a href="mailto:${SUB_HELPER_EMAIL}" target="_blank">${SUB_HELPER_EMAIL}</a>.
+    <a href="mailto:tip-keys@arilia.com" target="_blank">tip-keys@arilia.com</a>.
     For question regarding the Telecom Infra Project, please contact us at
-    <a href="mailto:${GLOBAL_SUB_HELPER_EMAIL}">
+    <a href="mailto:info@telecominfraproject.com">
-      ${GLOBAL_SUB_HELPER_EMAIL}
+        info@telecominfraproject.com
     </a>.
   </p>
 </div>

wwwassets/sub_password_reset.html

@@ -16,7 +16,6 @@
 <div class="info-card">
     <h2 class="info-title">Reset Password</h2>
     <form action="/api/v1/actionLink?action=password_reset" method="post" onsubmit="return validatePassword()" class="form-container">
-        <input type="hidden" id="custId" name="id" value="${UUID}">
         <div class="form-control">
             <label class="form-label" for="password1" ><b>New Password</b></label>
             <input class="form-input" id="password1" type="password" placeholder="New password" name="password1" pattern="${PASSWORD_VALIDATION}" required>