Merge pull request #2445 from pi-hole/development

Pi-hole FTL v6.2

Author: PromoFaux

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+*       @pi-hole/ftl-maintainers

.github/dependabot.yml

@@ -8,8 +8,6 @@ updates:
     time: "10:00"
   open-pull-requests-limit: 10
   target-branch: development
-  reviewers:
-    - "pi-hole/ftl-maintainers"
   pull-request-branch-name:
       # Separate sections of the branch name with a hyphen
       separator: "-"
@@ -25,8 +23,6 @@ updates:
     time: "10:00"
   open-pull-requests-limit: 10
   target-branch: development
-  reviewers:
-    - "pi-hole/ftl-maintainers"
   pull-request-branch-name:
       # Separate sections of the branch name with a hyphen
       separator: "-"

.github/workflows/openapi-validator.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: "20"
           cache: npm

CMakeLists.txt

@@ -16,6 +16,6 @@ set(CMAKE_C_STANDARD 17)
 
 project(PIHOLE_FTL C)
 
-set(DNSMASQ_VERSION pi-hole-v2.91)
+set(DNSMASQ_VERSION pi-hole-v2.92test8)
 
 add_subdirectory(src)

package-lock.json

@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "openapi-enforcer": "^1.23.0",
-    "openapi-examples-validator": "^5.0.0"
+    "openapi-examples-validator": "^6.0.3"
   }
 }

package.json

@@ -10,8 +10,6 @@
 #ifndef ROUTES_H
 #define ROUTES_H
 
-// struct mg_connection
-#include "webserver/civetweb/civetweb.h"
 // type cJSON
 #include "webserver/cJSON/cJSON.h"
 #include "webserver/http-common.h"

src/api/api.h

@@ -62,7 +62,6 @@ static struct {
 	{ "OpenDNS (ECS, DNSSEC)", { "208.67.222.222", "208.67.220.220" }, {"2620:119:35::35", "2620:119:53::53"} },
 	{ "Level3", { "4.2.2.1", "4.2.2.2" }, { NULL, NULL } },
 	{ "Comodo", { "8.26.56.26", "8.20.247.20" }, { NULL, NULL} },
-	{ "DNS.WATCH (DNSSEC)", { "84.200.69.80", "84.200.70.40" }, { "2001:1608:10:25:0:0:1c04:b12f", "2001:1608:10:25:0:0:9249:d69b" } },
 	{ "Quad9 (filtered, DNSSEC)", {"9.9.9.9", "149.112.112.112" }, { "2620:fe::fe", "2620:fe::9" } },
 	{ "Quad9 (unfiltered, no DNSSEC)", { "9.9.9.10", "149.112.112.10" }, { "2620:fe::10", "2620:fe::fe:10" } },
 	{ "Quad9 (filtered, ECS, DNSSEC)", { "9.9.9.11", "149.112.112.11" }, { "2620:fe::11", "2620:fe::fe:11" } },
@@ -232,8 +231,8 @@ static const char *getJSONvalue(struct conf_item *conf_item, cJSON *elem, struct
 			   elem->valuedouble < 0 || elem->valuedouble > UINT16_MAX)
 				return "not of type unsigned integer (16bit)";
 			// Set item
-			conf_item->v.ui = elem->valuedouble;
-			log_debug(DEBUG_CONFIG, "%s = %u", conf_item->k, conf_item->v.ui);
+			conf_item->v.u16 = elem->valuedouble;
+			log_debug(DEBUG_CONFIG, "%s = %u", conf_item->k, conf_item->v.u16);
 			break;
 		}
 		case CONF_LONG:

src/api/config.c

@@ -9,36 +9,37 @@
 # Please see LICENSE file for your rights under this license.
 
 set(sources
-        hex/index.html
-        hex/index.css
-        hex/pi-hole.js
-        hex/external/rapidoc-min.js
-        hex/external/rapidoc-min.js.map
-        hex/external/highlight.min.js
-        hex/external/highlight-default.min.css
-        hex/images/logo.svg
-        hex/specs/action.yaml
-        hex/specs/auth.yaml
-        hex/specs/clients.yaml
-        hex/specs/config.yaml
-        hex/specs/common.yaml
-        hex/specs/dhcp.yaml
-        hex/specs/dns.yaml
-        hex/specs/docs.yaml
-        hex/specs/domains.yaml
-        hex/specs/endpoints.yaml
-        hex/specs/groups.yaml
-        hex/specs/history.yaml
-        hex/specs/info.yaml
-        hex/specs/lists.yaml
-        hex/specs/logs.yaml
-        hex/specs/main.yaml
-        hex/specs/network.yaml
-        hex/specs/padd.yaml
-        hex/specs/queries.yaml
-        hex/specs/search.yaml
-        hex/specs/stats.yaml
-        hex/specs/teleporter.yaml
+        hex/index_html.h
+        hex/index_css.h
+        hex/pi-hole_js.h
+        hex/external/rapidoc-min_js.h
+        hex/external/rapidoc-min_js_map.h
+        hex/external/highlight_min_js.h
+        hex/external/highlight-default_min_css.h
+        hex/images/logo_svg.h
+        hex/images/favicon_ico.h
+        hex/specs/action_yaml.h
+        hex/specs/auth_yaml.h
+        hex/specs/clients_yaml.h
+        hex/specs/config_yaml.h
+        hex/specs/common_yaml.h
+        hex/specs/dhcp_yaml.h
+        hex/specs/dns_yaml.h
+        hex/specs/docs_yaml.h
+        hex/specs/domains_yaml.h
+        hex/specs/endpoints_yaml.h
+        hex/specs/groups_yaml.h
+        hex/specs/history_yaml.h
+        hex/specs/info_yaml.h
+        hex/specs/lists_yaml.h
+        hex/specs/logs_yaml.h
+        hex/specs/main_yaml.h
+        hex/specs/network_yaml.h
+        hex/specs/padd_yaml.h
+        hex/specs/queries_yaml.h
+        hex/specs/search_yaml.h
+        hex/specs/stats_yaml.h
+        hex/specs/teleporter_yaml.h
         docs.c
         )
 
@@ -53,10 +54,12 @@ find_program(RESOURCE_COMPILER xxd)
 file(GLOB_RECURSE COMPILED_RESOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/content" "content/*")
 foreach(INPUT_FILE ${COMPILED_RESOURCES})
     set(IN ${CMAKE_CURRENT_SOURCE_DIR}/content/${INPUT_FILE})
-    set(OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/hex/${INPUT_FILE})
+    string(REPLACE "." "_" INPUT_FILE_MODIFIED ${INPUT_FILE})
+    string(REPLACE "/" "_" VARIABLE_NAME ${INPUT_FILE})
+    set(OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/hex/${INPUT_FILE_MODIFIED}.h)
     add_custom_command(
-        OUTPUT hex/${INPUT_FILE}
-        COMMAND ${RESOURCE_COMPILER} -i < ${IN} > ${OUTPUT_FILE}
+        OUTPUT hex/${INPUT_FILE_MODIFIED}.h
+        COMMAND ${RESOURCE_COMPILER} -iC -n ${VARIABLE_NAME} - < ${IN} | sed "s/unsigned /static const unsigned /" > ${OUTPUT_FILE}
         COMMENT "Compiling ${INPUT_FILE}"
         VERBATIM)
     list(APPEND COMPILED_RESOURCES ${OUTPUT_FILE})