|
|
|
|
@@ -13,9 +13,10 @@
|
|
|
|
|
|
|
|
|
|
namespace OpenWifi {
|
|
|
|
|
|
|
|
|
|
static const std::string GitUCentralJSONSchemaFile{"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"};
|
|
|
|
|
static const std::string GitUCentralJSONSchemaFile{
|
|
|
|
|
"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"};
|
|
|
|
|
|
|
|
|
|
static json DefaultUCentralSchema = R"(
|
|
|
|
|
static json DefaultUCentralSchema = R"(
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
"$id": "https://openwrt.org/ucentral.schema.json",
|
|
|
|
|
@@ -518,7 +519,7 @@ namespace OpenWifi {
|
|
|
|
|
"maximum": 4050
|
|
|
|
|
},
|
|
|
|
|
"proto": {
|
|
|
|
|
"decription": "The L2 vlan tag that shall be added (1q,1ad) ",
|
|
|
|
|
"decription": "The L2 vlan tag that shall be added (1q,1ad ) ",
|
|
|
|
|
"type": "string",
|
|
|
|
|
"enum": [
|
|
|
|
|
"802.1ad",
|
|
|
|
|
@@ -669,6 +670,47 @@ namespace OpenWifi {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"interface.ipv4.port-forward": {
|
|
|
|
|
"type": "object",
|
|
|
|
|
"properties": {
|
|
|
|
|
"protocol": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"enum": [
|
|
|
|
|
"tcp",
|
|
|
|
|
"udp",
|
|
|
|
|
"any"
|
|
|
|
|
],
|
|
|
|
|
"default": "any"
|
|
|
|
|
},
|
|
|
|
|
"external-port": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
},
|
|
|
|
|
"internal-address": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "ipv4",
|
|
|
|
|
"example": "0.0.0.120"
|
|
|
|
|
},
|
|
|
|
|
"internal-port": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"required": [
|
|
|
|
|
"external-port",
|
|
|
|
|
"internal-address"
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"interface.ipv4": {
|
|
|
|
|
"type": "object",
|
|
|
|
|
"properties": {
|
|
|
|
|
@@ -722,6 +764,12 @@ namespace OpenWifi {
|
|
|
|
|
"items": {
|
|
|
|
|
"$ref": "#/$defs/interface.ipv4.dhcp-lease"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"port-forward": {
|
|
|
|
|
"type": "array",
|
|
|
|
|
"items": {
|
|
|
|
|
"$ref": "#/$defs/interface.ipv4.port-forward"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@@ -751,6 +799,96 @@ namespace OpenWifi {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"interface.ipv6.port-forward": {
|
|
|
|
|
"type": "object",
|
|
|
|
|
"properties": {
|
|
|
|
|
"protocol": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"enum": [
|
|
|
|
|
"tcp",
|
|
|
|
|
"udp",
|
|
|
|
|
"any"
|
|
|
|
|
],
|
|
|
|
|
"default": "any"
|
|
|
|
|
},
|
|
|
|
|
"external-port": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
},
|
|
|
|
|
"internal-address": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "ipv6",
|
|
|
|
|
"example": "::1234:abcd"
|
|
|
|
|
},
|
|
|
|
|
"internal-port": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"required": [
|
|
|
|
|
"external-port",
|
|
|
|
|
"internal-address"
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"interface.ipv6.traffic-allow": {
|
|
|
|
|
"type": "object",
|
|
|
|
|
"properties": {
|
|
|
|
|
"protocol": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"default": "any"
|
|
|
|
|
},
|
|
|
|
|
"source-address": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "uc-cidr6",
|
|
|
|
|
"example": "2001:db8:1234:abcd::/64",
|
|
|
|
|
"default": "::/0"
|
|
|
|
|
},
|
|
|
|
|
"source-ports": {
|
|
|
|
|
"type": "array",
|
|
|
|
|
"minItems": 1,
|
|
|
|
|
"items": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"destination-address": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "ipv6",
|
|
|
|
|
"example": "::1000"
|
|
|
|
|
},
|
|
|
|
|
"destination-ports": {
|
|
|
|
|
"type": "array",
|
|
|
|
|
"minItems": 1,
|
|
|
|
|
"items": {
|
|
|
|
|
"type": [
|
|
|
|
|
"integer",
|
|
|
|
|
"string"
|
|
|
|
|
],
|
|
|
|
|
"minimum": 0,
|
|
|
|
|
"maximum": 65535,
|
|
|
|
|
"format": "uc-portrange"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"required": [
|
|
|
|
|
"destination-address"
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"interface.ipv6": {
|
|
|
|
|
"type": "object",
|
|
|
|
|
"properties": {
|
|
|
|
|
@@ -782,6 +920,18 @@ namespace OpenWifi {
|
|
|
|
|
},
|
|
|
|
|
"dhcpv6": {
|
|
|
|
|
"$ref": "#/$defs/interface.ipv6.dhcpv6"
|
|
|
|
|
},
|
|
|
|
|
"port-forward": {
|
|
|
|
|
"type": "array",
|
|
|
|
|
"items": {
|
|
|
|
|
"$ref": "#/$defs/interface.ipv6.port-forward"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"traffic-allow": {
|
|
|
|
|
"type": "array",
|
|
|
|
|
"items": {
|
|
|
|
|
"$ref": "#/$defs/interface.ipv6.traffic-allow"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@@ -866,7 +1016,7 @@ namespace OpenWifi {
|
|
|
|
|
},
|
|
|
|
|
"gateway-fqdn": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "fqdn",
|
|
|
|
|
"format": "uc-fqdn",
|
|
|
|
|
"default": "ucentral.splash"
|
|
|
|
|
},
|
|
|
|
|
"max-clients": {
|
|
|
|
|
@@ -901,6 +1051,7 @@ namespace OpenWifi {
|
|
|
|
|
"psk",
|
|
|
|
|
"psk2",
|
|
|
|
|
"psk-mixed",
|
|
|
|
|
"psk2-radius",
|
|
|
|
|
"wpa",
|
|
|
|
|
"wpa2",
|
|
|
|
|
"wpa-mixed",
|
|
|
|
|
@@ -961,6 +1112,10 @@ namespace OpenWifi {
|
|
|
|
|
"type": "boolean",
|
|
|
|
|
"default": false
|
|
|
|
|
},
|
|
|
|
|
"reduced-neighbor-reporting": {
|
|
|
|
|
"type": "boolean",
|
|
|
|
|
"default": false
|
|
|
|
|
},
|
|
|
|
|
"lci": {
|
|
|
|
|
"type": "string"
|
|
|
|
|
},
|
|
|
|
|
@@ -1527,6 +1682,11 @@ namespace OpenWifi {
|
|
|
|
|
"decription": "This option allows embedding custom vendor specific IEs inside the beacons of a BSS in AP mode.",
|
|
|
|
|
"type": "string"
|
|
|
|
|
},
|
|
|
|
|
"fils-discovery-interval": {
|
|
|
|
|
"type": "integer",
|
|
|
|
|
"default": 20,
|
|
|
|
|
"maximum": 10000
|
|
|
|
|
},
|
|
|
|
|
"encryption": {
|
|
|
|
|
"$ref": "#/$defs/interface.ssid.encryption"
|
|
|
|
|
},
|
|
|
|
|
@@ -2087,6 +2247,10 @@ namespace OpenWifi {
|
|
|
|
|
"auto-channel": {
|
|
|
|
|
"type": "boolean",
|
|
|
|
|
"default": false
|
|
|
|
|
},
|
|
|
|
|
"ipv6": {
|
|
|
|
|
"type": "boolean",
|
|
|
|
|
"default": false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@@ -2193,7 +2357,7 @@ namespace OpenWifi {
|
|
|
|
|
"properties": {
|
|
|
|
|
"fqdn": {
|
|
|
|
|
"type": "string",
|
|
|
|
|
"format": "fqdn"
|
|
|
|
|
"format": "uc-fqdn"
|
|
|
|
|
},
|
|
|
|
|
"suffix-matching": {
|
|
|
|
|
"type": "boolean",
|
|
|
|
|
@@ -2444,25 +2608,32 @@ namespace OpenWifi {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
)"_json;
|
|
|
|
|
|
|
|
|
|
)"_json;
|
|
|
|
|
|
|
|
|
|
class custom_error_handler : public nlohmann::json_schema::basic_error_handler
|
|
|
|
|
{
|
|
|
|
|
class custom_error_handler : public nlohmann::json_schema::basic_error_handler
|
|
|
|
|
{
|
|
|
|
|
void error(const nlohmann::json_pointer<nlohmann::basic_json<>> &pointer, const json &instance,
|
|
|
|
|
const std::string &message) override
|
|
|
|
|
{
|
|
|
|
|
nlohmann::json_schema::basic_error_handler::error(pointer, instance, message);
|
|
|
|
|
std::cout << "ERROR: '" << pointer << "' - '" << instance << "': " << message << "\n";
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void ConfigurationValidator::Init() {
|
|
|
|
|
void ConfigurationValidator::Init() {
|
|
|
|
|
if(Initialized_)
|
|
|
|
|
return;
|
|
|
|
|
std::string GitSchema;
|
|
|
|
|
|
|
|
|
|
if(MicroService::instance().ConfigGetBool("ucentral.datamodel.internal",true)) {
|
|
|
|
|
RootSchema_ = DefaultUCentralSchema;
|
|
|
|
|
Logger().information("Using uCentral validation from built-in default.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
if(Utils::wgets(GitUCentralJSONSchemaFile, GitSchema)) {
|
|
|
|
|
auto GitURI = MicroService::instance().ConfigGetString("ucentral.datamodel.uri",GitUCentralJSONSchemaFile);
|
|
|
|
|
if(Utils::wgets(GitURI, GitSchema)) {
|
|
|
|
|
RootSchema_ = json::parse(GitSchema);
|
|
|
|
|
Logger().information("Using uCentral validation schema from GIT.");
|
|
|
|
|
} else {
|
|
|
|
|
@@ -2479,32 +2650,32 @@ namespace OpenWifi {
|
|
|
|
|
Logger().information("Using uCentral validation from built-in default.");
|
|
|
|
|
}
|
|
|
|
|
Initialized_ = Working_ = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int ConfigurationValidator::Start() {
|
|
|
|
|
int ConfigurationValidator::Start() {
|
|
|
|
|
Init();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ConfigurationValidator::Stop() {
|
|
|
|
|
void ConfigurationValidator::Stop() {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsIPv4(const std::string &value) {
|
|
|
|
|
static inline bool IsIPv4(const std::string &value) {
|
|
|
|
|
Poco::Net::IPAddress A;
|
|
|
|
|
return ((Poco::Net::IPAddress::tryParse(value,A) && A.family()==Poco::Net::IPAddress::IPv4));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsIPv6(const std::string &value) {
|
|
|
|
|
static inline bool IsIPv6(const std::string &value) {
|
|
|
|
|
Poco::Net::IPAddress A;
|
|
|
|
|
return ((Poco::Net::IPAddress::tryParse(value,A) && A.family()==Poco::Net::IPAddress::IPv6));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsIP(const std::string &value) {
|
|
|
|
|
static inline bool IsIP(const std::string &value) {
|
|
|
|
|
return IsIPv4(value) || IsIPv6(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsCIDRv6(const std::string &value) {
|
|
|
|
|
static inline bool IsCIDRv6(const std::string &value) {
|
|
|
|
|
auto Tokens = Poco::StringTokenizer(value,"/");
|
|
|
|
|
if(Tokens.count()==2 && IsIPv6(Tokens[0])) {
|
|
|
|
|
auto Mask = std::atoi(Tokens[1].c_str());
|
|
|
|
|
@@ -2512,9 +2683,9 @@ namespace OpenWifi {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsCIDRv4(const std::string &value) {
|
|
|
|
|
static inline bool IsCIDRv4(const std::string &value) {
|
|
|
|
|
auto Tokens = Poco::StringTokenizer(value,"/");
|
|
|
|
|
if(Tokens.count()==2 && IsIPv4(Tokens[0])) {
|
|
|
|
|
auto Mask = std::atoi(Tokens[1].c_str());
|
|
|
|
|
@@ -2522,14 +2693,14 @@ namespace OpenWifi {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool IsCIDR(const std::string &value) {
|
|
|
|
|
static inline bool IsCIDR(const std::string &value) {
|
|
|
|
|
return IsCIDRv4(value) || IsCIDRv6(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ConfigurationValidator::my_format_checker(const std::string &format, const std::string &value)
|
|
|
|
|
{
|
|
|
|
|
void ConfigurationValidator::my_format_checker(const std::string &format, const std::string &value)
|
|
|
|
|
{
|
|
|
|
|
static const std::regex host_regex{"^(?=.{1,254}$)((?=[a-z0-9-]{1,63}\\.)(xn--+)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,63}$"};
|
|
|
|
|
static const std::regex mac_regex{"^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$"};
|
|
|
|
|
static const std::regex uc_timeout_regex{"^[0-9]+[dmshw]$"};
|
|
|
|
|
@@ -2585,9 +2756,9 @@ namespace OpenWifi {
|
|
|
|
|
} else {
|
|
|
|
|
nlohmann::json_schema::default_string_format_check(format,value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool ConfigurationValidator::Validate(const std::string &C, std::string &Error) {
|
|
|
|
|
bool ConfigurationValidator::Validate(const std::string &C, std::string &Error) {
|
|
|
|
|
if(Working_) {
|
|
|
|
|
try {
|
|
|
|
|
auto Doc = json::parse(C);
|
|
|
|
|
@@ -2613,12 +2784,12 @@ namespace OpenWifi {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ConfigurationValidator::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
|
|
|
|
|
void ConfigurationValidator::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
|
|
|
|
|
Logger().information("Reinitializing.");
|
|
|
|
|
Working_ = Initialized_ = false;
|
|
|
|
|
Init();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
