From 3681d7187a44b32a667f40b585629d45bf4e44e9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 15 Jun 2024 11:24:00 +0200 Subject: [PATCH 1/8] Show warning if user already set an application password Signed-off-by: DL6ER --- scripts/pi-hole/js/settings-api.js | 2 ++ settings-api.lp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index d64a61925..ffb6cc459 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -266,6 +266,8 @@ function processWebServerConfig() { }) .done(function (data) { setConfigValues("webserver", "webserver", data.config.webserver); + if (data.config.webserver.api.app_pwhash.value.length > 0) + $("#existing_apppw_warning").show(); }) .fail(function (data) { apiFailure(data); diff --git a/settings-api.lp b/settings-api.lp index de587cd61..97efa5710 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -260,6 +260,9 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')

IMPORTANT: The app password generated here will only be shown once and cannot be recovered. Make sure to store it in a safe place!

+
From aab58a7ed7dd9eefd925d053c790dad3f52767a8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 16 Jun 2024 07:15:58 +0200 Subject: [PATCH 2/8] Show "Replace" instead of "Enable" on the action button (also make it warning colored) Signed-off-by: DL6ER --- scripts/pi-hole/js/settings-api.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index ffb6cc459..9c05af204 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -266,8 +266,12 @@ function processWebServerConfig() { }) .done(function (data) { setConfigValues("webserver", "webserver", data.config.webserver); - if (data.config.webserver.api.app_pwhash.value.length > 0) + if (data.config.webserver.api.app_pwhash.value.length > 0) { $("#existing_apppw_warning").show(); + $("#apppw_submit").text("Replace app password"); + $("#apppw_submit").removeClass("btn-success"); + $("#apppw_submit").addClass("btn-warning"); + } }) .fail(function (data) { apiFailure(data); From 513b7005a0a91dc8f84d51ffb219bb3e17a9847b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 16 Jun 2024 07:24:00 +0200 Subject: [PATCH 3/8] Add explicit confirmation when trying to replace existing password Signed-off-by: DL6ER --- scripts/pi-hole/js/settings-api.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index 9c05af204..88b3510e0 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -11,6 +11,7 @@ var apiSessionsTable = null; var ownSessionID = null; var deleted = 0; var TOTPdata = null; +var apppwSet = false; function renderBool(data, type) { // Display and search content @@ -267,6 +268,7 @@ function processWebServerConfig() { .done(function (data) { setConfigValues("webserver", "webserver", data.config.webserver); if (data.config.webserver.api.app_pwhash.value.length > 0) { + apppwSet = true; $("#existing_apppw_warning").show(); $("#apppw_submit").text("Replace app password"); $("#apppw_submit").removeClass("btn-success"); @@ -333,7 +335,25 @@ $("#modal-apppw").on("shown.bs.modal", function () { $("#apppw_submit").on("click", function () { // Enable app password - setAppPassword(); + if (!apppwSet) { + return setAppPassword(); + } + + // Else: Show confirm dialog + $.confirm({ + text: "Are you sure you want to replace your previous app password? You will need to re-login to continue using the web interface.", + title: "Confirmation required", + confirm: setAppPassword, + cancel: function () { + // nothing to do + }, + confirmButton: "Yes, replace password", + cancelButton: "No, go back", + post: true, + confirmButtonClass: "btn-danger", + cancelButtonClass: "btn-success", + dialogClass: "modal-dialog", + }); }); $("#apppw_clear").on("click", function () { From d7ca2da627514062cb3956581031c0a96f11ed75 Mon Sep 17 00:00:00 2001 From: Dominik Date: Sun, 16 Jun 2024 07:54:48 +0200 Subject: [PATCH 4/8] Update settings-api.lp Co-authored-by: RD WebDesign Signed-off-by: Dominik --- settings-api.lp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings-api.lp b/settings-api.lp index 97efa5710..11acc9038 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -260,7 +260,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')

IMPORTANT: The app password generated here will only be shown once and cannot be recovered. Make sure to store it in a safe place!

- From 4c23e5bf0a322c6ce49ccbd73630f88d180e7788 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Mon, 17 Jun 2024 15:39:32 -0300 Subject: [PATCH 5/8] Fix callout header color Signed-off-by: RD WebDesign --- style/themes/default-dark.css | 3 +++ style/themes/high-contrast-dark.css | 3 +++ 2 files changed, 6 insertions(+) diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index e2c141ca2..5ad4c2b43 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -25,6 +25,9 @@ body { h4 { color: #44def1; } +.callout h4 { + color: inherit; +} .content-header > .breadcrumb > li > a { color: #bec5cb; } diff --git a/style/themes/high-contrast-dark.css b/style/themes/high-contrast-dark.css index 640ab76c0..64ed35167 100644 --- a/style/themes/high-contrast-dark.css +++ b/style/themes/high-contrast-dark.css @@ -64,6 +64,9 @@ a:active { h4 { color: #44def1; } +.callout h4 { + color: inherit; +} .page-header { border-color: #202830; From 94b49ce89f0ce7a8d158561d1a1ac7929deaf103 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Mon, 17 Jun 2024 15:45:02 -0300 Subject: [PATCH 6/8] Use only one button class per button to fix button text color Signed-off-by: RD WebDesign --- settings-api.lp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings-api.lp b/settings-api.lp index 11acc9038..96be4e49c 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -265,8 +265,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - + +
From e9aea93298f40d76cc51a5a77a5596199f77a1d3 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Tue, 25 Jun 2024 18:29:57 -0300 Subject: [PATCH 7/8] Fix close button contrast in some dark themes Signed-off-by: RD WebDesign --- style/themes/default-dark.css | 7 ++++++- style/themes/high-contrast-dark.css | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index 5ad4c2b43..a67a67915 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -630,7 +630,12 @@ input[type="password"]::-webkit-caps-lock-indicator { } .close { - color: #383838; + color: #fff; + text-shadow: 0 1px 0 #000; +} +.close:focus, +.close:hover { + color: #fff; } .login-page { diff --git a/style/themes/high-contrast-dark.css b/style/themes/high-contrast-dark.css index 64ed35167..1705f9ba7 100644 --- a/style/themes/high-contrast-dark.css +++ b/style/themes/high-contrast-dark.css @@ -823,7 +823,14 @@ input[type="password"]::-webkit-caps-lock-indicator { } .close { - color: #383838; + color: #fff; + text-shadow: 0 1px 0 #000; + opacity: 0.4; +} +.close:focus, +.close:hover { + color: #fff; + opacity: 0.8; } .login-page { From d3ac2fed8d42a138f867c32b478a640c3d8ea8a8 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 26 Jun 2024 11:03:28 +0200 Subject: [PATCH 8/8] Remove "Remove currently set app password" button if none is actually set Signed-off-by: DL6ER --- scripts/pi-hole/js/settings-api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/pi-hole/js/settings-api.js index 88b3510e0..07ac488ce 100644 --- a/scripts/pi-hole/js/settings-api.js +++ b/scripts/pi-hole/js/settings-api.js @@ -273,7 +273,7 @@ function processWebServerConfig() { $("#apppw_submit").text("Replace app password"); $("#apppw_submit").removeClass("btn-success"); $("#apppw_submit").addClass("btn-warning"); - } + } else $("#apppw_clear").hide(); }) .fail(function (data) { apiFailure(data);