pi-hole

Commit Graph

Author	SHA1	Message	Date
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>	4 years ago
Adam Warner	011fa8c6ea	fix sticklr complaint Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
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>	4 years ago
Dan Schaper	5f9dac8d2b	Merge pull request #3434 from pi-hole/new/os_detect Change OS Detection in debug script	4 years ago
Adam Warner	03a8cff55e	read > mapfile as suggested by @dschaper Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
DL6ER	2b1bc6a46e	Replace possible "\#" by "#". This fixes AdminLTE#1427 Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
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>	4 years ago
DL6ER	318ca75269	Merge branch 'development' into new/rev-server	4 years ago
Adam Warner	58724a38a9	Improve detection and display of supported/unsupported OS in debug script Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
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>	4 years ago
Thomas L. Kjeldsen	903808a477	Improved explanation of why this script is needed Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>	4 years ago
Thomas L. Kjeldsen	005da06b3d	Use PI_HOLE_BIN_DIR as introduced in PR #2886 Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>	4 years ago
Thomas L. Kjeldsen	852f6b95f5	Prevent "pihole disable $timeout" from messing up future state changes Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>	4 years ago
DL6ER	b60ec8a48f	Merge pull request #3248 from MichaIng/patch-8 Start pihole-FTL after network	4 years ago
DL6ER	27f0fd2372	Merge pull request #3415 from fhriley/reload_privacy Reload the lists, which will cause the cached privacy level to be upd…	4 years ago
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>	4 years ago
Adam Warner	b2ba55c27b	Show details of any remotes on the git repositories Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Frank Riley	9d04c517e6	Reload the lists, which will cause the cached privacy level to be updated. Signed-off-by: Frank Riley <fhriley@gmail.com>	4 years ago
DL6ER	b421e422c2	Merge pull request #3351 from marank/development Added support for CNAME record add/remove	4 years ago
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>	4 years ago
Dan Schaper	c76435883b	Merge pull request #3360 from dnicolson/fix-github-capitalisation Fix GitHub capitalisation	4 years ago
Dave Nicolson	ab753e88a2	Fix GitHub capitalisation Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>	4 years ago
Adam Warner	be25b4d9c4	Merge pull request #3352 from pi-hole/merge-master-dev Merge master dev	4 years ago
Adam Warner	9e96ff37de	Fix merge conflicts Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
DL6ER	a9c66c7b45	Implement pihole -a theme option Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Matthias Rank	2b9898e9ca	Fixed indentation Signed-off-by: Matthias Rank <development@m-rank.de>	4 years ago
Matthias Rank	0add5eb291	Added support for CNAME record add/remvoe Signed-off-by: Matthias Rank <development@m-rank.de>	4 years ago
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>	4 years ago
DL6ER	7cc35d3b04	Add update to gravity database version 12, renaming the Unassociated group to Default group. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	78469ee58d	Merge pull request #3255 from pi-hole/tweak/emailregex Enhanced email validation regex	4 years ago
Adam Warner	369288cc48	Update advanced/Scripts/webpage.sh Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>	4 years ago
Dan Schaper	017d405b28	Merge pull request #3307 from pi-hole/tweak/debugger_type_display Improve debugger database table printing	4 years ago
DL6ER	ddb354f78b	Add enable indentation for the domainlist Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
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>	4 years ago
DL6ER	ad5802715e	enabled field: Center 0, right-align 1 Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	989bbad37e	Remove pihole -a hostrecord Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	63f6c6a894	Add indentation for enabled and type fields Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Adam Warner	d42785a3bf	Merge pull request #3271 from pi-hole/tweak/version Add branch name to pihole -v	4 years ago
DL6ER	401c029dc4	Improve else condition of branch determination Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	0343171703	Add correct displaying for detached HEAD state. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
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>	4 years ago
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.	4 years ago
Adam Warner	3cc9ba4ee8	stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
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>	4 years ago
Adam Warner	851947bbf2	Add branch name to version output Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
DL6ER	093054a1eb	Automatically convert legacy IP range to Class C network Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	4130af0aab	Retain rev-server settings when the feature gets disabled. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	90a5a13197	Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	982c1b0059	Merge branch 'release/v5.0' into development Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Adam Warner	26f71e4dbe	accidentally a space Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Adam Warner	b6ac1585ec	add regex attribution Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
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>	4 years ago
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>	4 years ago
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>	4 years ago
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>	4 years ago
DL6ER	277179f150	Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	15a9d662ac	Add option --comment "whatever" for adding comments for new domains through the CLI interface. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
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>	4 years ago
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>	4 years ago
DL6ER	22ce5c0d70	Fix incorrect type description. (#3201 ) Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Dan Schaper	bf4fada3b7	Don't quote inside backticks, use unquoted variable. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	4 years ago
Dan Schaper	360d0e4e6b	Loop through array of lists. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	4 years ago
Dan Schaper	4f390ce801	Use bash regex instead of awk. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	4 years ago
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>	4 years ago
Adam Warner	4a5f344b09	then Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Adam Warner	af95e8c250	force `updatchecker.sh` run if any of the three components are updated Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
Dan Schaper	c5c414a7a2	Stickler Lint - quote to prevent splitting Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	4 years ago
DL6ER	d0e29ab7b0	Add human-readable output of time of the last gravity run. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	714a79ffce	Migrate debugger to domainlist and add printing of client table. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
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>	4 years ago
DL6ER	92aa510bda	Add timestamps and comment fields to clients. This updates the gravity database to version 11. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Dan Schaper	52e2a2610e	Merge pull request #3089 from pi-hole/tweak/gravity_db_10 Add gravity database 9->10 update script	4 years ago
DL6ER	3f9e79f152	Print human-readable timestamps in the debugger's gravity output Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	633e56e8a9	Add gravity database 9->10 update script. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
DL6ER	bb30c818ab	Update database version during migration. Signed-off-by: DL6ER <dl6er@dl6er.de>	4 years ago
Adam Warner	c944f6a320	Add a new migration script to fix the previous one Signed-off-by: Adam Warner <me@adamwarner.co.uk>	4 years ago
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>	4 years ago
DL6ER	37217ece73	Merge pull request #3049 from pi-hole/tweak/unique_group_name Group table enhancements	4 years ago
DL6ER	cda0133dd1	Revert "Change the regex used for domain validation" This reverts commit `76460f01e9`. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	eda7f40fef	Reinstall trigger that prevents group zero from being deleted. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	e589e665a7	Also add date_added and date_modified fields to group table. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	b32b5ad6e9	Update gravity database to version 8. This enforces uniqueness on the group name. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	e2de199f47	Merge pull request #3037 from pi-hole/new/group_zero Add special group zero to gravity database	5 years ago
DL6ER	a1633123aa	Merge pull request #3035 from pi-hole/fix/query_gravity pihole -q should also scan gravity table	5 years ago
DL6ER	2444296348	Again, Mr. Stickler Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	4be7ebe61f	Scan domainlist instead of view to also catch disabled domains. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	a720fe1789	Add client trigger. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	f0439c8d12	Add special group zero to gravity database. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	40e8657137	Please Mr. Stickler Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	922ce7359c	pihole -q should also scan gravity table Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	f482156cca	Merge branch 'development' into new/internal-blocking Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	807a5cfb23	Merge pull request #3015 from pi-hole/tweak/domainlist_table Unite four domain tables into a single domainlist table.	5 years ago
Adam Warner	eaf1244932	:dominik: Detect binary name before calling FTLcheckUpdate in update.sh Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
DL6ER	b6cd7b8e3d	Use more descriptive names instead of directly using the IDs in list.sh Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Adam Warner	869473172c	remove _ from regex descibers Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
Adam Warner	63e407cfdc	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	5 years ago
Adam Warner	0251117c77	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	5 years ago
Adam Warner	44e1455b12	Update advanced/Scripts/list.sh Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>	5 years ago
Adam Warner	76460f01e9	Change the regex used for domain validation Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
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>	5 years ago
Adam Warner	edaee4e962	remove redundant function and comments Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
Adam Warner	77bfb3fb67	tidy up variable usage in list.sh Remove some that are redundant Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
Adam Warner	6a881545b0	tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
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>	5 years ago
DL6ER	a1f120b2ff	Address stickler's complaint Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	185319d560	Unite four domain tables into a single domainlist table. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	5c6dd3f6f4	Merge pull request #2978 from Mograine/patch-1 Add commands to add/remove custom DNS records	5 years ago
Adam Warner	edcdf9f619	Merge pull request #3003 from pi-hole/fix/tbd FTL always determined.	5 years ago
Mograine	c809c34024	Add user feedback Signed-off-by: Mograine <ghiot.pierre@gmail.com>	5 years ago
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>	5 years ago
Adam Warner	eeb26e3975	Merge pull request #2990 from chrunchyjesus/unix-compliance make some shebangs comply to posix standard	5 years ago
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>	5 years ago
Mograine	b93628acb3	Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1	5 years ago
DL6ER	7f7b9d089c	Merge pull request #2965 from pi-hole/tweak/BackendChangesForAdlistComments backend changes to allow comment when adding new adlist	5 years ago
chrunchyjesus	476975540a	make some shebangs comply to posix standard	5 years ago
Mograine	193ff38ab3	Allow more precise deletion by passing ip as parameter Signed-off-by: Mograine <ghiot.pierre@gmail.com>	5 years ago
Pierre Ghiot	f9d16c2b15	Update webpage.sh Signed-off-by: Mograine <ghiot.pierre@gmail.com>	5 years ago
John Krull	c6f9fe3af2	Fix spelling of the word "permitting" Signed-off-by: John Krull <john.a.krull@gmail.com>	5 years ago
Adam Warner	5bac1ad58b	backend changes to allow comment when adding new adlist Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
DL6ER	d883854aad	Use constant for long path. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	756c99653e	Merge branch 'development' into new/internal-blocking	5 years ago
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>	5 years ago
Adam Warner	61a40c1b43	merge devel into 4.3.2 And Resolve merge conflicts Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
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>	5 years ago
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>	5 years ago
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>	5 years ago
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>	5 years ago
DL6ER	ffc91a6c81	Update view vw_gravity to only return domains from enabled adlists. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	aed2e35bc0	Print messages only after removing possible matches in comments. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	a7b44426cd	Merge pull request #2838 from pi-hole/new/whitelist-regex-support Whitelist regex support	5 years ago
Dan Schaper	b9fed8fca6	Merge pull request #2891 from niklasea/development Restore 'pihole -q' hosts format support and improve matching in edge cases	5 years ago
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>	5 years ago
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>	5 years ago
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>	5 years ago
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>	5 years ago
DL6ER	6faddfcd3d	Print timestamps in local time zone of the Pi-hole. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	1820c2c598	Merge branch 'development' into new/whitelist-regex-support Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	23b688287f	Fix indentation in query.sh. No functional change in this commit. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	42ccc1ef24	Add support for regex whitelist in "pihole -q". Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	cc40c18f49	Wrap upgrade script commands in a transaction. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	3e78ed95d4	Fix displaying options for table "group" in the debugger. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
snapsl	20a839fef5	fixed local declaration before assignment Signed-off-by: snapsl <chris.baller@gmx.de>	5 years ago
snapsl	b2d8c4374b	tweaked code style of webpage.sh Signed-off-by: snapsl <chris.baller@gmx.de>	5 years ago
DL6ER	dc93462d42	Group table has only two columns Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	af754e3fc4	Rearrange group tables directly next to the tables they refer to. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	06860ed5b4	Group tables have only two columns. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	09190c1735	Only check once for if this is a regex list or not. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	a95b473417	Rearranage if statements to ensure the proper output is shown for wildcard-style filters. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	6f58d58cae	Add --whitewild to help texts and man pages. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	40d0caa70b	Add undocumented --whitewild option that does the same --wild does for the whitelist. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	0692be9bae	Fix small mistake in 2->3 upgrade script. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	0d28dce326	Print group table contents in debug log. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	96031214c6	Add support for whitelist regex filter management via CLI. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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	5 years ago
Mark Drobnak	445127accc	Merge pull request #2832 from pi-hole/new/audit_database Migrate audit list to gravity.db database table	5 years ago
DL6ER	420f60b5c7	Add timeout to migration script (1->2). Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	65fdbc85d5	Add timeout to migration script (2->3). Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	87f75c737a	Review comments. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	5ff9052200	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mcat12	b154dd5f07	Quote calls to read FTL config Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
DL6ER	0683842ec3	Fix typo in 2->3 migration script. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	3d3fc2947e	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	8382f4d727	Rename table to domain_audit and simplify subroutine addAudit(). Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	be3e198f9a	Address linting errors. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	efe8216445	Fix further stickler complaint. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	0405aaa3da	Review comments and fixing stickler complaints. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	2fb4256f84	Rename table to "auditlist" Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	5293beeb77	Update audit script to store domains in new database table. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	0c8f5f1221	Remove comment field from audit table Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	4f4a12bb40	Upgrade database if necessary and store audit domains therein. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	1dbe6c83c3	Add database upgrading mechanism for adding the audit table. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mcat12	8d9ff550d4	Fix blockpage error if whitelisted, blacklisted, or regex filtered Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mark Drobnak	92c3c86be4	Merge pull request #2769 from pi-hole/new/arp-flush Add new "pihole arpflush" command	5 years ago
DL6ER	7a1b6fd205	Merge branch 'development' into new/gravity.db_domain_groups	5 years ago
MMotti	04abcb71f6	Fix potential invalid result for pihole -q Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
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>	5 years ago
DL6ER	6996ffa451	Also flush network_addresses table Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	c1495b0fa8	Merge branch 'development' into new/arp-flush	5 years ago
MMotti	bcf03647ef	Add comment and remove blankspace Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	a9d0690f4d	Change the case of some variables Just for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
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>	5 years ago
MMotti	785f1fedd9	Tidy regexp queries Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	cf21efa103	Minor grammar changes Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	7613e94ef6	Minor tweaks Mainly for consistency Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	b49c702f33	Consistency tweak Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	09532638d5	Read from DB instead of regex.list Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
MMotti	97df6d7415	Stickler fix Signed-off-by: MMotti <matthew.w.motti@gmail.com>	5 years ago
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>	5 years ago
Mark Drobnak	d92ced6fb6	Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database Query black and whitelists database	5 years ago
DL6ER	9ddce88092	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
Mark Drobnak	814fdcf9b6	Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names Add dhcp-ignore-names option when enabling DHCP service	5 years ago
DL6ER	5060605626	Print table name before entering the loop for the sake of simplicity Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	285e6fe090	Address lint complaints Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
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>	5 years ago
Mcat12	bfb99c361c	Note that the gravity size does not include the blacklist entries Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	5796054305	Increase ID column width to 4 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	a3e1473ac1	Set explicit column widths to prevent text from getting cut off Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	7b5fc60e00	Improve table formatting Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	807ce0af4e	Show whitelist, blacklist, and regexlist details Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	3f05efd60f	Add extra newline Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mcat12	03d93aa19a	Update debug script with gravity DB changes Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Dan Schaper	7de6bbca61	Merge branch 'development' into release/v4.3	5 years ago
Mcat12	8e1bf6e3d4	Merge branch 'development' into new/gravitydb # Conflicts: # advanced/Scripts/list.sh # gravity.sh # pihole	5 years ago
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>	5 years ago
DL6ER	a904c183df	Use printf to escape domain content. This prevents possible SQL injection issues Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	5246b3e496	Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot. Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	f80fdd7e83	Improve comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	6ba58896d2	Simplify code Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
Dan Schaper	5532df24e4	Pi-hole Debug - tricorder upload function calls Fix tricorder upload function calls to use new curl function.	5 years ago
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>	5 years ago
DL6ER	b372f808dd	Fix lint errors Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	bc9b623638	Modify query.sh to use the gravity database Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
pvogt09	8a92fb24c4	Incorporates changes requested by @Mcat12 Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	5 years ago
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>	5 years ago
Mark Drobnak	6812e8880e	Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg Fix chronometer refresh incorrectly reading the long argument sleep time	5 years ago
DL6ER	efeba594ae	Add support for manipulating adlists from the CLI Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	126f7101ff	Add (optional) date_modified field and use vw_whitelist view in vw_blacklist Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mcat12	b320e74921	Improve argument handling Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
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>	5 years ago
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>	5 years ago
DL6ER	3fe43ce1d9	Rely on default value (database provided) for date_added when adding a new domain Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	a891d64395	We should always exit after displaying a list, even if it is empty Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	6b1d2523e8	Also print datetime a domain was added when listing the domains on the CLI Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	08ee9526ad	Review comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
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>	5 years ago
DL6ER	43bced7997	Add more comments Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
DL6ER	e5d1cb5a2e	Rewrite list.sh to operate on database-based lists Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mark Drobnak	d2c7c426de	Fix teleporter backup file extension Fixes #2714 Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>	5 years ago
DL6ER	84244b7cd5	Fix indentation in display of branches available during pihole checkout Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
Adam Warner	a7f6c9b3a0	Ignore matches that start `# ` using negative lookbehind Signed-off-by: Adam Warner <me@adamwarner.co.uk>	5 years ago
DL6ER	2e17c23333	Don't warn if user is on development as this branch is constantly updated Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	63f3381a2b	Warn user if FTL is not on branch master Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
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>	5 years ago
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>	5 years ago

... 3 4 5 6 7 ...

1299 Commits (0be987239e3c5c6f88033844dc77c285bc73d185)