Commit Graph

1404 Commits (edbaf6d69756e15c109c04e1e6b14aaa93b9aa7f)

Author SHA1 Message Date
DL6ER 093054a1eb
Automatically convert legacy IP range to Class C network
4 years ago
DL6ER 4130af0aab
Retain rev-server settings when the feature gets disabled.
4 years ago
DL6ER 90a5a13197
Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically.
4 years ago
DL6ER 982c1b0059
Merge branch 'release/v5.0' into development
4 years ago
Adam Warner 26f71e4dbe
accidentally a space
4 years ago
Adam Warner b6ac1585ec
add regex attribution
4 years ago
Adam Warner a9b19df4ec
expand email validation regex to catch more valid emails see comments on PR #3254
4 years ago
M4x 2de5362adc
Sanitize email address in case of security issues (#3254)
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".
4 years ago
Adam Warner 7d19ee1b25
validate blocklist URL before adding to the database (#3237)
4 years ago
DL6ER 277179f150 Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover
4 years ago
DL6ER 15a9d662ac Add option --comment "whatever" for adding comments for new domains through the CLI interface.
4 years ago
XhmikosR 7b8611ced0
Assorted typo fixes. (#3126)
4 years ago
DL6ER 497bfd80a5
Update development from release/v5.0 (#3200)
4 years ago
DL6ER 22ce5c0d70
Fix incorrect type description. (#3201)
4 years ago
Dan Schaper bf4fada3b7
Don't quote inside backticks, use unquoted variable.
4 years ago
Dan Schaper 360d0e4e6b
Loop through array of lists.
4 years ago
Dan Schaper 4f390ce801
Use bash regex instead of awk.
4 years ago
Adam Warner 8ecaaba247
Compare daemons to expected results. (#3158) (#3159)
4 years ago
Adam Warner 4a5f344b09
then
4 years ago
Adam Warner af95e8c250
force `updatchecker.sh` run if any of the three components are updated
4 years ago
Dan Schaper c5c414a7a2
Stickler Lint - quote to prevent splitting
4 years ago
DL6ER d0e29ab7b0 Add human-readable output of time of the last gravity run.
4 years ago
DL6ER 714a79ffce Migrate debugger to domainlist and add printing of client table.
4 years ago
DL6ER cd3ad0bdc7 Show info table instead of counting domains to speed up the debugging process on low-end hardware drastically.
4 years ago
DL6ER 92aa510bda
Add timestamps and comment fields to clients. This updates the gravity database to version 11.
5 years ago
Dan Schaper 52e2a2610e
Merge pull request #3089 from pi-hole/tweak/gravity_db_10
5 years ago
DL6ER 3f9e79f152
Print human-readable timestamps in the debugger's gravity output
5 years ago
DL6ER 633e56e8a9
Add gravity database 9->10 update script.
5 years ago
DL6ER bb30c818ab
Update database version during migration.
5 years ago
Adam Warner c944f6a320
Add a new migration script to fix the previous one
5 years ago
Adam Warner aa4c0ff329
Don't create trigger with duplicate name until after old table is deleted
5 years ago
DL6ER 37217ece73
Merge pull request #3049 from pi-hole/tweak/unique_group_name
5 years ago
DL6ER cda0133dd1
Revert "Change the regex used for domain validation"
5 years ago
DL6ER eda7f40fef
Reinstall trigger that prevents group zero from being deleted.
5 years ago
DL6ER e589e665a7
Also add date_added and date_modified fields to group table.
5 years ago
DL6ER b32b5ad6e9
Update gravity database to version 8. This enforces uniqueness on the group name.
5 years ago
DL6ER e2de199f47
Merge pull request #3037 from pi-hole/new/group_zero
5 years ago
DL6ER a1633123aa
Merge pull request #3035 from pi-hole/fix/query_gravity
5 years ago
DL6ER 2444296348
Again, Mr. Stickler
5 years ago
DL6ER 4be7ebe61f
Scan domainlist instead of view to also catch disabled domains.
5 years ago
DL6ER a720fe1789
Add client trigger.
5 years ago
DL6ER f0439c8d12
Add special group zero to gravity database.
5 years ago
DL6ER 40e8657137
Please Mr. Stickler
5 years ago
DL6ER 52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled
5 years ago
DL6ER 922ce7359c
pihole -q should also scan gravity table
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.
5 years ago
DL6ER f482156cca
Merge branch 'development' into new/internal-blocking
5 years ago
DL6ER 807a5cfb23
Merge pull request #3015 from pi-hole/tweak/domainlist_table
5 years ago
Adam Warner eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh
5 years ago
DL6ER b6cd7b8e3d
Use more descriptive names instead of directly using the IDs in list.sh
5 years ago
Adam Warner 869473172c
remove _ from regex descibers
5 years ago
Adam Warner 63e407cfdc
Update advanced/Scripts/list.sh
5 years ago
Adam Warner 0251117c77
Update advanced/Scripts/list.sh
5 years ago
Adam Warner 44e1455b12
Update advanced/Scripts/list.sh
5 years ago
Adam Warner 76460f01e9
Change the regex used for domain validation
5 years ago
Adam Warner 4b8a72fda7
functionise parameter discovery
5 years ago
Adam Warner edaee4e962
remove redundant function and comments
5 years ago
Adam Warner 77bfb3fb67
tidy up variable usage in list.sh Remove some that are redundant
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
5 years ago
DL6ER a1f120b2ff
Address stickler's complaint
5 years ago
DL6ER 185319d560
Unite four domain tables into a single domainlist table.
5 years ago
DL6ER 5c6dd3f6f4
Merge pull request #2978 from Mograine/patch-1
5 years ago
Adam Warner edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd
5 years ago
Mograine c809c34024 Add user feedback
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.
5 years ago
Adam Warner eeb26e3975
Merge pull request #2990 from chrunchyjesus/unix-compliance
5 years ago
Adam Warner 12817c09bb
(Squashed commits)
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
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
5 years ago
Pierre Ghiot f9d16c2b15 Update webpage.sh
5 years ago
John Krull c6f9fe3af2 Fix spelling of the word "permitting"
5 years ago
Adam Warner 5bac1ad58b
backend changes to allow comment when adding new adlist
5 years ago
DL6ER d883854aad
Use constant for long path.
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.
5 years ago
Adam Warner 61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
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.
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.
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.
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.
5 years ago
DL6ER ffc91a6c81
Update view vw_gravity to only return domains from enabled adlists.
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.
5 years ago
DL6ER aed2e35bc0
Print messages only after removing possible matches in comments.
5 years ago
DL6ER a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support
5 years ago
Dan Schaper b9fed8fca6
Merge pull request #2891 from niklasea/development
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.
5 years ago
Niklas Elmose Andersen a3e32d9a15 Properly escape domain regex
5 years ago
Niklas Elmose Andersen 989d1aff60 Restore and improve 'pihole -q' matching
5 years ago
Dan Schaper 03c65dd0e9
Convert hardcoded /usr/local/bin to variable
5 years ago
DL6ER 6faddfcd3d
Print timestamps in local time zone of the Pi-hole.
5 years ago
DL6ER 1820c2c598
Merge branch 'development' into new/whitelist-regex-support
5 years ago
DL6ER 23b688287f
Fix indentation in query.sh. No functional change in this commit.
5 years ago
DL6ER 42ccc1ef24
Add support for regex whitelist in "pihole -q".
5 years ago
DL6ER cc40c18f49
Wrap upgrade script commands in a transaction.
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.
5 years ago
DL6ER 3e78ed95d4
Fix displaying options for table "group" in the debugger.
5 years ago
snapsl 20a839fef5 fixed local declaration before assignment
5 years ago
snapsl b2d8c4374b tweaked code style of webpage.sh
5 years ago
DL6ER dc93462d42
Group table has only two columns
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"
5 years ago
DL6ER af754e3fc4
Rearrange group tables directly next to the tables they refer to.
5 years ago
DL6ER 06860ed5b4
Group tables have only two columns.
5 years ago
DL6ER 09190c1735
Only check once for if this is a regex list or not.
5 years ago
DL6ER a95b473417
Rearranage if statements to ensure the proper output is shown for wildcard-style filters.
5 years ago
DL6ER 6f58d58cae
Add --whitewild to help texts and man pages.
5 years ago
DL6ER 40d0caa70b
Add undocumented --whitewild option that does the same --wild does for the whitelist.
5 years ago
DL6ER 0692be9bae
Fix small mistake in 2->3 upgrade script.
5 years ago
DL6ER 0d28dce326
Print group table contents in debug log.
5 years ago
DL6ER 96031214c6
Add support for whitelist regex filter management via CLI.
5 years ago
Mark Drobnak ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists
5 years ago
Mark Drobnak 445127accc
Merge pull request #2832 from pi-hole/new/audit_database
5 years ago
DL6ER 420f60b5c7
Add timeout to migration script (1->2).
5 years ago
DL6ER 65fdbc85d5
Add timeout to migration script (2->3).
5 years ago
DL6ER 87f75c737a
Review comments.
5 years ago
DL6ER 5ff9052200
Review comments
5 years ago
Mcat12 b154dd5f07
Quote calls to read FTL config
5 years ago
DL6ER 0683842ec3
Fix typo in 2->3 migration script.
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.
5 years ago
DL6ER 3d3fc2947e
Review comments
5 years ago
Mcat12 e8e5d4afda
Get file locations of FTL files from the config
5 years ago
DL6ER 8382f4d727
Rename table to domain_audit and simplify subroutine addAudit().
5 years ago
DL6ER be3e198f9a
Address linting errors.
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.
5 years ago
DL6ER efe8216445
Fix further stickler complaint.
5 years ago
DL6ER 0405aaa3da
Review comments and fixing stickler complaints.
5 years ago
DL6ER 2fb4256f84
Rename table to "auditlist"
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.
5 years ago
DL6ER 5293beeb77
Update audit script to store domains in new database table.
5 years ago
DL6ER 0c8f5f1221
Remove comment field from audit table
5 years ago
DL6ER 4f4a12bb40
Upgrade database if necessary and store audit domains therein.
5 years ago
DL6ER 1dbe6c83c3
Add database upgrading mechanism for adding the audit table.
5 years ago
Mcat12 8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
5 years ago
Mark Drobnak 92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush
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
5 years ago
DL6ER 1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name.
5 years ago
DL6ER 6996ffa451
Also flush network_addresses table
5 years ago
DL6ER c1495b0fa8
Merge branch 'development' into new/arp-flush
5 years ago
MMotti bcf03647ef Add comment and remove blankspace
5 years ago
MMotti a9d0690f4d Change the case of some variables
5 years ago
MMotti 10fbed50f3 Shellcheck
5 years ago
MMotti 785f1fedd9 Tidy regexp queries
5 years ago
MMotti cf21efa103 Minor grammar changes
5 years ago
MMotti 7613e94ef6 Minor tweaks
5 years ago
MMotti b49c702f33 Consistency tweak
5 years ago
MMotti 09532638d5 Read from DB instead of regex.list
5 years ago
MMotti 97df6d7415 Stickler fix
5 years ago
MMotti 54bfaa28c1 Fix for regexp queries through pihole -q
5 years ago
Mark Drobnak d92ced6fb6
Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database
5 years ago
DL6ER 9ddce88092
Review comments
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.
5 years ago
Mark Drobnak 814fdcf9b6
Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names
5 years ago
DL6ER 5060605626
Print table name before entering the loop for the sake of simplicity
5 years ago
DL6ER 285e6fe090
Address lint complaints
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
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.
5 years ago
Mcat12 bfb99c361c
Note that the gravity size does not include the blacklist entries
5 years ago
Mcat12 5796054305
Increase ID column width to 4
5 years ago
Mcat12 a3e1473ac1
Set explicit column widths to prevent text from getting cut off
5 years ago
Mcat12 7b5fc60e00
Improve table formatting
5 years ago
Mcat12 807ce0af4e
Show whitelist, blacklist, and regexlist details
5 years ago
Mcat12 3f05efd60f
Add extra newline
5 years ago
Mcat12 03d93aa19a
Update debug script with gravity DB changes
5 years ago
Dan Schaper 7de6bbca61
Merge branch 'development' into release/v4.3
5 years ago
Mcat12 8e1bf6e3d4
Merge branch 'development' into new/gravitydb
5 years ago
mpiederiet 3220e2b978
Fix for preventing git error message in cron logs
5 years ago
DL6ER a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues
5 years ago
DL6ER 5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot.
5 years ago
DL6ER f80fdd7e83
Improve comments
5 years ago
DL6ER 6ba58896d2
Simplify code
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)
5 years ago
Dan Schaper 5532df24e4
Pi-hole Debug - tricorder upload function calls
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.
5 years ago
DL6ER b372f808dd
Fix lint errors
5 years ago
DL6ER bc9b623638
Modify query.sh to use the gravity database
5 years ago
pvogt09 8a92fb24c4 Incorporates changes requested by @Mcat12
5 years ago
pvogt09 5c575e73c7 Adds world readable attribute to files created by Pi-hole to circumvent #2724
5 years ago
Mark Drobnak 6812e8880e
Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg
5 years ago
DL6ER efeba594ae
Add support for manipulating adlists from the CLI
5 years ago
DL6ER 126f7101ff
Add (optional) date_modified field and use vw_whitelist view in vw_blacklist
5 years ago
Mcat12 b320e74921
Improve argument handling
5 years ago
Mcat12 add5e4ca5e
Explicitly allow only -r and --refresh in argument handler
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)
5 years ago
DL6ER 3fe43ce1d9
Rely on default value (database provided) for date_added when adding a new domain
5 years ago
DL6ER e04dc9d2bb
Remove sqlitekey variable as the first column of the regex table is now called domain as well
5 years ago
DL6ER a891d64395
We should always exit after displaying a list, even if it is empty
5 years ago
DL6ER 6b1d2523e8
Also print datetime a domain was added when listing the domains on the CLI
5 years ago
DL6ER 08ee9526ad
Review comments
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.
5 years ago
DL6ER cce66a13b6
Fix output in list.sh when adding a domain that is already present in the target list
5 years ago
DL6ER 43bced7997
Add more comments
5 years ago
DL6ER 788cd78321
Reduce code duplication and add special handling of | character as it might appear in regex filter string
5 years ago
DL6ER e5d1cb5a2e
Rewrite list.sh to operate on database-based lists
5 years ago
Mark Drobnak d2c7c426de
Fix teleporter backup file extension
5 years ago
DL6ER 84244b7cd5
Fix indentation in display of branches available during pihole checkout
5 years ago
Mcat12 422680ee9f
Fix chronometer refresh incorrectly reading the long argument sleep time
5 years ago
Adam Warner a7f6c9b3a0
Ignore matches that start `# ` using negative lookbehind
5 years ago
DL6ER 2e17c23333
Don't warn if user is on development as this branch is constantly updated
5 years ago
DL6ER 63f3381a2b
Warn user if FTL is not on branch master
5 years ago
Dan Schaper 71cd6c137b Use `curl` instead of `openssl` for transmission of unmodified
5 years ago
Adam Warner a145f1d931
Be more verbose with debug script output
5 years ago
Mcat12 26f2410fe6
Change /var/run/shm to /dev/shm
6 years ago
Mcat12 5c4ee23795
Fix missed start_service -> restart_service call
6 years ago
Mark Drobnak a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm
6 years ago
DL6ER 5ffc8c7443
List content of /var/run/shm in debugger
6 years ago
Mark Drobnak ed5869646f
Use source instead of dot for setupVars
6 years ago
Mcat12 be2d494fcf
Don't show web version in pihole -v output if not installed
6 years ago
Mcat12 1cad069050
Add privacy level 4 to all privacy level code
6 years ago
Dan Schaper 916b2920be
Merge pull request #2525 from pi-hole/release/v4.1
6 years ago
Dan Schaper 9f672593bc
Update advanced/Scripts/webpage.sh
6 years ago
DL6ER a285ae65fb
Backend changes for DHCPv4 rapid commit support
6 years ago
Mcat12 9d59da8974
Remove dnsmasq checks from debugger
6 years ago
Mark Drobnak bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check
6 years ago
Dan Schaper a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
6 years ago
Dan Schaper 72829be281
Remove shellcheck overrides
6 years ago
Adam Warner d57f9906bd
read -r -a, not read -a -r
6 years ago
Adam Warner 3d4fea6510
Move -r to before the -p
6 years ago
bcambl 3ec84553ef fix debug service check via sysvinit
6 years ago
WaLLy3K 180d29c7b3
Prevent BASH from expanding Web Password
6 years ago
Mark Drobnak 85dceb12a1
Use curl -s instead of -q
6 years ago
Mcat12 d55012f724
Append versions (after the first) instead of overwriting in updatecheck
6 years ago
Mcat12 7c6eecc9c8
Ignore shellcheck warning
6 years ago
Mcat12 e4cbf5023a
Fix error when reading in new password
6 years ago
Mark Drobnak 46356d3027
Merge pull request #2434 from pi-hole/fix/2200
6 years ago
Mark Drobnak a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
6 years ago
Mark Drobnak cedc39bf09
Merge pull request #2426 from mrmajik45/master
6 years ago
Adam Warner 0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this.
6 years ago
Adam Warner 7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed.
6 years ago
mrmajik45 0f509f4a34
Update piholeDebug.sh
6 years ago
WaLLy3K 24e1dc92ba
Resolve issue #2428
6 years ago
mrmajik45 00f98543ad
read without -r will mangle backslashes.
6 years ago
mrmajik45 8684356b44
read without -r will mangle backslashes.
6 years ago
Mark Drobnak dac27f1f18
Only get the first gateway for chronometer
6 years ago
Mark Drobnak 6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
6 years ago
DL6ER 40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
6 years ago
Mcat12 f141b9f778
Add support for privacy level 4
6 years ago
DL6ER ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
6 years ago
DL6ER 165affc39b
list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location
6 years ago
DL6ER f794018e0c
Acknowledge temporary file if disabled for "pihole -b" command
6 years ago
DL6ER 94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list
6 years ago
WaLLy3K eef948d797
Fix header newlines
6 years ago
Mcat12 e4e22fb58e
Fix permissive regex
6 years ago
Mcat12 7086a400e8
Use simpler regex format for wildcards
6 years ago
Adam Warner 9b1356ad01
Revert #2282
6 years ago
Peter Robinson 45521b377a Use ip route rather than old net-tools route in chronometer.sh
6 years ago
Mcat12 03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
6 years ago
Dan Schaper ba7782f867
Space/Tab piholeDebug.sh
6 years ago
Dan Schaper c5091b0e49
Space/Tab wildcard_regex_converter.sh
6 years ago
Dan Schaper b54e32f0ca
Space/Tab webpage.sh
6 years ago
Dan Schaper 328e7738d5
Space/Tab version.sh
6 years ago
Dan Schaper aca359c2e2
Space/Tab updatecheck.sh
6 years ago
Dan Schaper 1cd40dc9e5
Space/Tab update.sh
6 years ago
Dan Schaper dc9407281f
Space/Tab setupLCD.sh
6 years ago
Dan Schaper 8f727c1f35
Space/Tab query.sh
6 years ago
Dan Schaper a08ea28feb
Space/Tab piholeLogFlush.sh
6 years ago
Dan Schaper c5535dd9a0
Space/Tab piholeCheckout.sh
6 years ago
Dan Schaper 3519cc5e44
Space/Tab list.sh
6 years ago
Dan Schaper d251bbbb05
Space/Tab chronometer.sh
6 years ago
Dan Schaper 76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck
6 years ago
RamSet 56b04017e7 Port 53 check updated with 4 spaces.
6 years ago
Mcat12 f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex
6 years ago
Dan Schaper dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
6 years ago
Mcat12 941a766aa3
Replace -wild and -regex with --wild and --regex
6 years ago
Mcat12 1b276a74fe
Display all lines of a list, even if there is no newline at the end
6 years ago
Mcat12 8084c4b2a3
Fix regex period substitution due to switching to bashism
6 years ago
Mcat12 1ca852191f
Fix stickler complaints
6 years ago
Mcat12 af5fc6547a
Fix echoing wrong domain when converting wildcard
6 years ago
Mcat12 70f2b26c86
Escape periods in wildcard converted regex filters.
6 years ago
Mcat12 cfd95dbe87
Fix incorrect variable usage
6 years ago
Mcat12 c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
6 years ago
Mcat12 d21298c156
Add back conditional forwarding to webpage.sh
6 years ago
Mcat12 4763969c8f
Move processWildcards to query.sh
6 years ago
Mcat12 f868052062
Fix incorrect variable string substitution
6 years ago
Mcat12 0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12 3077c22e4f
Change help strings from wildcard to regex blacklist
6 years ago
Mcat12 0decc37b5a
Appease stickler
6 years ago
Mcat12 4a953b66e0
Make removing regex domains work correctly
6 years ago
Mcat12 8435eeed4d
Don't validate regex domains
6 years ago
Mcat12 cffb4de83b
Use strict grep instead of regex for duplicates
6 years ago
Mcat12 868948509a
Split declaration and assignment of random_url
6 years ago
Mark Drobnak e71492a2b3
Update debug script for simple list format
6 years ago
DL6ER 2809579dd7
Refine regex filter generation
6 years ago
DL6ER c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine
6 years ago
DL6ER cd026cd865
Add comment where regexList is defined
6 years ago
DL6ER bc705aac03
Add automated wildcard list -> regex filter conversion
6 years ago
Rob Gill 23adbf9540
remove quotes
6 years ago
Rob Gill a7347238e6
$adListsList replace filename in text
6 years ago
Rob Gill bf55666492
Appease stickler.
6 years ago
Rob Gill 8ab0b0e460
colfile
6 years ago
Rob Gill b8e1849cec
wildcardlist
6 years ago
Rob Gill 45a8eda49b
Stop grep leak in query
6 years ago
DL6ER d254d6075a
First step from wildcards to regex lists for blocking
6 years ago
Adam Warner f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions
6 years ago
Mark Drobnak ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists
6 years ago
Mark Drobnak 9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports
6 years ago
Mark Drobnak f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale
6 years ago
DL6ER 2ef76d5e31
Remove LOCAL_DNS_PORT support
6 years ago
Adam Warner a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
6 years ago
MichaIng 43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115
6 years ago
Adam Warner ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115
6 years ago
Dan acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
DL6ER ce35509a40
Change command to "pihole -a localdnsport X"
6 years ago
DL6ER 24b8b4e904
Add backend changes for supporting a local recursive DNS server
6 years ago
Adam Warner 6977f655e3
fix a typo
6 years ago
Adam Warner e6fc9dc75d
disable 2016 in two places and declare local variables
6 years ago
Adam Warner b57b3f4588
Disable SC2001 for generation of `the_os`
6 years ago
Adam Warner 776ae92416
fix some shellcheck/stickler compaints in debug script
6 years ago
Adam Warner 6ba53c1ac0
Merge branch 'development' into FTLDNS
6 years ago
Mark Drobnak d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
6 years ago
Adam Warner bca23dd896
Allow passing of --check-only to update script.
6 years ago
Daniel (Fourdee) 3a483a1b20 install_web_server
6 years ago
Adam Warner 310d33b8ee
Merge dev > FTLDNS fix merge conflicts
6 years ago
Adam Warner 8b5dcc3872
Match change made by 7edab27 to prevent merge conflict
6 years ago
Ludovic Rousseau 7edab27e53 Stylistic change to use an explicit if/then/fi
6 years ago
Ludovic Rousseau 9b3531f634 Fix stylistic issue
6 years ago
Ludovic Rousseau d8f85a8981 Avoid a "No such file or directory" error
6 years ago
Ludovic Rousseau 3b229489c2 Fix regex to find DBFILE= from configuration file
6 years ago
Jacob Salmela 5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting
6 years ago
Dan Schaper 250b445eee
Split declaration and population for stickler.
6 years ago
DL6ER 82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found
6 years ago
DL6ER 6086614274
Add "-l, privacylevel" description to "pihole -a"
6 years ago
Adam Warner 6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
6 years ago
Adam Warner 631f5b4848 Change order of updatable components to match the end output
6 years ago
DL6ER 4941e0f8ad
Backend changes needed to be able to set the privacy level
6 years ago
Adam Warner f37b2bc7c1
move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first
6 years ago
Adam Warner 56278c6394
Fix shellcheck complaints
6 years ago
Adam Warner b1d6c03190
Break out binary name funtion to it's own function
6 years ago
Mark Drobnak bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
6 years ago
Jacob Salmela 1a275ba184
debug user locale; improve function to parse variables and files
6 years ago
Perflyst 3390fbf238 Add RaspberryPi 3B+
6 years ago
Jacob Salmela 68c27eb2a1
add label to x-header so you know which one is being evaluated
6 years ago
Jacob Salmela 143e75d213
fix empty ports on some systems
6 years ago
Adam Warner fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file.
6 years ago
Jacob Salmela d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
6 years ago
Jacob Salmela 7159ecb632
reduce ping times for faster script completion
6 years ago
Adam Warner 76cb129d3c
don't forget `master` and `development` branches!
6 years ago
Adam Warner 246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
6 years ago
Ryan Knapper 5ecfc58e5f
Require exact match
6 years ago
Ryan Knapper c17d95bfed
Proper output for debug CPU detection
6 years ago
Mark Drobnak f14184df30
Merge pull request #1982 from LudovicRousseau/master
6 years ago
Ludovic Rousseau 47bbea9ba7 Use " " to protect parameter substitution
6 years ago
Mark Drobnak 7265935cd4
Merge pull request #1915 from ryanknapper/development
6 years ago
Ludovic Rousseau b7891f92a5 Create blacklist.txt if not existant
6 years ago
DL6ER b8eaa9a527
Use double quotes to precent globbing and word splitting
6 years ago
DL6ER 5d274008db
Use possibly user-defined database location when flushing
6 years ago
Ryan Knapper f2b3752f3d
lan to local
7 years ago
Ryan Knapper 36945a67d0
Prevent redundant entries in to adlists.list
7 years ago
DL6ER 4c249a1186
Flush most recent 24 hours from FTL's database
7 years ago
DL6ER 158ea1d43b
Add sqlite3 dependency
7 years ago
DL6ER 52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains
7 years ago
ryanknapper 607664c860
Update webpage.sh
7 years ago
Vasilis Gerakaris 939806f021
piholeDebug.sh: Correct typo mistake
7 years ago
DL6ER 793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}"
7 years ago
DL6ER 9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf
7 years ago
DL6ER afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1"
7 years ago
Adam Warner 8e0d76b63b
initiated -> initialized
7 years ago
DL6ER cca8412921
Use "echo -n" to avoid haveing newlines in the files
7 years ago
DL6ER d15a5ad5c1
Add required documentation in the source code
7 years ago
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...
7 years ago
Dan Schaper 8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
7 years ago
DL6ER be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready
7 years ago
DL6ER cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
7 years ago
DL6ER 8a243c5872 Insert also old trust anchor
7 years ago
DL6ER b30b3f3aeb Update DNSSEC trust anchor
7 years ago
DL6ER 05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
7 years ago
Jacob Salmela 28bed0041e
remove comment
7 years ago
Jacob Salmela 6f03e30151
fixes #1537 by checking if systemctl is found
7 years ago
Adam Warner a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
7 years ago
Adam Warner 162a7b56fe
force mode is no longer referenced. Regression. Same with `domToRemoveList`
7 years ago
WaLLy3K 2dc1851892
Allow passwords with spaces
7 years ago
Jacob Salmela 9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
7 years ago
DL6ER 90efa3b610
Simplify git subroutines
7 years ago
Adam Warner 5221767a70
Merge pull request #1735 from bcambl/debug_selinux
7 years ago
DL6ER 0db76aada0
Silence errors when directory to be checked does not exist (system may have been installed without a web interface!)
7 years ago
DL6ER 9be854031f
Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way
7 years ago
DL6ER 709851503f
Use "pihole-FTL branch" to get FTL's branch
7 years ago
DL6ER 6ca47dc3b3
Add bash / cron based update checker for Pi-hole
7 years ago
WaLLy3K 2390b80359 Silence non-numeric domains_being_blocked output
7 years ago
bcambl 0f868f7649 remove un-used DONE variable
7 years ago
bcambl 31730e7197 add missing colors to COL_TABLE fallback
7 years ago
bcambl 7d76db00ac update 'SELinux not detected' message
7 years ago
bcambl 8aceb8bf53 replace deprecated colors in debug script
7 years ago
bcambl a17d1be7a4 simplify selinux debug variables
7 years ago
bcambl 1e6cc63abe add SELinux checking to debug script
7 years ago
DL6ER e0edac32c7 Merge pull request #1728 from pi-hole/new/nuke_lists
7 years ago
WaLLy3K bd33018660 Shellcheck OR validation
7 years ago
Mcat12 67a5594909 Allow emails which include `-h` in them
7 years ago
DL6ER 70ad656af0
Save backup as ".bck~" to prevent reading of the file by dnsmasq
7 years ago
DL6ER f22b83d379
Create a backup before emptying the list
7 years ago
DL6ER 114f84c948
Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content
7 years ago
DL6ER ee2169dd13
Merge branch 'development' into tweak/gravity
7 years ago
WaLLy3K 28063aa7f7 Add administrative contact address functionality
7 years ago
WaLLy3K 34ae4844fa Merge branch 'development' into tweak/gravity
7 years ago
DL6ER b8fedf76cd Merge pull request #1572 from pi-hole/gedetil-development
7 years ago
DL6ER c9d4995900
Update to comply with current development code
7 years ago
DL6ER 279e809aaf
Use `poweroff` instead of `halt`
7 years ago