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

Signed-off-by: stephb9959 <[email protected]>

build

@@ -1 +1 @@
-17
+18

openapi/owgw.yaml

@@ -1408,6 +1408,9 @@ components:
           type: string
         chargeableUserIdentity:
           type: string
+        userName:
+          type: string
+
 
 paths:
   /devices:
@@ -3253,6 +3256,7 @@ paths:
             type: string
             enum:
               - coadm
+              - disconnectUser
       requestBody:
         description: operationParameters
         content:

src/RADIUSSessionTracker.cpp

@@ -407,6 +407,21 @@ namespace OpenWifi {
 		return true;
 	}
 
+	bool RADIUSSessionTracker::DisconnectUser(const std::string &UserName) {
+		poco_information(Logger(),fmt::format("Disconnect user {}.", UserName));
+		std::lock_guard		Guard(Mutex_);
+
+		for(const auto &AP:AccountingSessions_) {
+			for(const auto &Session:AP.second) {
+				if(Session.second->userName==UserName) {
+					SendCoADM(Session.second);
+				}
+			}
+		}
+
+		return true;
+	}
+
 	void RADIUSSessionTracker::DisconnectSession(const std::string &SerialNumber) {
 		poco_information(Logger(),fmt::format("{}: Disconnecting.", SerialNumber));
 

src/RADIUSSessionTracker.h

@@ -165,6 +165,7 @@ namespace OpenWifi {
 
 		bool SendCoADM(const std::string &serialNumber, const std::string &sessionId);
 		bool SendCoADM(const RADIUSSessionPtr &session);
+		bool DisconnectUser(const std::string &UserName);
 
 		inline std::uint32_t HasSessions(const std::string & serialNumber) {
 			std::lock_guard	G(Mutex_);

src/RESTAPI/RESTAPI_radiussessions_handler.cpp

@@ -124,6 +124,13 @@ namespace OpenWifi {
 			return BadRequest(RESTAPI::Errors::CouldNotPerformCommand);
 		}
 
+		if(Command=="disconnectUser" && !Parameters.userName.empty()) {
+			if(RADIUSSessionTracker()->DisconnectUser(Parameters.userName)) {
+				return OK();
+			}
+			return BadRequest(RESTAPI::Errors::CouldNotPerformCommand);
+		}
+
 		return BadRequest(RESTAPI::Errors::InvalidCommand);
 	}
 

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -671,6 +671,7 @@ namespace OpenWifi::GWObjects {
 			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) {
 		}

src/RESTObjects/RESTAPI_GWobjects.h

@@ -441,7 +441,8 @@ namespace OpenWifi::GWObjects {
 		std::string 			accountingSessionId,
 								accountingMultiSessionId,
 								callingStationId,
-								chargeableUserIdentity;
+								chargeableUserIdentity,
+								userName;
 
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};