Merge pull request #104 from Telecominfraproject/main

https://telecominfraproject.atlassian.net/browse/WIFI-12068
Telecominfraproject · Mar 13, 2023 · e23dda1 · e23dda1
2 parents a9990a6 + e895545
commit e23dda1
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 5 deletions.
diff --git a/build b/build
@@ -1 +1 @@
-15
+17
diff --git a/src/framework/ConfigurationValidator.cpp b/src/framework/ConfigurationValidator.cpp
@@ -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"
                 },

diff --git a/src/framework/RESTAPI_Handler.h b/src/framework/RESTAPI_Handler.h
@@ -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;
 		}

diff --git a/src/framework/utils.cpp b/src/framework/utils.cpp
@@ -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"};
 	}