Pi-hole Core v6.0.2 (#5939 )

Fix empty password detection (#5935 )
Fix empty password detection
2025-02-20 23:07:13 +00:00 · 2025-02-20 22:43:52 +00:00 · 2025-02-20 19:12:59 +01:00 · 2025-02-20 17:59:37 +00:00 · 2025-02-20 18:28:38 +01:00 · 2025-02-19 17:30:40 +01:00
1 changed files with 9 additions and 4 deletions
--- a/install/basic-install.sh
+++ b/install/basic-install.sh
@@ -1766,7 +1766,7 @@ displayFinalMessage() {
    if [[ "${#1}" -gt 0 ]]; then
        # set the password to the first argument.
        pwstring="$1"
-    elif [[ $(pihole-FTL --config webserver.api.pwhash) == '""' ]]; then
+    elif [[ -n $(pihole-FTL --config webserver.api.pwhash) ]]; then
        # Else if the password exists from previous setup, we'll load it later
        pwstring="unchanged"
    else
@@ -2518,7 +2518,7 @@ main() {
    # Add password to web UI if there is none
    pw=""
    # If no password is set,
-    if [[ $(pihole-FTL --config webserver.api.pwhash) == '""' ]]; then
+    if [[ -z $(pihole-FTL --config webserver.api.pwhash) ]]; then
        # generate a random password
        pw=$(tr -dc _A-Z-a-z-0-9 </dev/urandom | head -c 8)
        pihole setpassword "${pw}"
@@ -2549,9 +2549,14 @@ main() {

    restart_service pihole-FTL

-    # write privacy level and logging to pihole.toml
+    # apply settings to pihole.toml
    # needs to be done after FTL service has been started, otherwise pihole.toml does not exist
-    # set on fresh installations by setPrivacyLevel() and setLogging(
+    # set on fresh installations by setDNS() and setPrivacyLevel() and setLogging()
+    if [ -n "${PIHOLE_DNS_1}" ]; then
+        local string="\"${PIHOLE_DNS_1}\""
+        [ -n "${PIHOLE_DNS_2}" ] && string+=", \"${PIHOLE_DNS_2}\""
+        setFTLConfigValue "dns.upstreams" "[ $string ]"
+    fi
    if [ -n "${QUERY_LOGGING}" ]; then
        setFTLConfigValue "dns.queryLogging" "${QUERY_LOGGING}"
    fi
Author	SHA1	Message	Date
Adam Warner	0e6d9e74d9	Pi-hole Core v6.0.2 (#5939 )	2025-02-20 23:07:13 +00:00
Adam Warner	f38332409f	Fix empty password detection (#5935 )	2025-02-20 22:43:52 +00:00
MichaIng	cd4efc3141	Fix empty password detection The CLI skips double quotes in config output, hence the output is completely empty, if no password was applied yet, e.g. on a fresh install. This leads to an unprotected web interface. The check is corrected, to have a random password applied as intended. Additionally, the logic to show an unchanged or unset password on the completion dialog is inverted to correctly show "unchanged" resp. "NOT SET" if the password has not been changed resp. is empty. Signed-off-by: MichaIng <micha@dietpi.com>	2025-02-20 19:12:59 +01:00
Adam Warner	99bd142dd5	Apply chosen upstream DNS on fresh install (#5938 )	2025-02-20 17:59:37 +00:00
MichaIng	49bb6dc0da	Apply chosen upstream DNS on fresh install While the dialog is shown to choose or enter an upstream DNS for Pi-hole, it is never applied. Hence fresh Pi-hole installs have no upstream DNS and cannot resolve queries. It is now checked for the two generated variables PIHOLE_DNS_1 and PIHOLE_DNS_2, a TOML array generated and applied via pihole-FTL CLI. Signed-off-by: MichaIng <micha@dietpi.com>	2025-02-20 18:28:38 +01:00
Dominik	6f82ec5121	Sync master back into development (#5913 )	2025-02-19 17:30:40 +01:00