scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-11-01 19:27:59 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #104 from Telecominfraproject/main

Browse Source 
https://telecominfraproject.atlassian.net/browse/WIFI-12068
This commit is contained in:
Stephane Bourque
2023-03-13 12:08:24 -07:00
committed by GitHub
parent a9990a6bfd e8955454f7
commit e23dda1df0
4 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
15
17

61
src/framework/ConfigurationValidator.cpp
View File

@@ -3092,6 +3092,20 @@ static std::string DefaultUCentralSchema = R"foo(
}
}
},
"metrics.wifi-scan": {
"type": "object",
"properties": {
"interval": {
"type": "integer"
},
"verbose": {
"type": "boolean"
},
"information-elements": {
"type": "boolean"
}
}
},
"metrics.telemetry": {
"type": "object",
"properties": {
@@ -3101,7 +3115,27 @@ static std::string DefaultUCentralSchema = R"foo(
"types": {
"type": "array",
"items": {
"type": "string"
"type": "string",
"enum": [
"ssh",
"health",
"health.dns",
"health.dhcp",
"health.radius",
"health.memory",
"client",
"client.join",
"client.leave",
"client.key-mismatch",
"wifi",
"wifi.start",
"wifi.stop",
"wired",
"wired.carrier-up",
"wired.carrier-down",
"unit",
"unit.boot-up"
]
}
}
}
@@ -3112,7 +3146,27 @@ static std::string DefaultUCentralSchema = R"foo(
"types": {
"type": "array",
"items": {
"type": "string"
"type": "string",
"enum": [
"ssh",
"health",
"health.dns",
"health.dhcp",
"health.radius",
"health.memory",
"client",
"client.join",
"client.leave",
"client.key-mismatch",
"wifi",
"wifi.start",
"wifi.stop",
"wired",
"wired.carrier-up",
"wired.carrier-down",
"unit",
"unit.boot-up"
]
}
}
}
@@ -3132,6 +3186,9 @@ static std::string DefaultUCentralSchema = R"foo(
"dhcp-snooping": {
"$ref": "#/$defs/metrics.dhcp-snooping"
},
"wifi-scan": {
"$ref": "#/$defs/metrics.wifi-scan"
},
"telemetry": {
"$ref": "#/$defs/metrics.telemetry"
},

6
src/framework/RESTAPI_Handler.h
View File

@@ -483,6 +483,7 @@ namespace OpenWifi {
Response->set("Content-Transfer-Encoding", "binary");
Response->set("Accept-Ranges", "bytes");
}
Response->set("Access-Control-Expose-Headers", "Content-Disposition");
Response->set("Content-Disposition", "attachment; filename=" + Name);
Response->set("Accept-Ranges", "bytes");
Response->set("Cache-Control", "no-store");
@@ -491,7 +492,7 @@ namespace OpenWifi {
Response->sendFile(TempAvatar.path(), MT.ContentType);
}
inline void SendFileContent(const std::string &Content, const std::string &Type,
inline void SendFileContent(const std::string &Content, [[maybe_unused]] const std::string &Type,
const std::string &Name) {
Response->setStatus(Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK);
SetCommonHeaders();
@@ -500,12 +501,13 @@ namespace OpenWifi {
Response->set("Content-Transfer-Encoding", "binary");
Response->set("Accept-Ranges", "bytes");
}
Response->set("Access-Control-Expose-Headers", "Content-Disposition");
Response->set("Content-Disposition", "attachment; filename=" + Name);
Response->set("Accept-Ranges", "bytes");
Response->set("Cache-Control", "no-store");
Response->set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
Response->setContentLength(Content.size());
Response->setContentType(Type);
Response->setContentType(MT.ContentType);
auto &OutputStream = Response->send();
OutputStream << Content;
}

9
src/framework/utils.cpp
View File

@@ -437,6 +437,15 @@ namespace OpenWifi::Utils {
return MediaTypeEncoding{.Encoding = PLAIN, .ContentType = "text/css"};
if (E == "js")
return MediaTypeEncoding{.Encoding = PLAIN, .ContentType = "application/javascript"};
if (E == "pcap")
return MediaTypeEncoding{.Encoding = BINARY, .ContentType = "application/vnd.tcpdump.pcap"};
if (E == "txt")
return MediaTypeEncoding{.Encoding = PLAIN, .ContentType = "text/plain"};
if (E == "tgz")
return MediaTypeEncoding{.Encoding = BINARY, .ContentType = "application/tar+gzip"};
if (E == "gz" || E=="gzip")
return MediaTypeEncoding{.Encoding = BINARY, .ContentType = "application/gzip"};
return MediaTypeEncoding{.Encoding = BINARY, .ContentType = "application/octet-stream"};
}