310 Commits (1d43c0a2fa36ddc993db51b1751e26cbc8123fbf)

Author	SHA1	Message	Date
Adam Warner	2d3906450a	add back in str local var, and change ticks to info on whitelist lines ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	5ecc46d85b	Accidentally too many spaces ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	ddd6f3dbe5	Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	761fd13a70	Remove quotes from the uniqDomains array to actually whitelist the sources ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	c24e5cd3f6	:codacy: :codacy2: :codacy3: ... Signed-off-by: Adam Warner <adamw@rner.email>	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. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Jacob Salmela	80e17ab721	potentially fixes #1806 by falling back to dig if getent fails ... Signed-off-by: Jacob Salmela <github@decoy.email>	7 years ago
Mcat12	8d721d086c	Modify indentation	7 years ago
DL6ER	6f0bb30def	Improve indentation ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	c54f04ef4c	Repair username:password filtering ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	eb83081a5c	Clarify error message: File could also have been of zero size ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	8976930e20	Properly detect if local file was successfully downloaded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	164a81776e	Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	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". ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
spacedingo	60365ad36a	Update gravity.sh	7 years ago
spacedingo	466e6d9b30	Redo pull #1687 ... Fix for case sensitive duplicate domains The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone.	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 ... * Ensure that gravity will run the second the resolver is available * Increase timeout to 120s	7 years ago
WaLLy3K	2deb2bf03f	Fix broken whitelist functionality	7 years ago
WaLLy3K	a6f9272d4b	Fix gravity from only parsing one adlist URL ... * Redirect `grep` correctly to $sources (instead of using `awk`) * Redirect $sourceDomains correctly * Replace use of ${COL_LIGHT_BLUE} * Add numeric count informing user of unique source domains being whitelisted	7 years ago
Adam Warner	8d8482d60b	`<<<$()` back to `< <()` ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	d02bf258af	Improve non-standard list parsing ... * Add 504 status (Gateway connection timed out) * Add text for non-standard list parsing * Improve adblock parsing * Ensure adblock exception rules are removed from file * Ensure "www." is not treated as a URL-format list * Corrected typo * Ensure script does not fail if "-f" is used when there are no blocklists generated Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	c957124fad	Optimised parsing of domains on IPv6 servers ... * Remove WHITELIST_COMMAND * Place IPv4/IPv6 availability test underneath setupVars.conf source * Improved clarity on comments * Define default lookupDomain on local line * Use `getent hosts` instead of nslookup (faster) * Make gravity_DNSLookup() function more readable * Use bold on "Neutrino emissions detected" * Swap conditionals around on adlists file handling * Add comments to both gravity_Collapse() `awk`s * Removed unnecessary "${str}" from gravity_Pull() * Merge function variables into local line * Place .phgbp suffice on mktemp, so patternbuffers can be cleaned up all at once in gravity_Cleanup() * Removed success="false" from $httpCode case, placed empty success var in local * Reordered $httpCode case numerically because I can * Provide error if Dnsmasq format list is being parsed * Remove IPv4 check when determining URL list (too slow on large lists) * Check ${#sources[@]} to ensure we're checking the number of entries and not the character count * Define empty plural in local line, removing unnecessary plural=; * Optimised readability of gravity_Whitelist() * Removed uninformative "Nothing to blacklist"/"No wildcards used" text * Optimised parsing of domains into hosts format on IPv6 enabled servers * Ensure /etc/hostname is non-zero * Use `: >` instead of `rm` as consistent with the rest of the script * Ensured that gravity_Cleanup() removes ${localList}.tmp * Optimised readability of gravity_ParseUserDomains() * Moved dnsRestart to ${var} case statement, renaming it to dnsRestartType for readability * Set default $listType to ensure script passes "bash strict mode"	7 years ago
WaLLy3K	ff5411a93a	Add 'Connection Refused' for 000 status ... * Shift default dnsRestart value into unset default parameter expansion value * Change nslookup timeout to 5 seconds * Use &> instead of > * Standardise plural code * Update some comments * Add "000" when connection is refused * Condense adblock detection logic * Add Dnsmasq format detection and parsing logic * Removed unnecessary echo * Add dnsWasOffline variable to ensure that if DNS service has been stopped, that it doesn't start and also get reloaded	7 years ago
WaLLy3K	d3073e5e23	Fix array of unique $sourceDomains	7 years ago
WaLLy3K	8191ec01e5	Gravity Bugfixes ... * Merge development OpenVPN code * Determine which domain to resolve depending on existence of $localList * Re-add code to remove $localList, preventing duplicate local entries * Minor shellcheck validation fix	7 years ago
WaLLy3K	0a00936e99	Update resolver test & added more comments ... * Add/update code comments * Change resolver check to test for pi.hole * Make resolver check timeout after 10 seconds * Use > instead of &> where appropriate * Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable) * Provide confirmation upon success of resolver check availability * Quotes and Braced remaining variables as appropriate * Removed duplicate local	7 years ago
WaLLy3K	f24ab8508e	WIP cleanup ... * Changed supernova/eventHorizon variables to match their purpose * Add gravity_DNSLookup() function * Ensure all comments are clear and relevant * Use && instead of || in gravity_Collapse() * Renamed existing functions, and placed them in order of script execution * Use \t instead of literal tab in gravity_ParseFileIntoDomains() * Replace instances of "truncate" with : > (e.g: gravity_Schwarzschild()) * Ensure correct variables are local'd * Use phrase "Cleaning up stray matter" when gravity_Cleanup() is called * Add black/white/wildcard switches for list.sh * Ensure necessary functions are called when modifying black/white/wildcards Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	6830b08723	Clean up and optimise Gravity ... * Shellcheck validation * Made variable names, function names, comments and output clearer to understand * Quoted and braced variables and conditionals * Fix adlists.list handling logic, and remove any CR line endings * Make CP/MV/RM provide user-friendly output upon failure * Change adlists.list retrieval logic * Moved and fixed adlists.list domain parsing logic * Create gravity_ParseFileAsDomains() function to handle parsing of source files * If no changes to a list is detected, print no output * Ensure each source blocklist has a final newline * Format number output as currency * Make array of adlists domain sources unique to prevent redundant whitelisting * Merged bash IPv4/IPv6 hosts formatting IF statement into an awk one-liner * Trap Ctrl-C cancellations and run gravity_Cleanup() * Use new gravity_Cleanup() function on errors and script completion * Ensure that dnsmasq uses force-reload when gravity is invoked * Add --wildcard option to ensure dnsmasq is restarted upon b/wlisting of a wildcard Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
Mcat12	1e31fa89aa	Remove /* from IPv6 as well as IPv4 ... Fixes Discourse issue: https://discourse.pi-hole.net/t/ipv6-aaaa-dns-issue/3830	7 years ago
Adam Warner	536585b846	Colourise Core Output Text (#1471) ... * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	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. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	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 ... Adlist improvements	7 years ago
Mcat12	ce86205df0	Use correct agent when downloading adaway.org list ... See https://discourse.pi-hole.net/t/2278	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 ... Fix/exit codes	8 years ago
Dan Schaper	d92646324c	Double worded ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	c9fe62a691	Clarify what the command is doing. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Adam Warner	c97cfde9f9	Update gravity.sh ... Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`	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 ... [BugFix] A man has no name resolution	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 ... Odd mix of variables quoted with and without no-op parameter expansion (i.e. ${thing}) More ${thing} than not, make that the standard	8 years ago
Marcus Hildum	aac8e45397	Imbue gravity.sh with some consistency ... Mish-mash of tabs and spaces used for indentation. Mostly tabs though, so going with those. Also indenting blocks and enforcing the loop statement; do done style over the newline for do since it seemed to be more common.	8 years ago
Adam Warner	8f9ff930b3	Merge pull request #823 from tuplink/EnableOrDisable ... Enable or disable	8 years ago
Promofaux	9ab6df0e54	Merge branch 'development' into promoTweaksTheSecond ... # Conflicts: # advanced/Scripts/blacklist.sh # advanced/Scripts/whitelist.sh	8 years ago
Tommy Huff	15d68467a1	attempt to fix	8 years ago
Tommy Huff	3b6ecc573e	fix conflict ... Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable	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 ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	8 years ago
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	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