Commit Graph

668 Commits (6ca47dc3b360a8566d0c505d0c4cf23ed0017d61)

Author SHA1 Message Date
DL6ER a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord
8 years ago
Dan Schaper d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS
8 years ago
DL6ER 47a6786e8f
Use proper test syntax
8 years ago
DL6ER a69fcbb91e
Bugfix for when deleting host-record
8 years ago
Dan Schaper 8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion
8 years ago
Dan Schaper 560af43204 Merge pull request #1293 from pi-hole/fix/version
8 years ago
DL6ER baefec86f2
Add CLI teleporter feature
8 years ago
Dan Schaper 512c650441
Shellchecking.
8 years ago
Dan Schaper dc44fc9e27
Version check amalgamation and removal of && || logic.
8 years ago
Dan Schaper 6f2fb57c08
Protocol specific records checks.
8 years ago
Dan Schaper 2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
8 years ago
DL6ER 9f4ef66f41
Add IPv6 resolver test
8 years ago
DL6ER 086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
8 years ago
Dan Schaper 709b44f736
IPv4 DNS tests
8 years ago
Dan Schaper 6cd4ff6d68
Organize functions and function calls.
8 years ago
Dan Schaper abd3e828de
Optimize normalOutput
8 years ago
DL6ER b85af50d14
Generate only the information that is actually asked for
8 years ago
Dan Schaper 0e8fd49669
Function...
8 years ago
Dan Schaper 945e22874e
Collapse duplicate functions, and take out argument loops.
8 years ago
Dan Schaper 77ab47a984
Awk for perl
8 years ago
Dan Schaper ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
8 years ago
Dan Schaper 8831b22fc8
Prototype function for getting version of local repo
8 years ago
Dan Schaper 0341bd1758
Optimize code, undoc flag for current hash.
8 years ago
Dan Schaper 9bb4a5fb25
Factor out variables from display.
8 years ago
Dan Schaper ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
8 years ago
Dan Schaper 81939ab265
Get short hash of local and remote
8 years ago
DL6ER f2fe84c9d3 Merge pull request #1292 from pi-hole/master
8 years ago
DL6ER dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
8 years ago
DL6ER f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
8 years ago
DL6ER 66b7d04b82
Merge branch 'development' into new/FTL-binary
8 years ago
DL6ER 7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
8 years ago
DL6ER 0be1717ff4
Fix config error
8 years ago
DL6ER 189a4e0078
Add option to skip restarting of dnsmasq
8 years ago
DL6ER 3adf8785d8
Move "all" down in help text to not suggest that it is the default
8 years ago
DL6ER b74862bfc5
Actually apply new setting by restarting dnsmasq
8 years ago
DL6ER 01273124ea
Change to -i, interface
8 years ago
DL6ER 721ada7e16
Fix typo
8 years ago
DL6ER bd9dc91396
Add response for users manually setting this up via CLI
8 years ago
DL6ER de6c43a8d3
Setup interface listening behavior of dnsmasq
8 years ago
Dan Schaper 83b0600863
Carriage return or newline based webcalls.
8 years ago
Dan Schaper 6c130b7960
Vebiage and highligh the token, also `:::`
8 years ago
Dan Schaper 7244d44a1d
Notify user that log is being uploaded.
8 years ago
Dan Schaper 9b060aab34
Debug auto mode engaged
8 years ago
DL6ER ce6c465942 Merge pull request #1266 from pi-hole/new/host-record
8 years ago
Jacob Salmela 7a1a2dec67
update license to EUPL on core files
8 years ago
DL6ER 7ed1bbad49
Add host-record option
8 years ago
DL6ER 078cc7660e
Improved updater logic
8 years ago
DL6ER af2893d2ce
Updater implementation for FTL
8 years ago
DL6ER a64211123f
Some debug additions
8 years ago
Dan Schaper 053b38e0bd
Set up for IP matching in detection.
8 years ago
Dan Schaper 2aa3a109a0
Ping gateways and Internet.
8 years ago
Dan Schaper 472708376d
Split out IP checks.
8 years ago
Dan Schaper cfed3d59e9
Begin fixing IP detection functions.
8 years ago
DL6ER af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h
8 years ago
DL6ER 01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
8 years ago
DL6ER 99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
8 years ago
Mcat12 ba67144e34 Merge branch 'development' into adminPageAsOption
8 years ago
DL6ER 7785dac50e Merge pull request #1228 from r0ckarong/development
8 years ago
Markus Napp 01f643e5eb fixup! Fix spacing for wildcard help in list script
8 years ago
Markus Napp 8037f3e332 Fix spacing for wildcard help in list script
8 years ago
Markus Napp afe5176e01 Justify help output to match main script
8 years ago
Mcat12 a48317883d Fix indentation
8 years ago
Promofaux 4fcf8fd23f Merge in `development` branch - resolve conflict in update.sh
8 years ago
Promofaux 10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
8 years ago
Promofaux b764d17c64 comment
8 years ago
Promofaux ba0abdb88d wrap update logic in admin_installed bool check
8 years ago
Promofaux 1428b58dde source setupVars and only check admin repo if it is enabled
8 years ago
Mcat12 18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
8 years ago
DL6ER 3239c7023a Merge pull request #1170 from pi-hole/new/DHCPstaticleases
8 years ago
DL6ER 3d4516dc95
Improve regex
8 years ago
DL6ER 509c864cc3
Merge branch 'development' into fix/regex
8 years ago
Mcat12 f8944177a0 Fix chronometer interpreting summaryRaw
8 years ago
DL6ER 06873fe69e
Remove misplaced start of string expression. Fixes #1191
8 years ago
Dan Schaper 3d9d13222b
Use constants for leading paths.
8 years ago
Dan Schaper 745adabb05
Path to source basic-install.sh
8 years ago
Dan Schaper 3861b57dc6
Start moving reused utility functions to one script.
8 years ago
Dan Schaper 99a4a80017
Spelling
8 years ago
Mcat12 033ba26041 Stay in repo directory until we error check
8 years ago
DL6ER 08cddba200
There should be no echo here
8 years ago
DL6ER 1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
8 years ago
DL6ER 85b3fef08d
Use perl instead of grep?
8 years ago
DL6ER 15037fa888
Typo
8 years ago
DL6ER d595fef18f
Fix regex
8 years ago
Dan Schaper be5fa22b6f Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
8 years ago
DL6ER 6fd7e0311c
Install customized version of logrotate script
8 years ago
DL6ER 1bcf2dd0fc
Tweak CLI domain filter
8 years ago
DL6ER dad18dc5de
Changed keywords
8 years ago
DL6ER 5c95c4074b
Remove static leases from DHCP static leases file
8 years ago
DL6ER 4301b9a12a
Add static DHCP leases to new file
8 years ago
DL6ER 6a89c6bf3b
Silence rm warning if no DHCP server is used
8 years ago
Promofaux fe8c365d17 codacy never lies
8 years ago
Promofaux 9acc3aac01 pipe `du -h` output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe.
8 years ago
Promofaux 1ad23a065e switch out `wc -l` with `grep -c ^`
8 years ago
Promofaux de102fde5c Add line count and size check for pihole.log
8 years ago
DL6ER 8bb9dd460b
Be able to disable the DHCP domain name
8 years ago
Mcat12 58f3ff69d8 Align comment with referenced line
8 years ago
DL6ER 72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
8 years ago
Mcat12 63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate
8 years ago
DL6ER 08f08fea61 Merge pull request #1135 from pi-hole/new/multipleDNSservers
8 years ago
DL6ER 1ed2a8637f
Removed debug echo's
8 years ago
Mcat12 d196c13f2c Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
8 years ago
DL6ER bd1c5a42e8
Allow multiple DNS servers
8 years ago
DL6ER 845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
8 years ago
Promofaux b4c32e47c6 Missed one!
8 years ago
Promofaux 248d8680f7 actual codacy complaints
8 years ago
Promofaux 1bda965a7c Codacy complaints
8 years ago
Promofaux 2ee305769d Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
8 years ago
DL6ER 3a8a936575
Corrected path
8 years ago
DL6ER 3fd2ffd466
Add logrotate for pihole.log
8 years ago
DL6ER b56ca2b834
Add DNSSEC support to Pi-hole core
8 years ago
DL6ER a263936243
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER 2935275227
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER 74a4e62cc9
Codacy fix
8 years ago
DL6ER 63a414a544
Align outputs
8 years ago
DL6ER 7d1f5091a7
Fixed small typo
8 years ago
DL6ER 3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
8 years ago
DL6ER d9e949b27c Merge pull request #1096 from pi-hole/fix/updater
8 years ago
DL6ER 168397e90d
Fixed typo in webpage.sh
8 years ago
DL6ER e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
8 years ago
DL6ER 200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
8 years ago
DL6ER 3a90c1c192
Source setupVars.conf before trying to access variables
8 years ago
Adam Warner 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
8 years ago
DL6ER ad61852804
Test against empty string
8 years ago
DL6ER dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
8 years ago
DL6ER 677694b01a
Set 24h lease time if settings was empty before
8 years ago
DL6ER 85f0241c0d
Reprocess DHCP settings after update
8 years ago
DL6ER ebf0db4bbf Typo fixed
8 years ago
DL6ER 9ac265980f Add .conf to filename
8 years ago
DL6ER 40798da6b1 Add blacklisting wildcard support
8 years ago
Dan Schaper fc596e41d4
All scripts set executable
8 years ago
DL6ER 5c7fc05a32 Enable DHCP logging by default
8 years ago
DL6ER 9181a4a1d8 Apply dhcp lease time also for IPv6
8 years ago
DL6ER 3268e1611a Backend accept and apply dhcp lease time
8 years ago
DL6ER cf724176dc Do stateful DHCPv6 and SLAAC
8 years ago
DL6ER 1e627c7e8f Make webpage.sh fully library style
8 years ago
DL6ER 9af26cbaac Major simplification of webpage.sh
8 years ago
DL6ER 321ea8a3a9 Merge branch 'development' into webUIprivacymode
8 years ago
Dan Schaper ef8292d371 Merge branch 'development' into updater_rewrite
8 years ago
DL6ER e50947eb58
mend
8 years ago
DL6ER ca056d32d2
Remove git -C
8 years ago
DL6ER e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
8 years ago
DL6ER 5e28e6b9ac
Removed remaining git -C
8 years ago
Dan Schaper 3365ef7aaa
`is_repo()` returns values to caller, silence function.
8 years ago
Dan Schaper 68c17b26dc
Bashisms
8 years ago
Dan Schaper e647efd471
Shell script, not javascript
8 years ago
DL6ER 15db1ffdd5
Remove variables not needed any more
8 years ago
DL6ER 4632b0f797
Updated updater logic
8 years ago
DL6ER 65c35a5530
Use new subroutine to determine if updates are available
8 years ago
DL6ER c449a1c0e0
Added GitCheckUpdateAvail()
8 years ago
DL6ER b020010f0d
Removed some of the &> /dev/null
8 years ago
DL6ER 0276c72fe2
replace 'git -C' with long version (see #1009)
8 years ago
DL6ER 04a9791be2
Save empty password
8 years ago
Promofaux 9a62026830 remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
Adam Warner ef1ce66793 Merge pull request #1013 from pi-hole/fix/chronometer
8 years ago
Adam Warner 3bc5d1bae0 Merge pull request #989 from pi-hole/APIresolveclientsandupstream
8 years ago
DL6ER a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
8 years ago
DL6ER bcf8139708
Removed cat where we don't need it
8 years ago
DL6ER 9b0390c9da
Space to Tab
8 years ago
DL6ER e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
8 years ago
DL6ER ee8f29d178 Fixed typo, extended help text
8 years ago
DL6ER da363070c7 Added Kelvin
8 years ago
DL6ER 715838cf89 Allow disabling second DNS server
8 years ago
DL6ER 7a243f890e Backend for privacyMode on webUI
8 years ago
DL6ER afabb5957b Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
8 years ago
DL6ER 2977168da1 dnsmasq "bogus-priv" property
8 years ago
DL6ER 85e3f37503 dnsmasq "domain-needed" property
8 years ago
DL6ER ba015c1918 Set domain name via Settings page
8 years ago
DL6ER 1556adb678 Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
8 years ago
Adam Warner 6bfe729112 Merge pull request #979 from pi-hole/wwwdatapassword
8 years ago
DL6ER 207422f83a Added a missing space
8 years ago
DL6ER 004ba28378 Prevent web UI password change by web user
8 years ago
DL6ER 6f38801ed8 Add "Interface appearence" option
8 years ago
DL6ER b8d2bfc890 Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
8 years ago
DL6ER bc91716082 Suppress logging of DHCP actions to /var/log/pihole.log
8 years ago
DL6ER 8dc0dc4d69 Add DHCP-Server backend
8 years ago
DL6ER 2f4b7ce3dd Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
8 years ago
DL6ER d4f83cb1d4 Be able to set API_QUERY_LOG_SHOW
8 years ago
DL6ER aaab3306a8 Add restart DNS capability
8 years ago
DL6ER 2bafa2f2ac Add reboot option
8 years ago
DL6ER 9ac378ae09 Set domains and clients which are excluded by the API
8 years ago
DL6ER bf867bd9fd Set DNS servers from web UI
8 years ago
Mcat12 f98de3d5db Merge pull request #941 from DL6ER/caseinsensitive
8 years ago
DL6ER 78cb43d0dc Revert "Simplified EscapeRegexp()"
8 years ago
DL6ER 509cfd15f2 Simplified EscapeRegexp()
8 years ago
DL6ER 2061daa902 Don't forget to escape also the slash "/"
8 years ago
DL6ER 629ca970a1 Changed from single quoted filter expression to double quotes as reqeusted by codacy
8 years ago
DL6ER c8ad6f23a8 Properly escape any special characters before using them in regexp manner
8 years ago
Dan Schaper 925c80edd4
Catch more 1's
8 years ago
Dan Schaper 2ec4acfe52
Begin fixing exit values.
8 years ago
DL6ER 7b26b308ad No need for echo and pipe here!
8 years ago
DL6ER 4c10634d85 Convert domain names to lower case before checking validity of the domain
8 years ago
Adam Warner de4401823e Merge pull request #924 from DL6ER/webpage.sh
8 years ago
DL6ER f50cbe74cb Changed -web (webpage) to -a (admin)
8 years ago
DL6ER 33b6fe72da Extended help text
8 years ago
DL6ER 733919be4a Implement possibility to remove password using "pihole -web -p"
8 years ago
Dan Schaper 68cb0782c0 Add countdown timer
8 years ago
Dan Schaper 0f4c8d4923 Set default timeout to 60 seconds
8 years ago
Dan Schaper 6d2c5b2312 Add debug timeoute
8 years ago
Dan Schaper a95ce11ca6 Add debug timeoute
8 years ago
DL6ER 88c161769d Capitalized variable names.
8 years ago
DL6ER 01bf1ae92d Compute double hashes to avoid rainbow table vulnerability
8 years ago
DL6ER 9193c71cff Minor change
8 years ago
DL6ER db278d81e4 Added webpage.sh
8 years ago
Adam Warner b191cd73a7 Update piholeDebug.sh
8 years ago
Jacob Salmela ca56ca5bd8 promo-tweak
8 years ago
Jacob Salmela a0f0dff88e replace hardcoded interface with var
8 years ago
Dan Schaper 8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
8 years ago
Adam Warner 4300759287 Fix logic. If both v6 and v4 divide by two, else dont.
8 years ago
Promofaux d7d6d6f991 Update to use new Var name
8 years ago
Promofaux 2f976504e8 switch out -eq for ==
8 years ago
Dan Schaper 4b7b859db9 Gotta catch 'em all...'
8 years ago
Dan Schaper f7d0de53bb Compare string to string.
8 years ago
Dan Schaper 603ec997ba Remove testing block.
8 years ago
Dan Schaper f7266ef4c8 Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
8 years ago
Dan Schaper 3d43e1568c Use explicit calls for function to self-document
8 years ago
Dan Schaper c1a3f003e8 Rename the only utilty function left that didn't say `repo`
8 years ago
Dan Schaper 3f61aea7fc Utility functions fully quiet now. Calling functions have the echos.
8 years ago
Dan Schaper bd68db51e0 ShellCheck split local declaration and assignment.
8 years ago
Dan Schaper b8a5ed710e Take echos out of utility functions and move up a level.
8 years ago
Dan Schaper 34be601dd7 Test for lexicographically less than tag version.
8 years ago
Dan Schaper 1d64ad1ccd Stash all changed files, clean directory and pull updates.
8 years ago
Dan Schaper f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner ee37c37cab fix update output logic. version number variables should not be read only!
8 years ago
Dan Schaper b636c1e1f8 Whitespace.
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper ece1667fb0 Refactor and move some bits.
8 years ago
Adam Warner 50bd8b4a09 Further tweaks to local repo handling
8 years ago
Dan Schaper 93d91353a1 All tabs now spaced
8 years ago
Dan Schaper 8dc9143b34 Just delete, no need to cd there first.
8 years ago
Dan Schaper a0d9a1133c Factoring and combining functions
8 years ago
Dan Schaper 035e4bf727 Move value checks to `if` calls.
8 years ago
Dan Schaper 9ec5bbd560 Actually get `is_repo` to return a value and have it expected.
8 years ago
Dan Schaper 34482c5ed6 Modified `is_repo`
8 years ago
Dan Schaper 7d414b5628 Move version messages to main function, check for repos.
8 years ago
Dan Schaper d9528dfd09 Bash is funny with returns.
8 years ago
Dan Schaper 9c83825cb8 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc c30478bf4a cleanup and use sentintel in is_repo
8 years ago
diginc d986746ef9 missing quote added
8 years ago
diginc a8fa061f2e quote all the assignments prevent accidental glob splitting
8 years ago
Jacob Salmela f8e9726922 source setupVars and check for the correct variable
8 years ago
Jacob Salmela 884363bd05 remove ipv6 check since it's already in setupVars
8 years ago
Dan Schaper bdd240ecb6 Shellcheck catch for always true expansion.
8 years ago
Dan Schaper 04da292df9 Missed one spinner, updated and exit script if github is unreachable.
8 years ago
Dan Schaper 85b8676b8e Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
8 years ago
Dan Schaper 114bc13c23 Specify path, cron may not know where the files are located.
8 years ago
Dan Schaper 5fef5f1ed4 Break down `is_repo` to make sure it does what is expected.
8 years ago
Dan Schaper 807b60b0e6 Missed the second reinstaller....
8 years ago
Dan Schaper fbc800e556 If unattened reinstall fails, notify user and exit script immediately.
8 years ago
Dan Schaper 1991ee7a7d Google Style Guide. `readonly` and cap constants.
8 years ago