Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-29 17:43:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
6288 commits 8 branches 109 tags 27 MiB
Commit graph

1515 commits

Author SHA1 Message Date
Dan Schaper
ebdb68a47a
display_warning fixes 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-15 10:54:31 -07:00
Dan Schaper
623ce1fe18
Tabs and debug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-08-14 14:37:58 -07:00
Adam Warner
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2 
Release/v5.1.2 to development
 2020-08-14 16:28:53 +01:00
Samuel Boucher
d4dd446ba3 Update advanced/Scripts/chronometer.sh 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
 2020-08-09 17:12:20 -04:00
Samuel Boucher
8b4921405a Upercase the temp_unit 
Signed-off-by: Samuel Boucher <scboucher@users.noreply.github.com>
 2020-08-09 15:09:49 -04:00
Aiden Mitchell
7c53b97004
Updating FAQ_HARDWARE_REQUIREMENTS and FAQ_HARDWARE_REQUIREMENTS_PORTS (#3632) 
Signed-off-by: Aiden Mitchell <aiden@bcyouthcouncil.ca>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-30 12:57:19 -07:00
Adam Warner
f50cff54de
*innocent whistling* 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:49:17 +01:00
Adam Warner
849139176e
fallback to NC if curl fails on uploadgit checkout 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 21:54:45 +01:00
Adam Warner
b8bba7951f
Just one more newline, give it to me. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:49:18 +01:00
Adam Warner
76ce5ec66b
Add additional information about local debug log location 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:45:02 +01:00
Adam Warner
7b41b99549
Merge pull request #2887 from tlk/fix/reenable 
Prevent "pihole disable $timeout" from messing up future state changes
 2020-07-15 20:23:33 +01:00
XhmikosR
d8822b70cf Fix minor typo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-05 15:12:02 +03:00
Adam Warner
3205606fc3
Also validate IPV6 in the setdns function 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-23 20:38:18 +01:00
Dan Schaper
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server 
Improve conditional forwarding
 2020-06-21 13:26:07 -07:00
DL6ER
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section 
Fix fresh install on dev branch not working
 2020-06-21 21:58:36 +02:00
DL6ER
9bf0f2a161
Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-21 21:47:30 +02:00
Adam Warner
7ea6d7b92b
remove ; so IFS changes don't stick 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-14 00:17:51 +01:00
Adam Warner
011fa8c6ea
fix sticklr complaint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 21:47:00 +01:00
Adam Warner
0320d85028
Additionally source the install script in webpage.sh to validate IP entered on pihole -a setdns 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 20:57:57 +01:00
Dan Schaper
5f9dac8d2b
Merge pull request #3434 from pi-hole/new/os_detect 
Change OS Detection in debug script
 2020-06-05 13:38:50 -07:00
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:01:53 +01:00
DL6ER
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:32:40 +02:00
DL6ER
6160eb6894
This regex is too complex for bash's own replacement. Add ignore for the shellcheck rule. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:22:40 +02:00
DL6ER
318ca75269
Merge branch 'development' into new/rev-server 2020-06-04 08:56:08 +02:00
Adam Warner
58724a38a9
Improve detection and display of supported/unsupported OS in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 17:57:22 +01:00
XhmikosR
7579ab178a Update links 
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 21:50:16 +03:00
Thomas L. Kjeldsen
903808a477 Improved explanation of why this script is needed 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:14:03 +02:00
Thomas L. Kjeldsen
005da06b3d Use PI_HOLE_BIN_DIR as introduced in PR #2886 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 03:13:51 +02:00
Thomas L. Kjeldsen
852f6b95f5 Prevent "pihole disable $timeout" from messing up future state changes 
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
 2020-05-30 02:58:27 +02:00
DL6ER
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8 
Start pihole-FTL after network
 2020-05-25 21:27:27 +02:00
DL6ER
27f0fd2372
Merge pull request #3415 from fhriley/reload_privacy 
Reload the lists, which will cause the cached privacy level to be upd…
 2020-05-25 18:47:44 +02:00
Adam Warner
d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 22:25:00 +01:00
Adam Warner
b2ba55c27b
Show details of any remotes on the git repositories 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-21 21:23:26 +01:00
Frank Riley
9d04c517e6 Reload the lists, which will cause the cached privacy level to be updated. 
Signed-off-by: Frank Riley <fhriley@gmail.com>
 2020-05-20 15:47:53 -07:00
DL6ER
b421e422c2
Merge pull request #3351 from marank/development 
Added support for CNAME record add/remove
 2020-05-20 09:13:54 +02:00
MichaIng
5c17e41cf1 Start pihole-FTL after network 
"$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit.
This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur:
- https://github.com/pi-hole/pi-hole/issues/2924
- https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772

Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-05-16 13:38:18 +02:00
Dan Schaper
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation 
Fix GitHub capitalisation
 2020-05-13 16:56:36 -07:00
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 12:55:00 +02:00
Adam Warner
be25b4d9c4
Merge pull request #3352 from pi-hole/merge-master-dev 
Merge master dev
 2020-05-12 22:27:24 +01:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
DL6ER
a9c66c7b45
Implement pihole -a theme option 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 23:03:49 +02:00
Matthias Rank
2b9898e9ca Fixed indentation 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-12 21:04:30 +02:00
Matthias Rank
0add5eb291 Added support for CNAME record add/remvoe 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-12 21:02:29 +02:00
Jeroen Baert
4cf241b42b Fix for pihole -w --nuke displaying help info even if command is executed correctly 
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
 2020-05-12 19:59:19 +02:00
DL6ER
7cc35d3b04
Add update to gravity database version 12, renaming the Unassociated group to Default group. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-07 18:01:37 +02:00
DL6ER
78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex 
Enhanced email validation regex
 2020-05-06 09:48:26 +02:00
Adam Warner
369288cc48
Update advanced/Scripts/webpage.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-05-06 08:40:54 +01:00
Dan Schaper
017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display 
Improve debugger database table printing
 2020-04-29 11:48:47 -07:00
DL6ER
ddb354f78b
Add enable indentation for the domainlist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-29 06:23:29 +02:00
DL6ER
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-24 10:33:46 +02:00
DL6ER
ad5802715e
enabled field: Center 0, right-align 1 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 15:16:48 +02:00
DL6ER
989bbad37e
Remove pihole -a hostrecord 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 13:20:15 +02:00
DL6ER
63f6c6a894
Add indentation for enabled and type fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 10:01:22 +02:00
Adam Warner
d42785a3bf
Merge pull request #3271 from pi-hole/tweak/version 
Add branch name to pihole -v
 2020-04-21 16:07:27 +01:00
DL6ER
401c029dc4
Improve else condition of branch determination 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 16:08:32 +02:00
DL6ER
0343171703
Add correct displaying for detached HEAD state. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:54:28 +02:00
DL6ER
176fbaf83b
Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:51:17 +02:00
Adam Warner
471006676c
Merge pull request #3227 from pi-hole/new/CLI_domain_comments 
Add option --comment "whatever" for adding comments for new domains through the CLI interface.
 2020-04-19 14:39:05 +01:00
Adam Warner
3cc9ba4ee8
stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2020-04-18 12:57:06 +01:00
Adam Warner
6dc85c3527
Don't display branch name if it is on master. 
Prefer cached remote version over github API

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-18 12:51:04 +01:00
Adam Warner
851947bbf2
Add branch name to version output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-13 20:58:46 +01:00
DL6ER
093054a1eb
Automatically convert legacy IP range to Class C network 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-09 09:49:07 +02:00
DL6ER
4130af0aab
Retain rev-server settings when the feature gets disabled. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-09 09:05:50 +02:00
DL6ER
90a5a13197
Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 15:35:35 +02:00
DL6ER
982c1b0059
Merge branch 'release/v5.0' into development 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 12:02:53 +02:00
Adam Warner
26f71e4dbe
accidentally a space 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-05 12:34:14 +01:00
Adam Warner
b6ac1585ec
add regex attribution 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-05 12:29:45 +01:00
Adam Warner
a9b19df4ec
expand email validation regex to catch more valid emails see comments on PR #3254 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-05 12:28:33 +01:00
M4x
2de5362adc
Sanitize email address in case of security issues (#3254) 
* Sanitize email address in case of security issues

Signed-off-by: bash-c <aboultraman@gmail.com>
 2020-04-05 10:20:35 +01:00
DL6ER
d1caad76d8
Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all". 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-01 17:19:32 +00:00
Adam Warner
7d19ee1b25
validate blocklist URL before adding to the database (#3237) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: DL6ER <dl6er@dl6er.de>
 2020-03-31 21:48:10 +01:00
DL6ER
277179f150 Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-27 19:34:41 +01:00
DL6ER
15a9d662ac Add option --comment "whatever" for adding comments for new domains through the CLI interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-27 08:45:04 +01:00
XhmikosR
7b8611ced0
Assorted typo fixes. (#3126) 
* Assorted typo fixes.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:53:14 -07:00
DL6ER
497bfd80a5
Update development from release/v5.0 (#3200) 
* Use bash regex instead of awk.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

* Fix incorrect type description. (#3201)

Signed-off-by: DL6ER <dl6er@dl6er.de>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:38:53 -07:00
DL6ER
22ce5c0d70
Fix incorrect type description. (#3201) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-08 16:32:37 -07:00
Dan Schaper
bf4fada3b7
Don't quote inside backticks, use unquoted variable. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-02 09:52:06 -08:00
Dan Schaper
360d0e4e6b
Loop through array of lists. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-02 08:07:10 -08:00
Dan Schaper
4f390ce801
Use bash regex instead of awk. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-02 05:39:21 -08:00
Adam Warner
8ecaaba247
Compare daemons to expected results. (#3158) (#3159) 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Co-authored-by: Dan Schaper <dan@glacialmagma.com>
 2020-02-24 18:00:19 +00:00
Adam Warner
4a5f344b09
then 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-19 17:46:45 +00:00
Adam Warner
af95e8c250
force updatchecker.sh run if any of the three components are updated 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-19 17:41:53 +00:00
Dan Schaper
c5c414a7a2
Stickler Lint - quote to prevent splitting 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-02-16 19:24:05 -08:00
DL6ER
d0e29ab7b0 Add human-readable output of time of the last gravity run. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
714a79ffce Migrate debugger to domainlist and add printing of client table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
cd3ad0bdc7 Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 17:43:54 -08:00
DL6ER
92aa510bda
Add timestamps and comment fields to clients. This updates the gravity database to version 11. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-27 10:36:16 +00:00
Dan Schaper
52e2a2610e
Merge pull request #3089 from pi-hole/tweak/gravity_db_10 
Add gravity database 9->10 update script
 2020-01-24 09:23:34 -08:00
DL6ER
3f9e79f152
Print human-readable timestamps in the debugger's gravity output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-20 20:13:44 +01:00
DL6ER
633e56e8a9
Add gravity database 9->10 update script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-20 17:59:24 +01:00
DL6ER
bb30c818ab
Update database version during migration. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-30 09:21:30 +00:00
Adam Warner
c944f6a320
Add a new migration script to fix the previous one 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-29 23:32:31 +00:00
Adam Warner
aa4c0ff329
Don't create trigger with duplicate name until after old table is deleted 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-29 20:35:11 +00:00
DL6ER
37217ece73
Merge pull request #3049 from pi-hole/tweak/unique_group_name 
Group table enhancements
 2019-12-28 14:19:04 +01:00
DL6ER
cda0133dd1
Revert "Change the regex used for domain validation" 
This reverts commit 76460f01e9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-21 11:15:18 +00:00
DL6ER
eda7f40fef
Reinstall trigger that prevents group zero from being deleted. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-20 00:42:59 +00:00
DL6ER
e589e665a7
Also add date_added and date_modified fields to group table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-20 00:21:25 +00:00
DL6ER
b32b5ad6e9
Update gravity database to version 8. This enforces uniqueness on the group name. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-20 00:09:10 +00:00
DL6ER
e2de199f47
Merge pull request #3037 from pi-hole/new/group_zero 
Add special group zero to gravity database
 2019-12-18 22:36:43 +01:00
DL6ER
a1633123aa
Merge pull request #3035 from pi-hole/fix/query_gravity 
pihole -q should also scan gravity table
 2019-12-16 01:45:10 +01:00
DL6ER
2444296348
Again, Mr. Stickler 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-15 11:55:19 +00:00
DL6ER
4be7ebe61f
Scan domainlist instead of view to also catch disabled domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-15 11:47:53 +00:00
DL6ER
a720fe1789
Add client trigger. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 22:49:21 +00:00
DL6ER
f0439c8d12
Add special group zero to gravity database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 16:39:02 +00:00
DL6ER
40e8657137
Please Mr. Stickler 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 11:18:46 +00:00
DL6ER
52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 11:08:19 +00:00
DL6ER
922ce7359c
pihole -q should also scan gravity table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-12 10:58:41 +00:00
DL6ER
69a909fc4c
On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-11 21:47:46 +00:00
DL6ER
f482156cca
Merge branch 'development' into new/internal-blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-09 16:49:16 +00:00
DL6ER
807a5cfb23
Merge pull request #3015 from pi-hole/tweak/domainlist_table 
Unite four domain tables into a single domainlist table.
 2019-12-08 16:50:22 +01:00
Adam Warner
eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-04 20:10:46 +00:00
DL6ER
b6cd7b8e3d
Use more descriptive names instead of directly using the IDs in list.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-02 17:27:32 +00:00
Adam Warner
869473172c
remove _ from regex descibers 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-12-01 12:50:24 +00:00
Adam Warner
63e407cfdc
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:22 +00:00
Adam Warner
0251117c77
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:45:06 +00:00
Adam Warner
44e1455b12
Update advanced/Scripts/list.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-12-01 12:44:48 +00:00
Adam Warner
76460f01e9
Change the regex used for domain validation 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 17:45:07 +00:00
Adam Warner
4b8a72fda7
functionise parameter discovery 
Rename HandleOther to ValidateDomain
Capital letters on the new functions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:26:26 +00:00
Adam Warner
edaee4e962
remove redundant function and comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 16:02:50 +00:00
Adam Warner
77bfb3fb67
tidy up variable usage in list.sh Remove some that are redundant 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 14:18:12 +00:00
Adam Warner
6a881545b0
tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2019-11-30 13:25:32 +00:00
Adam Warner
d0de5fda30
Simplify removal of domain from one list when it is requested for another 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-30 13:13:26 +00:00
DL6ER
a1f120b2ff
Address stickler's complaint 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-30 12:43:07 +00:00
DL6ER
185319d560
Unite four domain tables into a single domainlist table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-30 12:33:51 +00:00
DL6ER
5c6dd3f6f4
Merge pull request #2978 from Mograine/patch-1 
Add commands to add/remove custom DNS records
 2019-11-29 13:25:09 +01:00
Adam Warner
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd 
FTL always determined.
 2019-11-27 09:46:17 +00:00
Mograine
c809c34024 Add user feedback 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-11-27 00:28:44 +01:00
DL6ER
037d52104a
New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-11-26 10:58:39 +01:00
Adam Warner
eeb26e3975
Merge pull request #2990 from chrunchyjesus/unix-compliance 
make some shebangs comply to posix standard
 2019-11-16 12:26:49 +00:00
Adam Warner
12817c09bb
(Squashed commits) 
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

no need for global variable

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use a file in the temporary FTL download directory

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Local binary variable named to l_binary. Disambiguate from global binary.

Allow 'binary' to be shadowed for testing.

Use ./ftlbinary in all operations.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Revert shadow ability on binary variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Remove unused tests, binary variable can not be overridden.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

This should work here, too

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

binary name is passed through from pihole checkout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Add comments

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

OK, let's try it this way again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

we might be getting somewhere.. squash after this I think!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

fix the rest of the tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Remove trailing whitespace in the files we've touched here

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-15 19:49:09 +00:00
Mograine
b93628acb3 Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1 2019-11-13 09:44:48 +01:00
DL6ER
7f7b9d089c
Merge pull request #2965 from pi-hole/tweak/BackendChangesForAdlistComments 
backend changes to allow comment when adding new adlist
 2019-11-12 21:50:19 +01:00
chrunchyjesus
476975540a
make some shebangs comply to posix standard 2019-11-05 22:33:00 +01:00
Mograine
193ff38ab3 Allow more precise deletion by passing ip as parameter 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-10-28 13:21:05 +01:00
Pierre Ghiot
f9d16c2b15 Update webpage.sh 
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
 2019-10-27 16:55:54 +01:00
John Krull
c6f9fe3af2 Fix spelling of the word "permitting" 
Signed-off-by: John Krull <john.a.krull@gmail.com>
 2019-10-15 21:29:55 -05:00
Adam Warner
5bac1ad58b
backend changes to allow comment when adding new adlist 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-10-14 22:59:58 +01:00
DL6ER
d883854aad
Use constant for long path. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-10-03 12:12:32 +02:00
DL6ER
756c99653e
Merge branch 'development' into new/internal-blocking 2019-10-03 12:01:27 +02:00
DL6ER
2e0370367c
Print when we upgrade gravity database version. This will make possibly failed upgrades easier to debug. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-26 14:02:20 +02:00
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-22 01:16:44 +01:00
DL6ER
a27c7b1398
regex white- and blacklist views need to be re-created as well as we need the ID for storing internally whether or not we try to match a given regex for a specific client. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-18 20:58:44 +02:00
DL6ER
7b48431917
Add client_by_group table like we have for the other lists. It stores associations between individual clients and list groups. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-09 00:03:57 +02:00
DL6ER
1f36ec48e3
Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 23:11:20 +02:00
DL6ER
ff08add7c0
Update vw_whitelist and vw_blacklist to return group_id alongside domain so we can filter if the current client wants to get this domain blocked or not. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 13:01:36 +02:00
DL6ER
ffc91a6c81
Update view vw_gravity to only return domains from enabled adlists. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-07 11:17:53 +02:00
DL6ER
a8af2e1837
Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-04 23:14:29 +02:00
DL6ER
aed2e35bc0
Print messages only after removing possible matches in comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-02 22:39:28 +02:00
DL6ER
a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support 
Whitelist regex support
 2019-09-01 14:23:37 +02:00
Dan Schaper
b9fed8fca6
Merge pull request #2891 from niklasea/development 
Restore 'pihole -q' hosts format support and improve matching in edge cases
 2019-08-30 20:56:52 -07:00
DL6ER
d8eee47ca4
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-28 22:10:26 -07:00
Niklas Elmose Andersen
a3e32d9a15 Properly escape domain regex 
Dots in domain names should not match any character.

Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
 2019-08-27 12:13:28 +02:00
Niklas Elmose Andersen
989d1aff60 Restore and improve 'pihole -q' matching 
Removes regex lookaround which 'grep -E' does not support.
Restores support for blocklists in hosts format.
Simplifies domain match cleanup logic by eliminating an if-condition.
Improves domain matching by eliminating commented domain names,
eliminating false positives in a few edge cases.

Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
 2019-08-26 20:39:56 +02:00
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable 
Update pihole script with full path to 'pihole'

Variable for webpage.sh 'pihole' call.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-08-24 04:49:14 -07:00
DL6ER
6faddfcd3d
Print timestamps in local time zone of the Pi-hole. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-23 10:09:52 +02:00
DL6ER
1820c2c598
Merge branch 'development' into new/whitelist-regex-support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:19:51 +02:00
DL6ER
23b688287f
Fix indentation in query.sh. No functional change in this commit. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:12:58 +02:00
DL6ER
42ccc1ef24
Add support for regex whitelist in "pihole -q". 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 14:06:42 +02:00
DL6ER
cc40c18f49
Wrap upgrade script commands in a transaction. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:54:46 +02:00
DL6ER
b1838512b2
Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-22 13:39:58 +02:00
DL6ER
3e78ed95d4
Fix displaying options for table "group" in the debugger. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-17 15:04:04 +02:00
snapsl
20a839fef5 fixed local declaration before assignment 
Signed-off-by: snapsl <chris.baller@gmx.de>
 2019-08-15 11:20:55 +02:00
snapsl
b2d8c4374b tweaked code style of webpage.sh 
Signed-off-by: snapsl <chris.baller@gmx.de>
 2019-08-14 23:28:13 +02:00
DL6ER
dc93462d42
Group table has only two columns 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 20:28:00 +02:00
DL6ER
6e2e825a5f
Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:10:52 +02:00
DL6ER
af754e3fc4
Rearrange group tables directly next to the tables they refer to. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:08:36 +02:00
DL6ER
06860ed5b4
Group tables have only two columns. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:07:39 +02:00
DL6ER
09190c1735
Only check once for if this is a regex list or not. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 21:03:47 +02:00
DL6ER
a95b473417
Rearranage if statements to ensure the proper output is shown for wildcard-style filters. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-05 20:56:01 +02:00
DL6ER
6f58d58cae
Add --whitewild to help texts and man pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 22:26:27 +02:00
DL6ER
40d0caa70b
Add undocumented --whitewild option that does the same --wild does for the whitelist. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 21:15:28 +02:00
DL6ER
0692be9bae
Fix small mistake in 2->3 upgrade script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:59:52 +02:00
DL6ER
0d28dce326
Print group table contents in debug log. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 20:18:15 +02:00
DL6ER
96031214c6
Add support for whitelist regex filter management via CLI. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-22 19:36:11 +02:00
Mark Drobnak
ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists 
Fix block page errors due to gravity DB and changes to queryAds
 2019-07-20 14:55:37 -04:00
Mark Drobnak
445127accc
Merge pull request #2832 from pi-hole/new/audit_database 
Migrate audit list to gravity.db database table
 2019-07-10 22:55:48 -04:00
DL6ER
420f60b5c7
Add timeout to migration script (1->2). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:02:07 +02:00
DL6ER
65fdbc85d5
Add timeout to migration script (2->3). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:01:38 +02:00
DL6ER
87f75c737a
Review comments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-10 12:00:38 +02:00
DL6ER
5ff9052200
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-09 11:41:44 +02:00
Mcat12
b154dd5f07
Quote calls to read FTL config 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-08 19:48:50 -07:00
DL6ER
0683842ec3
Fix typo in 2->3 migration script. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:43:49 +02:00
DL6ER
054c7a2c05
Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 21:35:31 +02:00
DL6ER
3d3fc2947e
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-08 19:22:35 +02:00
Mcat12
e8e5d4afda
Get file locations of FTL files from the config 
Instead of hardcoding the location of certain FTL files (`gravity.db`,
`pihole-FTL.log`), read the configured location from FTL's config. The
default location is used if no custom location has been configured.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-07 18:10:39 -07:00
DL6ER
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 21:21:56 +02:00
DL6ER
be3e198f9a
Address linting errors. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:46:20 +02:00
DL6ER
acc50b709e
Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-07 10:33:08 +02:00
DL6ER
efe8216445
Fix further stickler complaint. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:45:07 +02:00
DL6ER
0405aaa3da
Review comments and fixing stickler complaints. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-06 09:32:41 +02:00
DL6ER
2fb4256f84
Rename table to "auditlist" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 16:28:36 +02:00
DL6ER
82476138c1
Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 16:09:13 +02:00
DL6ER
5293beeb77
Update audit script to store domains in new database table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:10:33 +02:00
DL6ER
0c8f5f1221
Remove comment field from audit table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:06:05 +02:00
DL6ER
4f4a12bb40
Upgrade database if necessary and store audit domains therein. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 14:03:57 +02:00
DL6ER
1dbe6c83c3
Add database upgrading mechanism for adding the audit table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-05 13:54:18 +02:00
Mcat12
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 13:44:14 -07:00
Mark Drobnak
92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush 
Add new "pihole arpflush" command
 2019-07-04 14:00:16 -04:00
DL6ER
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups 2019-07-03 19:21:55 +02:00
MMotti
04abcb71f6 Fix potential invalid result for pihole -q 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-07-03 13:04:57 +01:00
DL6ER
1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-07-03 07:56:10 +02:00
DL6ER
6996ffa451
Also flush network_addresses table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 09:15:12 +02:00
DL6ER
c1495b0fa8
Merge branch 'development' into new/arp-flush 2019-06-15 09:04:30 +02:00
MMotti
bcf03647ef Add comment and remove blankspace 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-12 16:02:59 +01:00
MMotti
a9d0690f4d Change the case of some variables 
Just for consistency

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-10 18:50:52 +01:00
MMotti
10fbed50f3 Shellcheck 
Suggesting to use parameter expansion but we need to be able to identify the start of each line

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-10 18:10:25 +01:00
MMotti
785f1fedd9 Tidy regexp queries 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-10 17:52:58 +01:00
MMotti
cf21efa103 Minor grammar changes 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-05 14:36:43 +01:00
MMotti
7613e94ef6 Minor tweaks 
Mainly for consistency

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 06:06:17 +01:00
MMotti
b49c702f33 Consistency tweak 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 00:03:37 +01:00
MMotti
09532638d5 Read from DB instead of regex.list 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-04 00:00:25 +01:00
MMotti
97df6d7415 Stickler fix 
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-03 19:56:10 +01:00
MMotti
54bfaa28c1 Fix for regexp queries through pihole -q 
Taking inspiration from: https://github.com/pi-hole/pi-hole/pull/2346

We will use awk to iterate through each regexp and print any that match the domain query.

Signed-off-by: MMotti <matthew.w.motti@gmail.com>
 2019-06-03 19:32:59 +01:00
Mark Drobnak
d92ced6fb6
Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database 
Query black and whitelists database
 2019-06-01 00:55:05 -04:00
DL6ER
9ddce88092
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-31 08:42:22 +02:00
DL6ER
44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-31 08:39:18 +02:00
Mark Drobnak
814fdcf9b6
Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names 
Add dhcp-ignore-names option when enabling DHCP service
 2019-05-30 22:35:52 -04:00
DL6ER
5060605626
Print table name before entering the loop for the sake of simplicity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:44:59 +02:00
DL6ER
285e6fe090
Address lint complaints 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:32:35 +02:00
DL6ER
c3023fe681
Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 21:25:10 +02:00
DL6ER
c5df104a66
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 16:41:37 +02:00
Mcat12
bfb99c361c
Note that the gravity size does not include the blacklist entries 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-21 17:12:47 -07:00
Mcat12
5796054305
Increase ID column width to 4 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:59:18 -07:00
Mcat12
a3e1473ac1
Set explicit column widths to prevent text from getting cut off 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:33:09 -07:00
Mcat12
7b5fc60e00
Improve table formatting 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:20:38 -07:00
Mcat12
807ce0af4e
Show whitelist, blacklist, and regexlist details 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:15:22 -07:00
Mcat12
3f05efd60f
Add extra newline 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 21:02:31 -07:00
Mcat12
03d93aa19a
Update debug script with gravity DB changes 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-05-20 20:58:57 -07:00
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3 2019-05-18 13:18:14 -07:00
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb 
# Conflicts:
#	advanced/Scripts/list.sh
#	gravity.sh
#	pihole
 2019-05-12 15:20:52 -07:00
mpiederiet
3220e2b978
Fix for preventing git error message in cron logs 
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-11 10:57:44 +02:00
DL6ER
a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 18:25:11 +02:00
DL6ER
5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:24:36 +02:00
DL6ER
f80fdd7e83
Improve comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:19:50 +02:00
DL6ER
6ba58896d2
Simplify code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:15:30 +02:00
DL6ER
3aa838bbe4
Implement black- and whitelist searching with SQL statements. We use the ESCAPE clause in the LIKE query as the underscore "_" wildcard matches any single character but we want to suppress this behavior (underscores can be legitimate part of domains) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-04 13:02:14 +02:00
Dan Schaper
5532df24e4
Pi-hole Debug - tricorder upload function calls 
Fix tricorder upload function calls to use new curl function.
 2019-05-03 02:46:27 -07:00
DL6ER
0bc112ce52
Query only those columns we actually use when showing domains on the CLI. Show date of last modification instead of addition date for domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-02 17:11:39 +02:00
DL6ER
b372f808dd
Fix lint errors 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:06:14 +02:00
DL6ER
bc9b623638
Modify query.sh to use the gravity database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 16:56:16 +02:00
pvogt09
8a92fb24c4 Incorporates changes requested by @Mcat12 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-01 11:20:26 +02:00
pvogt09
5c575e73c7 Adds world readable attribute to files created by Pi-hole to circumvent #2724 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-04-30 22:41:12 +02:00
Mark Drobnak
6812e8880e
Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg 
Fix chronometer refresh incorrectly reading the long argument sleep time
 2019-04-29 11:43:07 -04:00
DL6ER
efeba594ae
Add support for manipulating adlists from the CLI 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 21:39:06 +02:00
DL6ER
126f7101ff
Add (optional) date_modified field and use vw_whitelist view in vw_blacklist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 14:44:03 +02:00
Mcat12
b320e74921
Improve argument handling 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-27 14:05:04 -07:00
Mcat12
add5e4ca5e
Explicitly allow only -r and --refresh in argument handler 
It is already checked, but this make the code explicit.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-27 13:39:44 -07:00
DL6ER
b4ae142149
Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 20:54:01 +02:00
DL6ER
3fe43ce1d9
Rely on default value (database provided) for date_added when adding a new domain 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 18:16:04 +02:00
DL6ER
e04dc9d2bb
Remove sqlitekey variable as the first column of the regex table is now called domain as well 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:44:42 +02:00
DL6ER
a891d64395
We should always exit after displaying a list, even if it is empty 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:13:36 +02:00
DL6ER
6b1d2523e8
Also print datetime a domain was added when listing the domains on the CLI 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:07:16 +02:00
DL6ER
08ee9526ad
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:06:01 +02:00
DL6ER
a2a7e80007
Add --web for sending a confirmation string when executed from the web interface. This is necessary as the "Reloading DNS service" message does not always propagate through to the web interface when reloading pihole-FTL takes a while. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 15:01:13 +02:00
DL6ER
cce66a13b6
Fix output in list.sh when adding a domain that is already present in the target list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 14:54:41 +02:00
DL6ER
43bced7997
Add more comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 12:45:08 +02:00
DL6ER
788cd78321
Reduce code duplication and add special handling of | character as it might appear in regex filter string 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 12:30:38 +02:00
DL6ER
e5d1cb5a2e
Rewrite list.sh to operate on database-based lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 12:10:42 +02:00
Mark Drobnak
d2c7c426de
Fix teleporter backup file extension 
Fixes #2714 

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2019-04-22 19:43:26 -07:00
DL6ER
84244b7cd5
Fix indentation in display of branches available during pihole checkout 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-16 18:30:04 +02:00
Mcat12
422680ee9f
Fix chronometer refresh incorrectly reading the long argument sleep time 
`-r` worked, but `--refresh` did not.

Fixes #2703

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-14 13:03:25 -07:00
Adam Warner
a7f6c9b3a0
Ignore matches that start # using negative lookbehind 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-03-29 00:08:04 +00:00
DL6ER
2e17c23333
Don't warn if user is on development as this branch is constantly updated 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-03-02 16:40:59 +01:00
DL6ER
63f3381a2b
Warn user if FTL is not on branch master 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-03-02 16:36:49 +01:00
Dan Schaper
71cd6c137b Use curl instead of openssl for transmission of unmodified 
log file. We want ansi color codes to be sent.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-02-23 04:13:44 -08:00
Adam Warner
a145f1d931
Be more verbose with debug script output 
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff

Signed-off-by: Adam Warner <adamw@rner.email>
 2019-02-18 22:32:53 +00:00
Mcat12
26f2410fe6
Change /var/run/shm to /dev/shm 
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-02 10:37:12 -08:00
Mcat12
5c4ee23795
Fix missed start_service -> restart_service call 
start_service was changed to restart_service.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-02 10:19:44 -08:00
Mark Drobnak
a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm 
List content of /var/run/shm in debugger
 2019-01-02 15:12:54 -05:00
DL6ER
5ffc8c7443
List content of /var/run/shm in debugger 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-01 17:56:02 +01:00
Mark Drobnak
ed5869646f
Use source instead of dot for setupVars 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-12-27 16:37:10 -05:00
Mcat12
be2d494fcf
Don't show web version in pihole -v output if not installed 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-12 14:55:09 -05:00
Mcat12
1cad069050
Add privacy level 4 to all privacy level code 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-10 10:18:25 -05:00
Dan Schaper
916b2920be
Merge pull request #2525 from pi-hole/release/v4.1 
Release/v4.1 to Development
 2018-11-29 08:46:05 -08:00
Dan Schaper
9f672593bc
Update advanced/Scripts/webpage.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2018-11-26 20:01:41 +01:00
DL6ER
a285ae65fb
Backend changes for DHCPv4 rapid commit support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-25 08:39:58 +01:00
Mcat12
9d59da8974
Remove dnsmasq checks from debugger 
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-08 21:51:21 -05:00
Mark Drobnak
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check 
fix debug service check via sysvinit
 2018-11-07 17:50:32 -05:00
Dan Schaper
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error 
Fix error when reading in new password
 2018-11-01 07:05:27 -07:00
Dan Schaper
72829be281
Remove shellcheck overrides 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-10-26 12:14:10 -07:00
Adam Warner
d57f9906bd
read -r -a, not read -a -r 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-10-26 19:24:43 +01:00
Adam Warner
3d4fea6510
Move -r to before the -p 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-10-26 19:17:49 +01:00
bcambl
3ec84553ef fix debug service check via sysvinit 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-10-24 10:06:11 -06:00
WaLLy3K
180d29c7b3
Prevent BASH from expanding Web Password 
* Resolves issue #2471

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-10-21 11:08:22 +11:00
Mark Drobnak
85dceb12a1
Use curl -s instead of -q 
See #2416 

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-10-12 23:53:21 -04:00
Mcat12
d55012f724
Append versions (after the first) instead of overwriting in updatecheck 
Fixes an issue brought up in #2435

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 20:56:44 -04:00
Mcat12
7c6eecc9c8
Ignore shellcheck warning 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:16:08 -04:00
Mcat12
e4cbf5023a
Fix error when reading in new password 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:09:59 -04:00
Mark Drobnak
46356d3027
Merge pull request #2434 from pi-hole/fix/2200 
Only check web versions if web interface is installed
 2018-09-30 17:57:54 -04:00
Mark Drobnak
a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all 
Fix invalid numbers in Chronometer
 2018-09-30 17:23:06 -04:00
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master 
Read without -r will mangle backslashes. (Fix)
 2018-09-30 17:19:56 -04:00
Adam Warner
0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-09-30 19:45:04 +01:00
Adam Warner
7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-09-30 19:41:04 +01:00
mrmajik45
0f509f4a34
Update piholeDebug.sh 2018-09-28 17:22:31 -04:00
WaLLy3K
24e1dc92ba
Resolve issue #2428 
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-09-28 10:34:49 +10:00
mrmajik45
00f98543ad
read without -r will mangle backslashes. 2018-09-26 10:32:22 -04:00
mrmajik45
8684356b44
read without -r will mangle backslashes. 2018-09-26 10:31:44 -04:00
Mark Drobnak
dac27f1f18
Only get the first gateway for chronometer 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-09-09 15:12:48 -04:00
Mark Drobnak
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools 
Use ip route rather than old net-tools route in  chronometer.sh
 2018-09-09 15:11:19 -04:00
DL6ER
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable 2018-08-30 22:26:57 +02:00
Mcat12
f141b9f778
Add support for privacy level 4 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 17:36:16 -04:00
DL6ER
ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-14 13:16:17 +02:00
DL6ER
165affc39b
list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-13 18:53:31 +02:00
DL6ER
f794018e0c
Acknowledge temporary file if disabled for "pihole -b" command 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-13 18:17:14 +02:00
DL6ER
94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-10 18:22:55 +02:00
WaLLy3K
eef948d797
Fix header newlines 
* Added \\n to each $xxx_ver_str, resolving issue #2325

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-08-07 10:45:30 +10:00
Mcat12
e4e22fb58e
Fix permissive regex 
The `\.?` is too permissive, letting in anything that ends in the domain

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-31 22:16:40 -04:00
Mcat12
7086a400e8
Use simpler regex format for wildcards 
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-31 21:36:29 -04:00
Adam Warner
9b1356ad01
Revert #2282 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-07-27 00:27:06 +01:00
Peter Robinson
45521b377a Use ip route rather than old net-tools route in chronometer.sh 
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 2018-07-26 17:46:51 +01:00
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development 
# Conflicts:
#	advanced/Scripts/piholeDebug.sh
 2018-07-22 15:18:26 -04:00
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 15:25:35 -07:00
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 14:00:34 -07:00
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:57:15 -07:00
Dan Schaper
328e7738d5
Space/Tab version.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:27:30 -07:00
Dan Schaper
aca359c2e2
Space/Tab updatecheck.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:24:05 -07:00
Dan Schaper
1cd40dc9e5
Space/Tab update.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:22:37 -07:00
Dan Schaper
dc9407281f
Space/Tab setupLCD.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:17:10 -07:00
Dan Schaper
8f727c1f35
Space/Tab query.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:13:42 -07:00
Dan Schaper
a08ea28feb
Space/Tab piholeLogFlush.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:07:54 -07:00
Dan Schaper
c5535dd9a0
Space/Tab piholeCheckout.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:54:24 -07:00
Dan Schaper
3519cc5e44
Space/Tab list.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:42:11 -07:00
Dan Schaper
d251bbbb05
Space/Tab chronometer.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 12:29:09 -07:00
Dan Schaper
76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck 
fix some shellcheck/stickler compaints in debug script
 2018-07-19 05:18:40 -07:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-16 11:29:12 -06:00
Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-15 18:59:25 -04:00
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists 
Use regex lists instead of wildcards for blocking
 2018-07-14 06:10:44 -07:00
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-12 21:38:43 -04:00
Mcat12
1b276a74fe
Display all lines of a list, even if there is no newline at the end 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 16:03:16 -04:00
Mcat12
8084c4b2a3
Fix regex period substitution due to switching to bashism 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:56:15 -04:00
Mcat12
1ca852191f
Fix stickler complaints 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:50:05 -04:00
Mcat12
af5fc6547a
Fix echoing wrong domain when converting wildcard 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:47:18 -04:00
Mcat12
70f2b26c86
Escape periods in wildcard converted regex filters. 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:45:06 -04:00
Mcat12
cfd95dbe87
Fix incorrect variable usage 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 15:38:44 -04:00
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 14:37:33 -04:00
Mcat12
d21298c156
Add back conditional forwarding to webpage.sh 
This was accidentally removed in a previous PR.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-07 15:23:47 -04:00
Mcat12
4763969c8f
Move processWildcards to query.sh 
Closes #2255

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 22:03:53 -04:00
Mcat12
f868052062
Fix incorrect variable string substitution 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 15:50:43 -04:00
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists 2018-06-29 23:12:34 -04:00
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 23:10:49 -04:00
Mcat12
0decc37b5a
Appease stickler 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 22:55:00 -04:00
Mcat12
4a953b66e0
Make removing regex domains work correctly 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 22:51:37 -04:00
Mcat12
8435eeed4d
Don't validate regex domains 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:31:50 -04:00
Mcat12
cffb4de83b
Use strict grep instead of regex for duplicates 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:01:27 -04:00
Mcat12
868948509a
Split declaration and assignment of random_url 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:30:42 -04:00
Mark Drobnak
e71492a2b3
Update debug script for simple list format 
Gravity is now just a list of domains, not IP addresses and domains separated by a space.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-20 20:29:32 -04:00
DL6ER
2809579dd7
Refine regex filter generation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:59:21 +02:00
DL6ER
c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:46:26 +02:00
DL6ER
cd026cd865
Add comment where regexList is defined 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:43:33 +02:00
DL6ER
bc705aac03
Add automated wildcard list -> regex filter conversion 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:39:19 +02:00
Rob Gill
23adbf9540
remove quotes 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:45:27 +10:00
Rob Gill
a7347238e6
$adListsList replace filename in text 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:42:30 +10:00
Rob Gill
bf55666492
Appease stickler. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:29:07 +10:00
Rob Gill
8ab0b0e460
colfile 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:25:43 +10:00
Rob Gill
b8e1849cec
wildcardlist 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:19:07 +10:00
Rob Gill
45a8eda49b
Stop grep leak in query 
Fix grep error leak from #1805

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:08:21 +10:00
DL6ER
d254d6075a
First step from wildcards to regex lists for blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-06 19:26:56 +02:00
Adam Warner
f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-02 09:56:08 +01:00
Mark Drobnak
ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists 
Prevent redundant entries from being added to Adlists.list
 2018-05-31 14:58:16 -04:00
Mark Drobnak
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports 
debug script: fix empty ports on some systems
 2018-05-30 21:48:53 -04:00
Mark Drobnak
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale 
Get user locale when debugging
 2018-05-14 16:43:05 -04:00
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-04 22:19:39 +02:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update 
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-05-01 23:15:26 +01:00
MichaIng
43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 
+ Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".
 2018-04-28 15:17:29 +02:00
Adam Warner
ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-23 20:46:57 +01:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:30:51 +02:00
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:12:20 +02:00
Adam Warner
6977f655e3
fix a typo 
comment out some unused variables, but not deleting them in case there is a plan for them in future...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:08:55 +01:00
Adam Warner
e6fc9dc75d
disable 2016 in two places and declare local variables 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:00:14 +01:00
Adam Warner
b57b3f4588
Disable SC2001 for generation of the_os 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:36:50 +01:00
Adam Warner
776ae92416
fix some shellcheck/stickler compaints in debug script 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:33:10 +01:00
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS 2018-04-15 20:46:13 +01:00
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs 
Get head and tail of pihole-FTL.log during debug process
 2018-04-15 14:23:25 -04:00
Adam Warner
bca23dd896
Allow passing of --check-only to update script. 
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 18:25:35 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server 
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
 2018-04-15 02:08:16 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Adam Warner
8b5dcc3872
Match change made by 7edab27 to prevent merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 16:53:57 +01:00
Ludovic Rousseau
7edab27e53 Stylistic change to use an explicit if/then/fi 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 12:19:55 +02:00
Ludovic Rousseau
9b3531f634 Fix stylistic issue 
Expand variable using ${FTLconf}

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:48:34 +02:00
Ludovic Rousseau
d8f85a8981 Avoid a "No such file or directory" error 
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory

I use a variable FTLconf to not repeat the file name twice.

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:58 +02:00
Ludovic Rousseau
3b229489c2 Fix regex to find DBFILE= from configuration file 
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.

With the change I now have the results:

DBFILE=/foo/bar
-> /foo/bar

  DBFILE=/foo/bar
-> /foo/bar

 # DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:50 +02:00
Jacob Salmela
5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-11 20:35:51 -05:00
Dan Schaper
250b445eee
Split declaration and population for stickler. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-04-10 21:37:04 -07:00
DL6ER
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-05 22:28:55 +02:00
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 18:10:23 +02:00
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments 
FTLDNS tweaks
 2018-04-04 17:00:03 +01:00
Adam Warner
631f5b4848 Change order of updatable components to match the end output 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-04 16:35:11 +01:00
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 13:12:39 +02:00
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 23:22:06 +01:00
Adam Warner
56278c6394
Fix shellcheck complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 22:06:36 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function 
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 21:53:32 +01:00
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1 
Proper output for debug CPU detection
 2018-04-02 00:00:14 -04:00
Jacob Salmela
1a275ba184
debug user locale; improve function to parse variables and files 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-01 06:40:48 -05:00
Perflyst
3390fbf238 Add RaspberryPi 3B+ 
Signed-off-by: Perflyst <mail@perflyst.de>
 2018-03-27 12:23:01 +02:00
Jacob Salmela
68c27eb2a1
add label to x-header so you know which one is being evaluated 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-25 21:27:40 -05:00
Jacob Salmela
143e75d213
fix empty ports on some systems 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-25 09:39:29 -05:00
Adam Warner
fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-23 22:46:41 +00:00
Jacob Salmela
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-23 06:56:40 -05:00
Jacob Salmela
7159ecb632
reduce ping times for faster script completion 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-23 00:11:21 -05:00
Adam Warner
76cb129d3c
don't forget master and development branches! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:48:09 +00:00
Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:41:00 +00:00
Ryan Knapper
5ecfc58e5f
Require exact match 
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-28 13:06:07 -05:00
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection 
Inserted "log_write" to properly output CPU detection lines.

Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
 2018-02-19 10:22:28 -05:00
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master 
Create blacklist.txt if not existant
 2018-02-18 15:32:01 -05:00
Ludovic Rousseau
47bbea9ba7 Use " " to protect parameter substitution 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 21:20:04 +01:00
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development 
Add conditional forwarding options to webpage.sh
 2018-02-18 12:51:46 -05:00
Ludovic Rousseau
b7891f92a5 Create blacklist.txt if not existant 
Closes: https://github.com/pi-hole/pi-hole/issues/1888

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 14:19:49 +01:00
DL6ER
b8eaa9a527
Use double quotes to precent globbing and word splitting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 13:01:00 +01:00
DL6ER
5d274008db
Use possibly user-defined database location when flushing 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 12:58:57 +01:00
Ryan Knapper
f2b3752f3d
lan to local 
Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:08:55 -05:00
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list 
Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:04:10 -05:00
DL6ER
4c249a1186
Flush most recent 24 hours from FTL's database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 13:48:13 +01:00
DL6ER
158ea1d43b
Add sqlite3 dependency 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:54:49 +01:00
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-16 22:10:27 +01:00
ryanknapper
607664c860
Update webpage.sh 
Updated webpage.sh to include conditional forwarding options.
 2018-01-14 21:01:08 -05:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake 
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
 2018-01-12 02:17:31 +02:00
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:36:03 +01:00
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:34:02 +01:00
DL6ER
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 17:44:59 +01:00
Adam Warner
8e0d76b63b
initiated -> initialized 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:26:32 +00:00
DL6ER
cca8412921
Use "echo -n" to avoid haveing newlines in the files 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 11:52:27 +01:00
DL6ER
d15a5ad5c1
Add required documentation in the source code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:46:51 +01:00
DL6ER
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:42:41 +01:00
Dan Schaper
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 10:56:37 -08:00
DL6ER
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:28 +01:00
DL6ER
cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:24 -05:00
DL6ER
8a243c5872 Insert also old trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:15 -05:00
DL6ER
b30b3f3aeb Update DNSSEC trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:44:34 -05:00
DL6ER
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-09 19:00:46 +01:00
Jacob Salmela
28bed0041e
remove comment 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:29:28 -06:00
Jacob Salmela
6f03e30151
fixes #1537 by checking if systemctl is found 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:23:55 -06:00
Adam Warner
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-06 23:27:40 +00:00
Adam Warner
162a7b56fe
force mode is no longer referenced. Regression. Same with domToRemoveList 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-06 22:42:08 +00:00
WaLLy3K
2dc1851892
Allow passwords with spaces 
e.g: `pihole -a -p "foo bar"`

 Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-11-23 13:17:34 +11:00
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker 
Add bash / cron based update checker for Pi-hole
 2017-11-08 20:38:40 -06:00
DL6ER
90efa3b610
Simplify git subroutines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-08 19:11:41 +01:00
Adam Warner
5221767a70
Merge pull request #1735 from bcambl/debug_selinux 
add SELinux checks to debug script
 2017-10-30 13:07:36 +00:00
DL6ER
0db76aada0
Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 15:44:17 +02:00
DL6ER
9be854031f
Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 13:41:24 +02:00
DL6ER
709851503f
Use "pihole-FTL branch" to get FTL's branch 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 13:27:12 +02:00
DL6ER
6ca47dc3b3
Add bash / cron based update checker for Pi-hole 2017-10-28 13:20:02 +02:00
WaLLy3K
2390b80359 Silence non-numeric domains_being_blocked output 
* Round $cpu_mhz to 1 decimal place
* Remove ".0" from $cpu_freq
* Silence non-numeric domains_being_blocked output
* Use "Core" and "Web" as appropriate

Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-10-25 21:04:43 +11:00
bcambl
0f868f7649 remove un-used DONE variable 
(still available via sourced COL_TABLE on line 29)
 2017-10-19 22:57:07 -06:00
bcambl
31730e7197 add missing colors to COL_TABLE fallback 2017-10-13 09:14:19 -06:00
bcambl
7d76db00ac update 'SELinux not detected' message 2017-10-13 08:58:35 -06:00
bcambl
8aceb8bf53 replace deprecated colors in debug script 
- COL_LIGHT_GREEN  -> COL_GREEN
 - COL_LIGHT_RED    -> COL_RED
 - COL_LIGHT_PURPLE -> COL_PURPLE
 2017-10-12 23:33:28 -06:00
bcambl
a17d1be7a4 simplify selinux debug variables 2017-10-12 23:24:02 -06:00
bcambl
1e6cc63abe add SELinux checking to debug script 2017-10-12 20:55:14 -06:00
DL6ER
e0edac32c7 Merge pull request #1728 from pi-hole/new/nuke_lists 
Add nuclear option to list.sh
 2017-10-10 19:12:16 +02:00