ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
5,184 Commits 10 Branches 126 Tags
b70b895fc567e3131c56d273b338af5ab787f6b3
Commit Graph

246 Commits

Author SHA1 Message Date
Dan Schaper 67f5f16f84 Merge branch 'development' into fix-ipv6 2022-06-02 12:24:01 -07:00
Christian König 300c7b1518 Do not hardcode webroot dir for teleporter 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-05-31 14:11:39 +02:00
Omoeba f7c800863e Remove DHCPv6, use leasetime from interface (#4507) 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-05-11 11:57:42 -07:00
Adam Warner c9e76c978e Update advanced/Scripts/webpage.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-17 13:39:55 +01:00
Adam Warner 23e6fa1ec5 Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the master branch before docker can use them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-15 09:50:40 +01:00
Adam Warner 86dd612882 remove readonly directive from declaration of utilsfile, it is unnecassery 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-12 17:13:50 +01:00
Adam Warner 4d31d5ee11 Address review comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 22:02:26 +01:00
Adam Warner 7fa8cdd03e Address: 
- Review Comments
 - Stickler Complaints
 2022-04-02 12:46:07 +01:00
Adam Warner 48138d32b6 Adjust addOrEditKeyValPair to optionally take two or three arguments (adjust test to suit) 
Add a removeKey function with test

update webpage.sh to reference functions in utils.sh (this can likely be abstracted/refactored further)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-03-16 17:42:01 +00:00
DL6ER 91b4233d3a Add backend option to set rate-limit from the dashboard 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-02-19 14:46:32 +01:00
Adam Warner 08999bf315 Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-02-04 21:16:02 +00:00
Adam Warner 2bd670a3dd Merge pull request #4582 from lschloetterer/patch-1 
add parameter to set filename for teleporter
 2022-02-04 20:44:49 +00:00
Lukas Schlötterer 2a0bb5b9ee Create second entry for teleporter and adjust spacing 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-04 21:29:23 +01:00
Lukas Schlötterer 881d92632c add hint for custom teleporter filename to help function 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-01 09:41:57 +01:00
DL6ER 8cbffa179d Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 11:18:17 +01:00
Lukas Schlötterer bad6d8a59e add parameter to set filename for teleporter 
Make it possible to write pihole -a -t myname.tar.gz to configure the filename however you want

Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-01-28 16:26:57 +01:00
Omoeba 5b84cd0a61 Fix IPv6 support when Pi-hole is a router 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-01-03 04:02:01 -08:00
DL6ER c0f454ddfa Add new interface listening option "bind" (#4476) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-12-20 21:36:19 +01:00
jbzdarkid bc8150adfa Clean up bash script formatting 
Done with the help of beautysh (a python-based bash formatter)

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-11-25 14:12:09 -08:00
Christian König e733553295 Remove unused code from webpage.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-11-02 21:22:14 +01:00
Christian König 596689b4c9 Validate host/domain of Local DNS records as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-19 21:34:16 +02:00
Christian König a872fabe7d Validate on removal as well 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-17 20:56:08 +02:00
Christian König bc21a7155d Add option to not reload 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-12 19:53:59 +02:00
Christian König b7bba6a689 Validate when adding not when removing 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-10-12 19:32:55 +02:00
DL6ER d0e8b0c962 Forward unqualified names to the CF target only when the "Never forward non-FQDN" option is NOT ticked 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-09 20:28:33 +02:00
DL6ER 06fd8123c3 Also remove "rev-server" lines when rewriting 01-pihole.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-20 16:26:17 +02:00
DL6ER c2f3477a82 Ensure conditional forwarding will forward unqualified host names if we have no local answer for them. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-08-20 15:54:25 +02:00
Kenneth Chew 092e533a30 Add -t option to Admin Console help dialog 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-07-18 14:31:37 -04:00
DL6ER a0d74d1e9d Canary domain handling is now happening in FTL where we have much finer control over it. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-04 13:55:47 +02:00
Adam Warner a1d85155fd Merge pull request #4178 from pi-hole/fix/custom_dns_removal 
Add missing sed anchors when deleting lines.
 2021-07-04 00:35:00 +01:00
Dan Schaper 01764cc581 Explicity declare values for the RA packet. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-06-20 10:28:25 -07:00
DL6ER a9e761ec13 Add missing sed anchors when deleting lines. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-05-23 12:11:04 +02:00
Adam Warner 45d4ab4c22 Add some validation to passed arguments before running the values through sed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-03-19 18:39:43 +00:00
Christian König 78027bd2bf Add default noname if hostname is empty 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-12 20:25:01 +01:00
Christian König 7dc7cbb80e Add hostname to teleporter backup file if called from cli 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-02-11 19:45:32 +01:00
Matej Dujava ef0bdf6470 Fix validation of adlist url 
Already existing regex validation will be used on url after removing @ (in case
its in separating userinfo and host).

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Fixes: https://github.com/pi-hole/pi-hole/issues/3911
Fixes: 7d19ee1b: validate blocklist URL before adding to the database (#3237)
 2020-12-21 12:50:02 +01:00
DL6ER a217c75134 Merge pull request #3882 from pi-hole/tweak/conditional_transforms 
Fix processing of CONDITIONAL_FORWARDING_REVERSE
 2020-12-01 18:46:54 +01:00
Adam Warner 454c9a411c Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:36 +00:00
Adam Warner f44b2f6aa3 Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-12-01 17:27:21 +00:00
DL6ER 49810262db When there is a Pi-hole domain set and "Never forward non-FQDNs" is ticked, we add to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-01 09:16:50 +01:00
Adam Warner 58bc98ca44 Update advanced/Scripts/webpage.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 22:30:59 +00:00
Adam Warner 4093959d3e Appease stickler 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:55:07 +00:00
Adam Warner 06c5fe2a89 Set REV_SERVER_CIDR in the else condition if it is not in-addr.arpa 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:29:54 +00:00
Adam Warner 6cb8f3f403 Add some comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 21:18:25 +00:00
Adam Warner e004d27b28 Fix processing of CONDITIONAL_FORWARDING_REVERSE 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-11-30 18:58:23 +00:00
Adam Warner 1c2c10c4a5 Merge pull request #3761 from BastiG/development 
read REV_SERVER_CIDR from environment
 2020-11-18 21:56:08 +00:00
DL6ER 50100017a5 Merge pull request #3794 from pi-hole/security/non_FQDNs_locality 
Security enhancement for the "never forward non-FQDNs" feature
 2020-10-21 21:09:05 +02:00
Adam Warner 59b0a6af6f Remove references to privacy level 4 (no longer functional) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-10-13 23:53:23 +01:00
DL6ER 08a84e51d6 Only add local=/<domain>/ when the "only forward FQDN queries" function is enabled to prevent unintended side-effects of this change 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-10 11:23:55 +02:00
DL6ER d631cd8b04 Security enhancement for the "never forward non-FQDNs" feature. This should prevent all local queries from being forwarded (will show up as blocked by regex) as well as any hostname without a domain (for example one word searches from the address bar in browsers). This fixes #3303 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-10 11:01:01 +02:00