Commit Graph

1038 Commits (7b8611ced064bb5f697a633f01e58828eb6e2e46)

Author SHA1 Message Date
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
5 years ago
Mcat12 5c4ee23795
Fix missed start_service -> restart_service call
5 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