a87d1bbc4f
Remove pihole.sudo
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:04:56 +01:00
2529fbeacd
Treat FTL return data as strings ( #5509 )
2023-12-09 18:35:14 +01:00
2681835f94
Treat FTL return data as strings
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-06 00:23:15 +01:00
32a741b5c7
We do not follow 308 but FTL also doesn't suggest it
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-02 22:42:36 +01:00
96bf07863f
Use CHAOS TXT local.api.txt instead of trying to parse pihole-FTL --config webserver.ports
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-01 09:10:06 +01:00
6016131280
Ensure we also check the last port
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 22:59:49 +01:00
974fea592d
Iterate over ports, skip redirected ports
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 00:05:55 +01:00
a6565bf9a1
Support special webserver.port ports ending in "s" (secure) and "r" (redirect)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-23 22:07:31 +01:00
b61e8be3b4
Address reviewer's comment
...
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
54ab71d817
Don't use hardcoded ports to check for
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
e7c89ce25f
No need to pass a default value to get_ftl_conf_value()
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
d3813c4be5
Update check for required ports
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
86aa6b1df6
Improve v6 debug log and remove leftovers
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
f65b126433
Move custom.list to /hosts/custom.list
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 21:37:41 +01:00
de6e61705e
Remove local.list and openVPN traces
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-06 21:40:32 +01:00
72c972175d
Remove left-over parts of setupVars processing and only include pihole.toml once
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-06 13:53:08 +01:00
395110f92f
When setting a blank password, use `webserver.api.password` instead of `webserver.api.pwhash` ( #5465 )
2023-11-04 17:43:09 +01:00
758ace57c0
Check for valid OS via IPv4 and IPv6 ( #5305 )
2023-11-04 08:02:38 +01:00
ced1c5d50b
Start counting at postion 1
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-01 21:57:36 +01:00
480a8c8d7f
Remove idn2 as punycode conversion is handled by FTL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:02:26 +01:00
ab3b6dfa67
No need to >/dev/null because setFTLConfigValue already does this
...
adjust output of setFTLConfigValue to test for the exit code of `pihole-FTL --config`
2023-10-28 19:46:45 +01:00
d377cfbc3e
Extract the first entry in the answer section from dig's output, replacing any multiple spaces and tabs with a single space
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:34:30 +02:00
15be8eeffa
Remove lighttpd config test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:21:08 +02:00
635b4e952f
Add NOERROR/NXDOMAIN support in the DNS resolution test
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:20:31 +02:00
c86e7b3f96
Generalize CPU check to a short hardware information output
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:13:31 +02:00
dcc7e96d2f
Remove detection of addresses of PIHOLE_INTERFACE as it is gone, too
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:07:11 +02:00
ccd8c470a5
check_x_headers is no more
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:03:37 +02:00
00d7e998b4
setupVars.conf and pihole-FTL.conf are no more - use pihole.toml instead
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-10-28 08:03:09 +02:00
d77dbf736c
Logrotate config file needs to be owned by root
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-18 22:09:38 +02:00
aaa9acc0b9
Update query.sh to use FTL's API instead of directly interacting with the database ( #5361 )
2023-10-16 21:00:42 +02:00
2005d04625
Exact search is the new default
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-14 21:50:57 +02:00
539f379cb4
Remove Chronometer ( #5423 )
2023-10-14 19:40:02 +02:00
f7ba059b94
Query directly and authenticate only if required
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-14 14:03:56 +02:00
e374950915
Merge branch 'development-v6' into query_list_v6
2023-10-13 21:49:09 +02:00
40c75289b5
Allow pihole to access subdirs in /etc/pihole
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-13 20:07:25 +02:00
46ff257344
Remove Chronometer
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-12 13:44:51 +02:00
71357ecae7
adminlte->web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:12:02 +01:00
7886dc0172
adminlte->web
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:09:47 +01:00
afa688e3a0
Yu vs uh
...
(https://www.theguardian.com/guardian-observer-style-guide-r#:~:text=re/re%2D,re%2Dsign/resign )
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-07 00:21:06 +02:00
edf0060acf
Fix spellcheck errors
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-06 22:26:08 +02:00
885b626a68
Some unrelated spelling mistakes that spellcheck is grumbling about
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-04 16:22:01 +01:00
69a264a3c2
Add antigravity support to gravity ( #5330 )
2023-09-29 19:09:24 +01:00
43ddfcf2ca
Ensure pihole-FTL can write to all files in /etc/pihole, /run/pihole and /var/log/pihole ( #5356 )
2023-09-26 19:59:56 +02:00
ea23c8364d
Move antigravity-related changed to gravits database migration step 16->17
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-09-16 10:04:29 +02:00
df92b8ac14
Add missing creation of view vw_antigravity as well as schema change to vw_adlist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-09-12 20:43:34 +02:00
f19a56cf87
Merge branch 'development-v6' into new/antigravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-09-11 11:43:56 +02:00
52268f0155
Ignore ABP style entries in debug log dig test
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-09-07 22:32:09 +02:00
843f57399c
Ignore ABP style entries in debug log dig test
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-09-07 22:27:49 +02:00
c33963b250
Check for valid OS via IPv4 and IPv6
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-27 15:11:47 +02:00
ee4eb8db20
chmod +x
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-13 22:26:44 +02:00
8e0a40e717
Use api.sh within query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-13 22:24:05 +02:00
2227a2c569
Add API functions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-09 21:25:50 +02:00
3c693c1da5
Apply suggestions from code review
...
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-06 12:04:55 +02:00
7bb0ca59d1
Remove traces of /run/pihole
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-05 14:54:09 +02:00
587a2a1c04
# allow all users to enter der directories
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 23:52:53 +02:00
c360743d41
Re-add file/folder permissions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 21:12:40 +02:00
8ef8a27583
Remove webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 20:04:45 +02:00
a3ea2cd8c3
User pihole should be allowed to edit all its files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 19:32:19 +02:00
5ae0405446
Ensure pihole-FTL can write custom.list
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-03 20:46:01 +02:00
375d4d9bc1
Add type as new field of view vw_adlist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
00cbb8bc8a
Add antigravity support to gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
64319fa96e
Add /var/log/pihole/webserver.log to the logrotate scripts. While it may be empty for most, it can grow quickly if either API or TLS debugging is enabled (it can quickly reach several hundreds of MB per day when debugging TLS)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-05 22:11:56 +01:00
c557f29db2
Set new gravity database version to 16, which was missed in 5459daa
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 23:01:27 +01:00
5459daa03d
Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-15 09:36:17 +02:00
088b2c2920
Do not remove -all|excat when not sourrounded by space in query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:57:31 +02:00
ba3e290915
Fix shellcheck errors
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:21:48 +02:00
7351a4d3b1
Merge branch 'development' into development-v6
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 15:45:05 +02:00
11679a5188
@MrDuck2742 dropped a `]` on the floor without me seeing. I picked it up and put it back again
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-28 23:31:51 +01:00
137e6dc184
Remove all the undocumented now useless stuff from pihole -a
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-28 09:01:02 +02:00
f59610081e
remove outdated comments ( #5227 )
2023-05-27 22:41:11 +02:00
b5800ef718
Remove getFTLAPIPort() function and fix pihole status
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
44bfb8ebf0
Remove the ability to reboot/shutdown via webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:53:00 +01:00
c0e352094d
REVISIT: Remove some references to setupVars (some files can probably go entirely...)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
7cbe713873
REVISIT: Don't rely on existence of setupVars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
0e8f285f4f
Always assume that the web interface will be installed.
...
We could revist this again in future if we decide that there should still be a choice to install the interface or not
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
2784b267ec
pihole command: read values from pihole-FTL instead of setupvars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
3cb3adc5ca
Fix setting webpassword via pihole -a -p
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-27 11:51:16 +01:00
019be067d9
Convert SetWebPassword to use new FTL config
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
632aead691
add wrappers to utils.sh for setting FTL config & add tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
c520b29326
some more lighttpd refs (tests can come later)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
9f31ab8a6f
Debug log does not need to check php/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:15 +01:00
23f2db01bb
Use list parsing functionality of FTL ( #5275 )
2023-05-27 12:48:26 +02:00
82b60b09d4
Fix issue with Adding Local DNS Records does not add to /etc/pihole/custom.list when using grep 3.10 ( #5269 )
2023-05-27 11:28:19 +01:00
c92826c152
Do not copy info table during pihole -g
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-24 21:32:34 +02:00
19d50b9669
Don't source the install script in webpage.sh ( #5270 )
2023-05-10 19:55:51 +02:00
b8c3f6d999
Adding Local DNS Records does not add to /etc/pihole/custom.list
...
Fixes #5268
Signed-off-by: MrDuck2742 <jim@datachord.co.uk>
2023-05-08 04:41:53 +01:00
e6ae2e98cc
Don't source the install script in webpage.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-07 13:21:23 +02:00
fd4e8766e4
Remove unused code from query.sh
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-05-02 22:50:51 +02:00
fa116389c2
remove old comments
...
Signed-off-by: ipitio <21136719+ipitio@users.noreply.github.com>
2023-03-23 01:23:35 +00:00
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file"
2023-03-22 21:52:39 +00:00
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file ( #5177 )
2023-03-22 12:23:40 -07:00
66ed7c9ea3
Declaring all local variables under the function declaration line
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-21 16:34:50 -03:00
ac2f13adef
Allow `pihole -q` to match subdomains using ABP style domains ( #5210 )
2023-03-21 15:39:11 +00:00
6b919f3a2e
Removing unnecessary commas
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-21 12:27:20 -03:00
3c91b6558d
restore the addKey comment, reworded for anchors
...
Per @dschaper, restore the addKey clarifying comment. It has
been reworded to describe the use of anchors where before it
referenced using grep's 'match only an entire line' argument.
Signed-off-by: William Blew <william@kulian.org>
2023-03-17 11:50:53 -07:00
b9a6970bfd
Fix addKey to handle substrings of existing keys
...
Fix addKey to handle the case where a key is being added, and that key
is the leading substring of an already existing key within that file.
For example: add "server=192.168.1.1", when "server=192.168.1.178"
already exists within the /etc/dnsmasq.d/01-pihole.conf file.
Check pihole docker with PIHOLE_DNS="192.168.1.178;192.168.1.1". Its
/etc/dnsmasq/01-pihole.conf will be missing its second server= entry.
Add the test_key_addition_substr, to test addKey when
its adding a substring key of an existing key in the file.
Signed-off-by: William Blew <william@kulian.org>
2023-03-17 11:50:52 -07:00
20f8c6af3c
Search for ABP entries only if they exist in gravity.db
...
and use `abp_domains` property.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-17 14:17:53 -03:00
c35ed68051
Allow `pihole -q` matching ABP subdomains
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-03-14 17:31:39 -03:00
75a32d22a3
Allow limited parsing of ABP style adlists ( #5179 )
2023-03-14 13:23:03 -07:00
Christian König
DL6ER
DL6ER
Adam Warner
MrDuck2742
ipitio
Adam Warner
Dan Schaper
RD WebDesign
William Blew