Commit Graph

466 Commits (0be987239e3c5c6f88033844dc77c285bc73d185)

Author SHA1 Message Date
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
Adam Warner 8d8482d60b
`<<<$()` back to `< <()`
7 years ago
WaLLy3K d02bf258af Improve non-standard list parsing
7 years ago
WaLLy3K c957124fad Optimised parsing of domains on IPv6 servers
7 years ago
WaLLy3K ff5411a93a Add 'Connection Refused' for 000 status
7 years ago
WaLLy3K d3073e5e23 Fix array of unique $sourceDomains
7 years ago
WaLLy3K 8191ec01e5 Gravity Bugfixes
7 years ago
WaLLy3K 0a00936e99 Update resolver test & added more comments
7 years ago
WaLLy3K f24ab8508e WIP cleanup
7 years ago
WaLLy3K 6830b08723 Clean up and optimise Gravity
7 years ago
Mcat12 1e31fa89aa Remove /* from IPv6 as well as IPv4
7 years ago
Adam Warner 536585b846 Colourise Core Output Text (#1471)
7 years ago
DL6ER 05798fe07a
cp + rm === mv (well, almost)
7 years ago
DL6ER 8bad56e897
Improve displayed messages and overall logic
7 years ago
DL6ER 92e691408f
Remove useless cat
7 years ago
DL6ER 0a9c234127
Add "pihole -g -b" to *only* update black.list (saves a bunch of time when adding/changing only blacklisted files - won'tdownload lal lists, but only processes the blacklist and restars dnsmasq)
7 years ago
DL6ER 0283a1ab74
Introduce new file black.list for blacklist content
7 years ago
Dan Schaper 6a2b885988
Update default User Agent to modern browser.
7 years ago
Mcat12 5e308dbd51 Delete the temp files created by gravity
7 years ago
Mcat12 a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements
7 years ago
Mcat12 ce86205df0 Use correct agent when downloading adaway.org list
7 years ago
Adam Warner 02040cd25d
We no longer need to do this, either
7 years ago
Adam Warner bdc6bd4135
Don't need this comment anymore
7 years ago
Adam Warner e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
7 years ago
Adam Warner ce97896ffd
account for new `adlists.custom` file
7 years ago
DL6ER d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318
7 years ago
Jacob Salmela 7a1a2dec67
update license to EUPL on core files
7 years ago
Markus Napp 66616eb0f0 Rename missing plurals check
7 years ago
Markus Napp 72a1fc3f64 Fix output for wildcards in gravity.sh
7 years ago
DL6ER a8ac212ee6
Show number of wildcard blocked domains in gravity's summary
7 years ago
Promofaux c2e1819098 This should not have been commented out. It's stopping any changes we make to the default lists getting out.
7 years ago
DL6ER 322cb2387b
Also accept the last line of the adlist file if there is no newline at the end
7 years ago
DL6ER cd0c3f9418 Better output if file has not been downloaded because it has not been changed
8 years ago
DL6ER efaee2b68b Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!)
8 years ago
Promofaux a3d519b671 no need to remove list, because of echo >
8 years ago
Promofaux 8591f9d576 check for list before removing it
8 years ago
Promofaux db89fa9881 initial support for additional hosts file
8 years ago
Mcat12 d8912fd0a7 Merge pull request #952 from pi-hole/fix/exit_codes
8 years ago
Dan Schaper d92646324c
Double worded
8 years ago
Dan Schaper c9fe62a691
Clarify what the command is doing.
8 years ago
Dan Schaper 2ec4acfe52
Begin fixing exit values.
8 years ago
Adam Warner c97cfde9f9 Update gravity.sh
8 years ago
DL6ER cdee6d55d3 Minor change
8 years ago
DL6ER e5a1afaa26 Added another missing "done"
8 years ago
Mcat12 08e7b7e0ad Fix typo
8 years ago
DL6ER 4945f33254 Added "-n" to first echo call
8 years ago
DL6ER 3fa05293fc Fixed file permissions
8 years ago
DL6ER 27e5f2798d Added missing "done." output
8 years ago
Adam Warner 99057ed859 Update var names from setupVars.conf in gravity.sh
8 years ago
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
8 years ago
Promofaux 9e4e1d1cb2 improve comments
8 years ago
Promofaux 60142cd960 remove reference to whitelist.sh (no longer exists) replace with `pihole -w`
8 years ago
Promofaux 4c853defb2 add if traps to check for existence of whitelist.txt / blacklist.txt
8 years ago
Adam Warner e0ac109dd1 remove hostname insertion into gravity.list from gravity.sh
8 years ago
Adam Warner 7653b3d088 Remove pi.hole references in gravity.sh
8 years ago
Promofaux d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum ebbe1fc236 More consistency
8 years ago
Marcus Hildum aac8e45397 Imbue gravity.sh with some consistency
8 years ago
Adam Warner 8f9ff930b3 Merge pull request #823 from tuplink/EnableOrDisable
8 years ago
Promofaux 9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond
8 years ago
Tommy Huff 15d68467a1 attempt to fix
8 years ago
Tommy Huff 3b6ecc573e fix conflict
8 years ago
Tommy Huff 3ca3eaa62c change restartdnsmasq to restartdns
8 years ago
Tommy Huff dda448e050 use finction in pihole to restart dnsmasq
8 years ago
Tommy Huff 60873144ea make last line of script return a new line been bugging me for awhile
8 years ago
Tommy Huff a9d17c96be include status at end of gravity so if it is disabled you will see it when running
8 years ago
Tommy Huff 7d7e17b351 add toggle to enable or disable pi-hole
8 years ago
Adam Warner c71a976e76 kill off an old ugly hack
8 years ago
Marcus Hildum 0efda04920 Use heredocs instead of multiple calls to echo
8 years ago
Marcus Hildum 28eeaf201b Standardize function declaration
8 years ago
Promofaux 9aa38cf0ae mv patternbuffer instead of cp, then no need to clean up
8 years ago
Promofaux a7fa7466fb remove no longer needed code
8 years ago
Promofaux 3f73c61cee cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity
8 years ago
Promofaux b88fe572fe Whitelist/Blacklist domains directly in the Event Horizon.
8 years ago
Promofaux 59ba6f8aec add flag to skip download of lists
8 years ago
Promofaux 25343da6b7 wrong variable name
8 years ago
Promofaux 60d17b97f5 spacing
8 years ago
Promofaux 8cb72d87e4 make IPv4/IPv6 checking more robust in gravity
8 years ago
Promofaux 49f48e2aaa wrong word. #admincrimes
8 years ago
Promofaux 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux 7ee1110351 ugh. pihole.conf.
8 years ago
Promofaux 51c4c51d9e Add trap to check existence of setupVars
8 years ago
Promofaux fc4fe54099 standardise function naming
8 years ago
Promofaux 4c42f00a86 remove uses of ${SUDO} and root check from gravity. As this is handled by `pihole` command.
8 years ago
Promofaux 4f35aac6dd transpose `$` and `"`
8 years ago
Dan Schaper 4418ca9e9f Missing quote replacement.
8 years ago
Dan Schaper 07b7e8a1a6 Track down a couple more variable name changes.
8 years ago
Dan Schaper 7ae2fc37c0 Match up descriptive variable names with `setupVars.conf`. Rectifies Ubuntu 16.04 `gravity.list` bug.
8 years ago
Adam Warner ac49e639bd Fix #718
8 years ago
bcambl 21d4199a38 Merge branch 'development' into dns-hostname-fixes
8 years ago
Promofaux 3ed62d45f5 Source IP addresses from /etc/pihole/setupVars.conf
8 years ago
bcambl 640af300cb additional hostname checks in gravity.sh
8 years ago
Promofaux 6796b8bdad pass argument from pihole command to gravity for -f check
8 years ago
Promofaux 475d016029 hmmm
8 years ago
Promofaux 201304e678 fix variables in gravity to stop it using -f wether it's set or not
8 years ago
Promofaux f6ac0d73b4 Add force delete option
8 years ago
Promofaux ae47be0ce9 Add HelpFunc
8 years ago
Dan Schaper 024b741552 Merge pull request #490 from bcambl/fedora-armhf7
8 years ago
Mcat12 4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect
8 years ago
Dan Schaper 7670b4e380 Mahakala User Agen modernization
8 years ago
Dan Schaper 636a9123b8 Have `curl` auto-redirect
8 years ago
bcambl 27a9642090 check for sudo via 'command -v' instead of dkpg-query
8 years ago
Jim Liu 08e95ed606 Update gravity.sh
8 years ago
Jim Liu a5ad48aa18 Update gravity.sh
8 years ago
Promofaux ad574f5e90 Replace kill with killall
8 years ago
Promofaux 4941a657bf remove -s switch, as it turns out it worked afterall.
8 years ago
Promofaux 3d4bff9414 Add -s switch to kill command to increase compatability
8 years ago
Adam Warner 99a5b3a98a remove all mentions of spinner
8 years ago
Promofaux 8514f42d0d Correct variable name (Missing capital letter! whoops!)
8 years ago
Promofaux 0c0dd914f7 Fix source lists not being skipped if they are already up to date
8 years ago
Promofaux c6405bc93b Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
8 years ago
nate 5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes
8 years ago
Promofaux d710b97276 Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
8 years ago
Promofaux 0e6e8040ba Change spinstr to match install and uninstall scripts
8 years ago
nate 767b72fbfa Merged branch development into PiHoleController
8 years ago
Mcat12 0fbf72bb09 Change dummy domain and show device's hostname in ping
8 years ago
nate bb66d559e7 Merge branch 'development'
8 years ago
nate 7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output
8 years ago
nate 28f2a1309e Merge branch 'development'
8 years ago
nate 45f24c8a85 Readded `cat`s that were originally considered UUOC
8 years ago
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development'
8 years ago
Nate 31fc2bfeb7 Modified gravity.sh to point to new file locations and fixed permission issue
8 years ago
nate 37c1999965 Merged branch ScriptCleanup-Dev into development
8 years ago