Commit Graph

443 Commits

Author SHA1 Message Date
DL6ER d992e929f4
Fix possible race-collision leading to a theoretical out-of-bounds read
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-22 22:49:20 +01:00
DL6ER c33643408a
Apply Pi-hole specific patches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-18 10:25:40 +02:00
DL6ER b66f7f1ba3
Update SQLite3 to 3.42.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-05-18 10:13:42 +02:00
DL6ER b87ef114ef
Merge pull request #1532 from pi-hole/new/adb_style_blocking
Add support for Adblock Plus domain lists
2023-03-11 15:18:29 -05:00
DL6ER 62ebd05496
Apply Pi-hole SQLite3 patches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-03-11 07:52:57 +01:00
DL6ER 1fe7bb6946
Update embedded SQLite3 engine to version 3.41.1
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-03-11 07:45:25 +01:00
DL6ER da118e87ce
Remove last traces of temporarily added benchmarking tools. Also remove the hint about ABP domains, this can easily be checked in gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-03-05 13:56:55 +01:00
DL6ER 06f0e0340e
Remove debugging timing output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-26 16:52:23 +01:00
DL6ER ae9b291082
Set abp_domains = 1 during the CI tests.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-26 07:19:48 +01:00
DL6ER ab2f652e22
Use property "abp_domains" from info table to decide whether ABP blocking is to be used or not. Also log when FTL enabled ABP-style blocking
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-25 22:29:17 +01:00
DL6ER ec82cd3dd4
Add timing for ABP style detection
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-25 18:37:40 +01:00
Dan Schaper 6f8ba76077
Update src/database/gravity-db.c
Spespellingllling

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2023-02-15 14:01:37 -08:00
Christian König d9c753be27
Fix spellcheck to get things deployed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-02-15 21:55:47 +01:00
DL6ER 80b5fa008c
Fix handling of rare (but possible) gravity database issues such as "list not available"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-15 21:27:12 +01:00
DL6ER 75cd6913ee
Do not use a new option but instead automatically detect if ABP-style domains are present in the database. This ensures that this addition comes at no extra costs to any installs using pure HOSTS-style adlists.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-15 21:19:31 +01:00
DL6ER 8794b1684d
Add ABP format blocking support for gravity. Note that the option needs to be switched on by setting GRAVITY_ABP_STYLE=true in pihole-FTL.conf to avoid running this computationally expensive task on the vast majority of user databases only fed from properly formatted HOSTS lists. Gravity can enable the setting when it detects ABP format automatically.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-02-15 19:48:19 +01:00
DL6ER f0b133b285
Always store time we start to save to the database (not only in debug mode). This avoids errorneous timing reports in case of errors.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-27 07:31:39 +01:00
DL6ER 3f1be06814
Fix logic for status code parsing
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-09 16:43:43 +01:00
DL6ER 983544e6d3
Fix incorrect DNSSEC-related warning during history import
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-12-03 12:43:20 +01:00
DL6ER 5252aeb077
Reference sqlite3ErrName instead of copying it. This requires SQLite3 patching
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-25 11:35:08 +01:00
DL6ER 51b2b71756
Print extended error code if anything in dbquery() fails. This will be helpful in a lot of cases where we'd only be logging 'disk I/O error' but a more specififc error is available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-25 11:32:15 +01:00
DL6ER cafa2eff8f
Merge pull request #1482 from pi-hole/update/sqlite_3.40.0
Update embedded SQLite3 engine to version 3.40.0
2022-11-17 12:51:42 +01:00
DL6ER bb57105001
Update embedded SQLite3 engine to version 3.40.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-16 17:58:46 +01:00
DL6ER af495664f9
Adlist warning -> ADLIST WARNING
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-15 21:28:38 +01:00
DL6ER fc212c383a
Always ensure FTL messages are unique
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-15 19:33:47 +01:00
DL6ER 7ecd358f96
Allow FTL to analyze stale cache replies. They are assigned to a new query type (17)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-11-09 20:09:48 +01:00
RD WebDesign e24e162da4
Fix comment
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-10-11 00:54:01 -03:00
DL6ER b2c3d4725c
Fix audit log SQL query
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-10-01 13:27:00 +02:00
DL6ER 4cd68092fe
Merge pull request #1409 from pi-hole/tweak/white_regex_id
Store domainlist IDs for blocked/permitted queries
2022-09-11 22:12:33 +02:00
DL6ER bea9630882
Apply suggestions from code review
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
2022-09-11 11:31:08 +02:00
Christian König 2a4d10e9f7
Apply reviewer's suggestions
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-06 19:54:07 +02:00
Christian König 5b20a7bc83
Only check enabled adlists
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-01 08:34:23 +02:00
Christian König 04133fb362
Log inaccesible adlists to message table
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-31 23:51:25 +02:00
DL6ER 1ccfd9a081
Ensure the API does not try to create DNS cache records for queries that don't have one
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-08-20 15:27:38 +02:00
DL6ER 15942b17ce
Store domainlist IDs for blocked/permitted queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-08-19 19:44:11 +02:00
Adam Warner 35bd9a63d1
[skip ci] a couple of spelling changes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-17 21:51:37 +01:00
DL6ER e9d4de40f6
Update SQLite3 from 3.39.0 to 3.39.2
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-25 15:34:48 +02:00
DL6ER dcc2e5d5a3
Change default log file path to /var/log/pihole/FTL.log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 18:36:39 +02:00
DL6ER 0890d35f0f
Updat embedded SQLite3 to version 3.39.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-06-29 20:00:01 +02:00
DL6ER add24af04f
Update SQLite to v3.38.5
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-05-19 09:48:14 +02:00
DL6ER 0cf7245f56
Update SQLite to v3.38.3
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-05-01 10:01:50 +02:00
DL6ER 613014e81a
Merge branch 'development' into new/query_special_domain
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-04-24 09:26:46 +02:00
DL6ER 7acd0f31e4
Add QUERY_SPECIAL_DOMAIN as new query status
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-04-24 09:10:38 +02:00
Adam Warner 671a438c4d
Fix some spellings, ignore others
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 18:26:31 +01:00
yubiuser 4f6f6caa41
Merge pull request #1322 from pi-hole/fix/negative_replies
Fix query counts
2022-04-02 20:20:19 +02:00
DL6ER 77c5665d64
Update SQLite to v3.38.2
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-27 10:30:00 +02:00
DL6ER 8734b60a53
Ensure we subtract from the old reply counter when reply type changes
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-26 13:24:08 +01:00
DL6ER fbe28c9f27
Update SQLite to v3.38.1
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-20 09:16:42 +01:00
DL6ER 213b7eb7f4
Adjust query type counters when importing from the database
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-18 13:05:19 +01:00
DL6ER 7f7dc2e9fa
Reload blocking mode independently of incoming queries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-03-01 04:27:40 +01:00