arno
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity
5675 Commits
16 Branches
108 Tags
34 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'c6d1137eb0'
${ noResults }
Commit Graph

488 Commits (c6d1137eb0948ed14a8b0b8895eb44736449eca3)

Author SHA1 Message Date
DL6ER 2cec9eaf65
Merge pull request #3033 from pi-hole/fix/duplicates_in_adlists
4 years ago
DL6ER 779fe670f7
Show full URL during gravity download instead of only domain and file
5 years ago
DL6ER 570a7a5c11
Use sort -u instead of uniq as it is guaranteed to be safe when doing inline file operations.
5 years ago
DL6ER bd1b004d94
Remove possible duplicates found in lower-quality adlists
5 years ago
Adam Warner d29947ba32
optimise gravity list inserts
5 years ago
Adam Warner 1f03faddef
shell check recomends
5 years ago
DL6ER 3231e5c3ba
Address stickler requests.
5 years ago
DL6ER 0c5185f8ba
Also display how many unique domains we have caught in the event horizon.
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
DL6ER 756c99653e
Merge branch 'development' into new/internal-blocking
5 years ago
Adam Warner 61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
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
Adam Warner 8bef5dc805
remove n from -ne
5 years ago
Adam Warner ad41bcca5a
Remove support for adblock style lists to prevent false positives
5 years ago
DL6ER ca8982494b
Store timestamp when the gravity table was last updated successfully. This fixes https://github.com/pi-hole/AdminLTE/issues/989
5 years ago
DL6ER 1820c2c598
Merge branch 'development' into new/whitelist-regex-support
5 years ago
Andreas c53be459c6
quick fix for when dig also returns a CNAME
5 years ago
DL6ER 4371c9ba03
Ensure proper permissions are set for gravity.db after creation.
5 years ago
Andreas 63230cb72d
quick fix for when dig also returns a CNAME
5 years ago
DL6ER 5ff9052200
Review comments
5 years ago
DL6ER f5121c64be
We should still add the regex lines (initially) to the regex table as the renaming will happen only after the importing.
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 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 0405aaa3da
Review comments and fixing stickler complaints.
5 years ago
DL6ER 2fb4256f84
Rename table to "auditlist"
5 years ago
DL6ER 4f4a12bb40
Upgrade database if necessary and store audit domains therein.
5 years ago
DL6ER 7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
5 years ago
DL6ER f91421418a
Rename adlists -> adlist table.
5 years ago
DL6ER 87c115fc86
Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently.
5 years ago
DL6ER d5e8f1a781
Add 10 seconds timeout to the sqlite3 command that writes tables to the gravity database. This prevents gravity from failing when the database file is locked for a short time.
5 years ago
DL6ER cbc210b014
Add adlist_groups and mark group_id columns as NOT NULL.
5 years ago
Chris Crocker-White 69dba022c4 Handle an empty local.list
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
pvogt09 3f90261520 Moves chmod after every creation of ${destination} instead of end of function
5 years ago
pvogt09 225285cb97 Removes chmod for ${source} and superfluous chmod for ${destination}
5 years ago
pvogt09 a3d2a1062f Makes blocklists world readable
5 years ago
Mcat12 ec06fd0ad4
Fix incorrect adlist query when an adlist is blocked during gravity
5 years ago
DL6ER 0cfecd31d3
Invert logic to reduce nesting
5 years ago
DL6ER 008e88b84b
Only migrate legacy list files when we create gravity.db in the same gravity run
5 years ago
DL6ER 540c57f755
Add comment for automigrated list entries
5 years ago
DL6ER 983117d788
Add id (primary key, autoincrement) field to lists tables
5 years ago
DL6ER b372f808dd
Fix lint errors
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
DL6ER a932209143
Set default for date_modified to be the current time
5 years ago
DL6ER 4946b5907b
Move migrated files to backup directory instead of deleting them. This has the benefit that gravity.db can be recreated at any time by: 1. deleting gravity.db, 2. copying all files from the migration_backup directory back to /etc/pihole, 3. running pihole -g again.
5 years ago
Mark Drobnak 4596d9a577
Merge branch 'development' into new/gravitydb
5 years ago
DL6ER 8524aecfed
Don't set gravity database permissions
5 years ago
DL6ER 3dcb9722d3
Remove global haveSourceUrls variable and just skip downloading and processing adlists if there aren't any to be downloaded
5 years ago
DL6ER bd0215524b
Add vw_adlists view which returns only enabled adlists
5 years ago
DL6ER 53e3ff2b24
Only add non-empty lines when moving file content into database tables
5 years ago
DL6ER 0efc46260f
Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file
5 years ago
DL6ER d94bbfca7f
Finish migrating gravity.db to using our new gravity database. This removes the --skip-download, --blacklist-only, --whitelist-only, and --wildcard-only options as it is not necessary to run gravity when modifying them from now on (gravity really only builds the gravity database and the local.list file).
5 years ago
DL6ER 465a39427b
Source adlists from gravity database
5 years ago
DL6ER 2664ac0efc
Improve error reporting
5 years ago
DL6ER c1277705d8
Copy existing whitelist.txt, blacklist.txt, regex.list, and adlists.list to the database. We remove the files afterwards as the content lives in the database now
5 years ago
DL6ER e57d0fb93c
Remove the empty templates gravity.list, white.list, black.list. The old source files whitelist.txt, blacklist.txt, and regex.list still exist and need to be removed in a follow-up commit
5 years ago
DL6ER ee20164207
Remove detect_pihole_blocking_status() as we can modify the database at any time
5 years ago
Dan Schaper 54ae9d83b0 Stickler-lints
5 years ago
DL6ER bbc392caeb
More review comments
5 years ago
DL6ER 61840edb30
Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date
5 years ago
DL6ER f9250d91a5
Explictly escape the escape.
5 years ago
DL6ER 491c828661
Improved code, ensure that gravity.sh passes shellcheck as a whole
5 years ago
DL6ER 644ec36e64
Review comments
5 years ago
DL6ER ec5b16ef85
Fix incomplete comment
5 years ago
DL6ER dbbf21071b
Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database()
5 years ago
DL6ER b2f4385232
Avoid infinity loop if gravity optimization fails
5 years ago
DL6ER 1f9a7d0b0c
Only run VACUUM on "pihole -g -o"
5 years ago
DL6ER d5feffa117
Do not backup the database
5 years ago
DL6ER fc62cf7e2f
Only run VACUUM on "full" gravity runs
5 years ago
DL6ER 93f1859bab
Store regex in gravity.db as well
5 years ago
DL6ER dcf0a605cf
Use views for all tables and set disabled column to false for those tables that support it
5 years ago
DL6ER 8a91fe6992
Store domains in gravit tables: gravity, whitelist, blacklist
5 years ago
DL6ER 09c4c88a6d
Create and fill gravity.db during pihole -g
5 years ago
xch12i5 cd8a423b32 Solves RegEx issue and updates documentation.
5 years ago
xch12i5 e02da90faa Replaces double quotes by single quotes and updates documentation.
5 years ago
xch12i5 0de5132e2b Solves RegEx issue.
5 years ago
DL6ER 05bd88b4d8
Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10%
6 years ago
Adam Warner 83f7bd66e6
Don't `mv` `preEventHorizon`, copy it.
6 years ago
Dan Schaper 5c621fa253
Lints
6 years ago
Dan Schaper f9e71bee0a
Account for port, or lack of, in PIHOLE_DNS_1
6 years ago
Mark Drobnak 33939a30ea
Merge pull request #2347 from Gusher123/patch-1
6 years ago
Adam Warner 0131055ec9
Submission stale, addressing @mcat12's comments
6 years ago
DL6ER 337cc5ca18
BLOCKING -> BLOCKING_ENABLED
6 years ago
DL6ER b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
6 years ago
DL6ER 6cde066edd
Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled)
6 years ago
Gusher123 2feb5f22cc
Signed-off-by
6 years ago
Gusher123 03a9d3bc5b Not hardcoding dns and covering all blockingmodes
6 years ago
Gusher123 e58142b4ac
Added comments
6 years ago
Gusher123 3e5c6afaee
Don't let one blocklist, block an other
6 years ago
DL6ER 760dd01b50
Use grep invert-match
6 years ago
DL6ER 5bf90cb77d
Use alternative logic for counting regex file entries, skipping commented out lines
6 years ago
Mcat12 1a8d5fb4a9
Allow PHP to edit the regex file if installed
6 years ago
Dan Schaper dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
6 years ago
Mcat12 72be7ad5f0
Don't count commented out regex lines
6 years ago
WaLLy3K 7ddae8f2eb
Treat URLs without a protocol as HTTP
6 years ago
Mcat12 0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12 55175087c4
Set regex file permissions for web access
6 years ago
Dan Schaper d5547f5c7c
Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"
6 years ago
Mark Drobnak 4fc3546887
Merge pull request #2069 from pi-hole/fix/nullbyte
6 years ago
DL6ER bc705aac03
Add automated wildcard list -> regex filter conversion
6 years ago
Mark Drobnak 3149a95d6a
Fix gravity_ParseFileIntoDomains Awk comment
6 years ago
Adam Warner 5f2217a079
Fix for gravity.list not being emptied with an empty/missing adlist file.
6 years ago
Adam Warner 3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
Adam Warner 9c29bd627e
fix user blacklisting
6 years ago
DL6ER d24b141d8b
Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format
6 years ago
DL6ER bac9e005ae
Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format
6 years ago
Dan Schaper d4d1ec2568
Merge pull request #2124 from pi-hole/development
6 years ago
Adam Warner 88d4108f92
- Add new whipstail to choose from example blocklists on new install
6 years ago
Jacob Salmela 187848660c
try another fix for #2028
6 years ago
Jacob Salmela c3f391dc5a
maybe fixes #2028 by deleting null bytes
6 years ago
DL6ER ff47ab12fb
Save number of effectively blocked domains in /etc/pihole/numBlocked
6 years ago
Riley Avron f390671018 Improve scheme matching to avoid inadvertent blocking
6 years ago
Riley Avron 512ec7fb87 Remove unneeded ifs in awk
6 years ago
Adam Warner 24219422df
Merge branch 'development' into FTLDNSremoveDnsmasq
6 years ago
Adam Warner ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
6 years ago
Adam Warner cadab61a21
Merge branch 'development' into FTLDNS
6 years ago
DL6ER 7ed45d26c2
Remove " " at some places where they shouldn't be
6 years ago
DL6ER e8ec0dc701
Use pihole-FTL resolver in pihole and gravity
6 years ago
Adam Warner 6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
6 years ago
Adam Warner d4ac818a0b
Specifty `LC_ALL=C` when dealing with sorted lists.
6 years ago
DL6ER fc5034696d
Don't auto-whitelist blocking list domains
6 years ago
Dan Schaper 9f2ce0e296
Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity
6 years ago
Adam Warner 55e10d8287
replace another grep -F as pointed out by @StarPicard
6 years ago
Adam Warner f1956119fb
proposed gravity function renames
6 years ago
Adam Warner 876170767c
Print actual domain instead of grep output of "Binary file /etc/pihole/list.preEventHorizon matches" when a domain with a unicode char is in a source list.
6 years ago
Adam Warner 2d3906450a
add back in str local var, and change ticks to info on whitelist lines
7 years ago
Adam Warner 5ecc46d85b
Accidentally too many spaces
7 years ago
Adam Warner ddd6f3dbe5
Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed.
7 years ago
Adam Warner 761fd13a70
Remove quotes from the uniqDomains array to actually whitelist the sources
7 years ago
Adam Warner c24e5cd3f6
:codacy: :codacy2: :codacy3:
7 years ago
Adam Warner cc3035267f
Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries.
7 years ago
Jacob Salmela 80e17ab721
potentially fixes #1806 by falling back to dig if getent fails
7 years ago
Mcat12 8d721d086c
Modify indentation
7 years ago
DL6ER 6f0bb30def
Improve indentation
7 years ago
DL6ER c54f04ef4c
Repair username:password filtering
7 years ago
DL6ER eb83081a5c
Clarify error message: File could also have been of zero size
7 years ago
DL6ER 8976930e20
Properly detect if local file was successfully downloaded
7 years ago
DL6ER 164a81776e
Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list
7 years ago
DL6ER 39ab1e1ea7
When using the Pi-hole DHCP server, local host names are called "something.local". Thir PR ensures that clients that are connected via VPN are augmented by a similar suffix like "someother.vpn".
7 years ago
spacedingo 60365ad36a Update gravity.sh
7 years ago
spacedingo 466e6d9b30 Redo pull #1687
7 years ago
WaLLy3K b9bcfe36ff Place errors on newline
7 years ago
WaLLy3K cd7c00ef8e Fix Ctrl-C inadvertently deleting domains files
7 years ago
WaLLy3K 3aa525b0c0 Ensure domains files are not deleted upon w/blist
7 years ago
WaLLy3K 47099e2855 Ensure resolver test occurs each second
7 years ago
WaLLy3K 2deb2bf03f Fix broken whitelist functionality
7 years ago
WaLLy3K a6f9272d4b Fix gravity from only parsing one adlist URL
7 years ago