mirror of
https://github.com/Telecominfraproject/wlan-cloud-owprov.git
synced 2025-10-29 17:52:28 +00:00
Adding Signup
This commit is contained in:
stephb9959
@@ -135,11 +135,6 @@ namespace OpenWifi{
|
||||
InternalError(RESTAPI::Errors::CouldNotBeDeleted);
|
||||
}
|
||||
|
||||
static bool ValidDevClass(const std::string &D) {
|
||||
const static std::vector<std::string> Classes{ "any", "entity", "subscriber" , "venue" };
|
||||
return std::find(cbegin(Classes), cend(Classes), D)!=cend(Classes);
|
||||
}
|
||||
|
||||
void RESTAPI_inventory_handler::DoPost() {
|
||||
std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
|
||||
if(SerialNumber.empty()) {
|
||||
@@ -160,7 +155,7 @@ namespace OpenWifi{
|
||||
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
|
||||
}
|
||||
|
||||
if(!ValidDevClass(NewObject.devClass)) {
|
||||
if(!Provisioning::DeviceClass::Validate(NewObject.devClass.c_str())) {
|
||||
return BadRequest(RESTAPI::Errors::InvalidDeviceClass);
|
||||
}
|
||||
|
||||
@@ -394,7 +389,7 @@ namespace OpenWifi{
|
||||
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
|
||||
}
|
||||
|
||||
if(!ValidDevClass(NewObject.devClass)) {
|
||||
if(!Provisioning::DeviceClass::Validate(NewObject.devClass.c_str())) {
|
||||
return BadRequest(RESTAPI::Errors::InvalidDeviceClass);
|
||||
}
|
||||
|
||||
|
||||
@@ -205,90 +205,104 @@ namespace OpenWifi::RESTAPI::Protocol {
|
||||
|
||||
namespace OpenWifi::uCentralProtocol {
|
||||
|
||||
const int SERIAL_NUMBER_LENGTH = 30;
|
||||
const int SERIAL_NUMBER_LENGTH = 30;
|
||||
|
||||
// vocabulary used in the PROTOCOL.md file
|
||||
static const char * JSONRPC = "jsonrpc";
|
||||
static const char * ID = "id";
|
||||
static const char * UUID = "uuid";
|
||||
static const char * JSONRPC_VERSION = "2.0";
|
||||
static const char * METHOD = "method";
|
||||
static const char * PARAMS = "params";
|
||||
static const char * SERIAL = "serial";
|
||||
static const char * FIRMWARE = "firmware";
|
||||
static const char * CONNECT = "connect";
|
||||
static const char * STATE = "state";
|
||||
static const char * STATUS = "status";
|
||||
static const char * ERROR = "error";
|
||||
static const char * TEXT = "text";
|
||||
static const char * HEALTHCHECK = "healthcheck";
|
||||
static const char * LOG = "log";
|
||||
static const char * CRASHLOG = "crashlog";
|
||||
static const char * PING = "ping";
|
||||
static const char * CFGPENDING = "cfgpending";
|
||||
static const char * RECOVERY = "recovery";
|
||||
static const char * COMPRESS_64 = "compress_64";
|
||||
static const char * CAPABILITIES = "capabilities";
|
||||
static const char * REQUEST_UUID = "request_uuid";
|
||||
static const char * SANITY = "sanity";
|
||||
static const char * DATA = "data";
|
||||
static const char * LOGLINES = "loglines";
|
||||
static const char * SEVERITY = "severity";
|
||||
static const char * ACTIVE = "active";
|
||||
static const char * OVERRIDEDFS = "override_dfs";
|
||||
static const char * REBOOT = "reboot";
|
||||
static const char * WHEN = "when";
|
||||
static const char * CONFIG = "config";
|
||||
static const char * EMPTY_JSON_DOC = "{}";
|
||||
static const char * RESULT = "result";
|
||||
static const char * REQUEST = "request";
|
||||
static const char * PERFORM = "perform";
|
||||
static const char * CONFIGURE = "configure";
|
||||
static const char * PENDING = "pending";
|
||||
static const char * SUBMITTED_BY_SYSTEM = "*system";
|
||||
static const char * URI = "uri";
|
||||
static const char * COMMAND = "command";
|
||||
static const char * PAYLOAD = "payload";
|
||||
static const char * KEEP_REDIRECTOR = "keep_redirector";
|
||||
static const char * DURATION = "duration";
|
||||
static const char * PATTERN = "pattern";
|
||||
static const char * LEDS = "leds";
|
||||
static const char * ON = "on";
|
||||
static const char * OFF = "off";
|
||||
static const char * BLINK = "blink";
|
||||
static const char * PACKETS = "packets";
|
||||
static const char * NETWORK = "network";
|
||||
static const char * INTERFACE = "interface";
|
||||
static const char * TRACE = "trace";
|
||||
static const char * WIFISCAN = "wifiscan";
|
||||
static const char * TYPES = "types";
|
||||
static const char * EVENT = "event";
|
||||
static const char * MESSAGE = "message";
|
||||
static const char * RTTY = "rtty";
|
||||
static const char * TOKEN = "token";
|
||||
static const char * SERVER = "server";
|
||||
static const char * PORT = "port";
|
||||
static const char * USER = "user";
|
||||
static const char * TIMEOUT = "timeout";
|
||||
static const char * UPGRADE = "upgrade";
|
||||
static const char * FACTORY = "factory";
|
||||
static const char * VERBOSE = "verbose";
|
||||
static const char * BANDS = "bands";
|
||||
static const char * CHANNELS = "channels";
|
||||
static const char * PASSWORD = "password";
|
||||
static const char * DEVICEUPDATE = "deviceupdate";
|
||||
// vocabulary used in the PROTOCOL.md file
|
||||
static const char *JSONRPC = "jsonrpc";
|
||||
static const char *ID = "id";
|
||||
static const char *UUID = "uuid";
|
||||
static const char *JSONRPC_VERSION = "2.0";
|
||||
static const char *METHOD = "method";
|
||||
static const char *PARAMS = "params";
|
||||
static const char *SERIAL = "serial";
|
||||
static const char *FIRMWARE = "firmware";
|
||||
static const char *CONNECT = "connect";
|
||||
static const char *STATE = "state";
|
||||
static const char *STATUS = "status";
|
||||
static const char *ERROR = "error";
|
||||
static const char *TEXT = "text";
|
||||
static const char *HEALTHCHECK = "healthcheck";
|
||||
static const char *LOG = "log";
|
||||
static const char *CRASHLOG = "crashlog";
|
||||
static const char *PING = "ping";
|
||||
static const char *CFGPENDING = "cfgpending";
|
||||
static const char *RECOVERY = "recovery";
|
||||
static const char *COMPRESS_64 = "compress_64";
|
||||
static const char *CAPABILITIES = "capabilities";
|
||||
static const char *REQUEST_UUID = "request_uuid";
|
||||
static const char *SANITY = "sanity";
|
||||
static const char *DATA = "data";
|
||||
static const char *LOGLINES = "loglines";
|
||||
static const char *SEVERITY = "severity";
|
||||
static const char *ACTIVE = "active";
|
||||
static const char *OVERRIDEDFS = "override_dfs";
|
||||
static const char *REBOOT = "reboot";
|
||||
static const char *WHEN = "when";
|
||||
static const char *CONFIG = "config";
|
||||
static const char *EMPTY_JSON_DOC = "{}";
|
||||
static const char *RESULT = "result";
|
||||
static const char *REQUEST = "request";
|
||||
static const char *PERFORM = "perform";
|
||||
static const char *CONFIGURE = "configure";
|
||||
static const char *PENDING = "pending";
|
||||
static const char *SUBMITTED_BY_SYSTEM = "*system";
|
||||
static const char *URI = "uri";
|
||||
static const char *COMMAND = "command";
|
||||
static const char *PAYLOAD = "payload";
|
||||
static const char *KEEP_REDIRECTOR = "keep_redirector";
|
||||
static const char *DURATION = "duration";
|
||||
static const char *PATTERN = "pattern";
|
||||
static const char *LEDS = "leds";
|
||||
static const char *ON = "on";
|
||||
static const char *OFF = "off";
|
||||
static const char *BLINK = "blink";
|
||||
static const char *PACKETS = "packets";
|
||||
static const char *NETWORK = "network";
|
||||
static const char *INTERFACE = "interface";
|
||||
static const char *TRACE = "trace";
|
||||
static const char *WIFISCAN = "wifiscan";
|
||||
static const char *TYPES = "types";
|
||||
static const char *EVENT = "event";
|
||||
static const char *MESSAGE = "message";
|
||||
static const char *RTTY = "rtty";
|
||||
static const char *TOKEN = "token";
|
||||
static const char *SERVER = "server";
|
||||
static const char *PORT = "port";
|
||||
static const char *USER = "user";
|
||||
static const char *TIMEOUT = "timeout";
|
||||
static const char *UPGRADE = "upgrade";
|
||||
static const char *FACTORY = "factory";
|
||||
static const char *VERBOSE = "verbose";
|
||||
static const char *BANDS = "bands";
|
||||
static const char *CHANNELS = "channels";
|
||||
static const char *PASSWORD = "password";
|
||||
static const char *DEVICEUPDATE = "deviceupdate";
|
||||
|
||||
static const char * SERIALNUMBER = "serialNumber";
|
||||
static const char * COMPATIBLE = "compatible";
|
||||
static const char * DISCONNECTION = "disconnection";
|
||||
static const char * TIMESTAMP = "timestamp";
|
||||
static const char * SYSTEM = "system";
|
||||
static const char * HOST = "host";
|
||||
static const char * CONNECTIONIP = "connectionIp";
|
||||
static const char * TELEMETRY = "telemetry";
|
||||
static const char * BANDWIDTH = "bandwidth";
|
||||
static const char *SERIALNUMBER = "serialNumber";
|
||||
static const char *COMPATIBLE = "compatible";
|
||||
static const char *DISCONNECTION = "disconnection";
|
||||
static const char *TIMESTAMP = "timestamp";
|
||||
static const char *SYSTEM = "system";
|
||||
static const char *HOST = "host";
|
||||
static const char *CONNECTIONIP = "connectionIp";
|
||||
static const char *TELEMETRY = "telemetry";
|
||||
static const char *BANDWIDTH = "bandwidth";
|
||||
}
|
||||
|
||||
enum EVENT_MSG {
|
||||
namespace OpenWifi::uCentralProtocol::Events {
|
||||
|
||||
static const char *CONNECT = "connect";
|
||||
static const char *STATE = "state";
|
||||
static const char *HEALTHCHECK = "healthcheck";
|
||||
static const char *LOG = "log";
|
||||
static const char *CRASHLOG = "crashlog";
|
||||
static const char *PING = "ping";
|
||||
static const char *CFGPENDING = "cfgpending";
|
||||
static const char *RECOVERY = "recovery";
|
||||
static const char *TELEMETRY = "telemetry";
|
||||
static const char *DEVICEUPDATE = "deviceupdate";
|
||||
|
||||
enum EVENT_MSG {
|
||||
ET_UNKNOWN,
|
||||
ET_CONNECT,
|
||||
ET_STATE,
|
||||
@@ -303,29 +317,39 @@ namespace OpenWifi::uCentralProtocol {
|
||||
};
|
||||
|
||||
inline static EVENT_MSG EventFromString(const std::string & Method) {
|
||||
if (!Poco::icompare(Method, CONNECT)) {
|
||||
return ET_CONNECT;
|
||||
} else if (!Poco::icompare(Method, STATE)) {
|
||||
return ET_STATE;
|
||||
} else if (!Poco::icompare(Method, HEALTHCHECK)) {
|
||||
return ET_HEALTHCHECK;
|
||||
} else if (!Poco::icompare(Method, LOG)) {
|
||||
return ET_LOG;
|
||||
} else if (!Poco::icompare(Method, CRASHLOG)) {
|
||||
return ET_CRASHLOG;
|
||||
} else if (!Poco::icompare(Method, PING)) {
|
||||
return ET_PING;
|
||||
} else if (!Poco::icompare(Method, CFGPENDING)) {
|
||||
return ET_CFGPENDING;
|
||||
} else if (!Poco::icompare(Method, RECOVERY)) {
|
||||
return ET_RECOVERY;
|
||||
} else if (!Poco::icompare(Method, DEVICEUPDATE)) {
|
||||
return ET_DEVICEUPDATE;
|
||||
} else if (!Poco::icompare(Method, TELEMETRY)) {
|
||||
return ET_TELEMETRY;
|
||||
} else
|
||||
return ET_UNKNOWN;
|
||||
static std::vector<std::pair<const char *,EVENT_MSG>> Values{
|
||||
{ CFGPENDING , ET_CFGPENDING },
|
||||
{ CONNECT, ET_CONNECT },
|
||||
{ CRASHLOG, ET_CRASHLOG },
|
||||
{ DEVICEUPDATE, ET_DEVICEUPDATE },
|
||||
{ HEALTHCHECK, ET_HEALTHCHECK },
|
||||
{ LOG, ET_LOG },
|
||||
{ PING, ET_PING },
|
||||
{ RECOVERY, ET_RECOVERY },
|
||||
{ STATE, ET_STATE },
|
||||
{ TELEMETRY, ET_TELEMETRY }
|
||||
};
|
||||
|
||||
std::string L = Poco::toLower(Method);
|
||||
auto hint = std::find_if(cbegin(Values),cend(Values),[&](const std::pair<const char *,EVENT_MSG> &v) ->bool { return strcmp(v.first,L.c_str())==0; });
|
||||
if(hint == cend(Values))
|
||||
return ET_UNKNOWN;
|
||||
return hint->second;
|
||||
};
|
||||
}
|
||||
|
||||
namespace OpenWifi::Provisioning::DeviceClass {
|
||||
|
||||
static const char * ANY = "any";
|
||||
static const char * SUBSCRIBER = "subscriber";
|
||||
static const char * VENUE = "venue";
|
||||
static const char * ENTITY = "entity";
|
||||
|
||||
inline bool Validate(const char *s) {
|
||||
static std::vector<const char *> Values{ ANY, ENTITY, SUBSCRIBER, VENUE };
|
||||
return std::find(cbegin(Values), cend(Values), s) != cend(Values);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user