scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-02 03:27:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fixing fake macAddresses

Browse Source
This commit is contained in:
stephb9959
2022-03-02 21:11:33 -08:00
parent 68a4f44cc7
commit 261fa5759c
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/RESTAPI/RESTAPI_signup_handler.cpp
View File

@@ -11,10 +11,10 @@ namespace OpenWifi {
void RESTAPI_signup_handler::DoPost() { void RESTAPI_signup_handler::DoPost() {
auto UserName = GetParameter("email",""); auto UserName = GetParameter("email","");
Poco::toLowerInPlace(UserName); Poco::toLowerInPlace(UserName);
auto SerialNumber = GetParameter("serialNumber",""); auto macAddress = GetParameter("macAddress","");
Poco::toLowerInPlace(SerialNumber); Poco::toLowerInPlace(macAddress);
if(UserName.empty() || SerialNumber.empty()) { if(UserName.empty() || macAddress.empty()) {
return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters); return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
} }
@@ -22,13 +22,13 @@ namespace OpenWifi {
return BadRequest(RESTAPI::Errors::InvalidEmailAddress); return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
} }
if(!Utils::ValidSerialNumber(SerialNumber)) { if(!Utils::ValidSerialNumber(macAddress)) {
return BadRequest(RESTAPI::Errors::InvalidSerialNumber); return BadRequest(RESTAPI::Errors::InvalidSerialNumber);
} }
// if a signup already exists for this user, we should just return its value completion // if a signup already exists for this user, we should just return its value completion
SignupDB::RecordVec SEs; SignupDB::RecordVec SEs;
if(StorageService()->SignupDB().GetRecords(0,100, SEs, " email='" + UserName + "' and serialNumber='"+SerialNumber+"' ")) { if(StorageService()->SignupDB().GetRecords(0,100, SEs, " email='" + UserName + "' and serialNumber='"+macAddress+"' ")) {
for(const auto &i:SEs) { for(const auto &i:SEs) {
if (i.statusCode == ProvObjects::SignupStatusCodes::SignupWaitingForEmail || if (i.statusCode == ProvObjects::SignupStatusCodes::SignupWaitingForEmail ||
i.statusCode == ProvObjects::SignupStatusCodes::SignupWaitingForDevice || i.statusCode == ProvObjects::SignupStatusCodes::SignupWaitingForDevice ||
@@ -44,13 +44,23 @@ namespace OpenWifi {
// So we do not have an outstanding signup... // So we do not have an outstanding signup...
// Can we actually claim this serial number??? if not, we need to return an error // Can we actually claim this serial number??? if not, we need to return an error
ProvObjects::InventoryTag IT; ProvObjects::InventoryTag IT;
if(StorageService()->InventoryDB().GetRecord("serialNumber",SerialNumber,IT)) { std::string SerialNumber;
if(!IT.subscriber.empty()) { bool FoundIT=false;
return BadRequest(RESTAPI::Errors::SerialNumberAlreadyProvisioned); for(int Index=0;Index<4;Index++) {
} auto TrySerialNumber = Utils::SerialNumberToInt(macAddress);
for (uint i = 0; i < 4; ++i) {
SerialNumber = Utils::IntToSerialNumber(TrySerialNumber + i);
if (StorageService()->InventoryDB().GetRecord("serialNumber", SerialNumber, IT)) {
if (!IT.subscriber.empty()) {
return BadRequest(RESTAPI::Errors::SerialNumberAlreadyProvisioned);
}
if(!(IT.devClass.empty() || IT.devClass=="subscriber" || IT.devClass=="any")) { if (!(IT.devClass.empty() || IT.devClass == "subscriber" || IT.devClass == "any")) {
return BadRequest(RESTAPI::Errors::SerialNumberNotTheProperClass); return BadRequest(RESTAPI::Errors::SerialNumberNotTheProperClass);
}
FoundIT = true;
break;
}
} }
} }
@@ -80,7 +90,7 @@ namespace OpenWifi {
SE.info.id = SignupUUID; SE.info.id = SignupUUID;
SE.info.created = SE.info.modified = SE.submitted = OpenWifi::Now(); SE.info.created = SE.info.modified = SE.submitted = OpenWifi::Now();
SE.completed = 0 ; SE.completed = 0 ;
SE.serialNumber = SerialNumber; SE.macAddress = macAddress;
SE.error = 0 ; SE.error = 0 ;
SE.userId = UI.id; SE.userId = UI.id;
SE.email = UserName; SE.email = UserName;
@@ -89,25 +99,7 @@ namespace OpenWifi {
StorageService()->SignupDB().CreateRecord(SE); StorageService()->SignupDB().CreateRecord(SE);
Signup()->AddOutstandingSignup(SE); Signup()->AddOutstandingSignup(SE);
if(IT.serialNumber.empty()) { if(FoundIT) {
IT.serialNumber = SerialNumber;
IT.info.id = MicroService::instance().CreateUUID();
IT.info.created = IT.info.modified = OpenWifi::Now();
IT.info.name = SerialNumber;
Poco::JSON::Object StateDoc;
StateDoc.set("method", "signup");
StateDoc.set("claimer", UserName);
StateDoc.set("claimerId", UI.id);
StateDoc.set("signupUUID", SignupUUID);
StateDoc.set("errorCode",0);
StateDoc.set("date", OpenWifi::Now());
StateDoc.set("status", "waiting for email-verification");
std::ostringstream os2;
StateDoc.stringify(os2);
IT.state = os2.str();
std::cout << "Creating inventory entry: " << SE.serialNumber << std::endl;
StorageService()->InventoryDB().CreateRecord(IT);
} else {
Poco::JSON::Object StateDoc; Poco::JSON::Object StateDoc;
StateDoc.set("method", "signup"); StateDoc.set("method", "signup");
StateDoc.set("claimer", UserName); StateDoc.set("claimer", UserName);
@@ -118,9 +110,10 @@ namespace OpenWifi {
StateDoc.set("status", "waiting for email-verification"); StateDoc.set("status", "waiting for email-verification");
std::ostringstream os2; std::ostringstream os2;
StateDoc.stringify(os2); StateDoc.stringify(os2);
IT.realMacAddress = macAddress;
IT.state = os2.str(); IT.state = os2.str();
IT.info.modified = OpenWifi::Now(); IT.info.modified = OpenWifi::Now();
std::cout << "Updating inventory entry: " << SE.serialNumber << std::endl; std::cout << "Updating inventory entry: " << SE.macAddress << std::endl;
StorageService()->InventoryDB().UpdateRecord("id",IT.info.id,IT); StorageService()->InventoryDB().UpdateRecord("id",IT.info.id,IT);
} }
@@ -163,7 +156,7 @@ namespace OpenWifi {
void RESTAPI_signup_handler::DoGet() { void RESTAPI_signup_handler::DoGet() {
auto EMail = GetParameter("email", ""); auto EMail = GetParameter("email", "");
auto SignupUUID = GetParameter("signupUUID", ""); auto SignupUUID = GetParameter("signupUUID", "");
auto SerialNumber = GetParameter("serialNumber", ""); auto macAddress = GetParameter("macAddress", "");
auto List = GetBoolParameter("listOnly",false); auto List = GetBoolParameter("listOnly",false);
Poco::JSON::Object Answer; Poco::JSON::Object Answer;
@@ -180,9 +173,9 @@ namespace OpenWifi {
return ReturnObject("signups",SEs); return ReturnObject("signups",SEs);
} }
return NotFound(); return NotFound();
} else if(!SerialNumber.empty()) { } else if(!macAddress.empty()) {
SignupDB::RecordVec SEs; SignupDB::RecordVec SEs;
if(StorageService()->SignupDB().GetRecords(0,100,SEs, " serialNumber='"+SerialNumber+"' ")) { if(StorageService()->SignupDB().GetRecords(0,100,SEs, " serialNumber='"+macAddress+"' ")) {
return ReturnObject("signups",SEs); return ReturnObject("signups",SEs);
} }
return NotFound(); return NotFound();
@@ -197,7 +190,7 @@ namespace OpenWifi {
void RESTAPI_signup_handler::DoDelete() { void RESTAPI_signup_handler::DoDelete() {
auto EMail = GetParameter("email", ""); auto EMail = GetParameter("email", "");
auto SignupUUID = GetParameter("signupUUID", ""); auto SignupUUID = GetParameter("signupUUID", "");
auto SerialNumber = GetParameter("serialNumber", ""); auto macAddress = GetParameter("macAddress", "");
if(!SignupUUID.empty()) { if(!SignupUUID.empty()) {
if(StorageService()->SignupDB().DeleteRecord("id", SignupUUID)) { if(StorageService()->SignupDB().DeleteRecord("id", SignupUUID)) {
@@ -209,8 +202,8 @@ namespace OpenWifi {
return OK(); return OK();
} }
return NotFound(); return NotFound();
} else if(!SerialNumber.empty()) { } else if(!macAddress.empty()) {
if(StorageService()->SignupDB().DeleteRecord("serialNumber", SerialNumber)) { if(StorageService()->SignupDB().DeleteRecord("serialNumber", macAddress)) {
return OK(); return OK();
} }
return NotFound(); return NotFound();