44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-31 08:39:18 +02:00
5060605626
Print table name before entering the loop for the sake of simplicity
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-30 21:44:59 +02:00
a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 18:25:11 +02:00
5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:24:36 +02:00
f80fdd7e83
Improve comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:19:50 +02:00
6ba58896d2
Simplify code
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:15:30 +02:00
3aa838bbe4
Implement black- and whitelist searching with SQL statements. We use the ESCAPE clause in the LIKE query as the underscore "_" wildcard matches any single character but we want to suppress this behavior (underscores can be legitimate part of domains)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:02:14 +02:00
0bc112ce52
Query only those columns we actually use when showing domains on the CLI. Show date of last modification instead of addition date for domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-02 17:11:39 +02:00
b372f808dd
Fix lint errors
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:06:14 +02:00
bc9b623638
Modify query.sh to use the gravity database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 16:56:16 +02:00
efeba594ae
Add support for manipulating adlists from the CLI
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-28 21:39:06 +02:00
126f7101ff
Add (optional) date_modified field and use vw_whitelist view in vw_blacklist
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-28 14:44:03 +02:00
b4ae142149
Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 20:54:01 +02:00
3fe43ce1d9
Rely on default value (database provided) for date_added when adding a new domain
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 18:16:04 +02:00
e04dc9d2bb
Remove sqlitekey variable as the first column of the regex table is now called domain as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:44:42 +02:00
a891d64395
We should always exit after displaying a list, even if it is empty
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:13:36 +02:00
6b1d2523e8
Also print datetime a domain was added when listing the domains on the CLI
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:07:16 +02:00
08ee9526ad
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:06:01 +02:00
a2a7e80007
Add --web for sending a confirmation string when executed from the web interface. This is necessary as the "Reloading DNS service" message does not always propagate through to the web interface when reloading pihole-FTL takes a while.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 15:01:13 +02:00
cce66a13b6
Fix output in list.sh when adding a domain that is already present in the target list
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 14:54:41 +02:00
43bced7997
Add more comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:45:08 +02:00
788cd78321
Reduce code duplication and add special handling of | character as it might appear in regex filter string
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:30:38 +02:00
e5d1cb5a2e
Rewrite list.sh to operate on database-based lists
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:10:42 +02:00
a7f6c9b3a0
Ignore matches that start # using negative lookbehind
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2019-03-29 00:08:04 +00:00
2e17c23333
Don't warn if user is on development as this branch is constantly updated
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-03-02 16:40:59 +01:00
63f3381a2b
Warn user if FTL is not on branch master
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-03-02 16:36:49 +01:00
71cd6c137b
Use curl instead of openssl for transmission of unmodified
...
log file. We want ansi color codes to be sent.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2019-02-23 04:13:44 -08:00
a145f1d931
Be more verbose with debug script output
...
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff
Signed-off-by: Adam Warner <adamw@rner.email >
2019-02-18 22:32:53 +00:00
26f2410fe6
Change /var/run/shm to /dev/shm
...
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-02-02 10:37:12 -08:00
5c4ee23795
Fix missed start_service -> restart_service call
...
start_service was changed to restart_service.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-02-02 10:19:44 -08:00
a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm
...
List content of /var/run/shm in debugger
2019-01-02 15:12:54 -05:00
5ffc8c7443
List content of /var/run/shm in debugger
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-01 17:56:02 +01:00
ed5869646f
Use source instead of dot for setupVars
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2018-12-27 16:37:10 -05:00
be2d494fcf
Don't show web version in pihole -v output if not installed
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-12-12 14:55:09 -05:00
1cad069050
Add privacy level 4 to all privacy level code
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-12-10 10:18:25 -05:00
916b2920be
Merge pull request #2525 from pi-hole/release/v4.1
...
Release/v4.1 to Development
2018-11-29 08:46:05 -08:00
9f672593bc
Update advanced/Scripts/webpage.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com >
2018-11-26 20:01:41 +01:00
a285ae65fb
Backend changes for DHCPv4 rapid commit support
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-11-25 08:39:58 +01:00
9d59da8974
Remove dnsmasq checks from debugger
...
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-11-08 21:51:21 -05:00
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check
...
fix debug service check via sysvinit
2018-11-07 17:50:32 -05:00
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
...
Fix error when reading in new password
2018-11-01 07:05:27 -07:00
72829be281
Remove shellcheck overrides
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-10-26 12:14:10 -07:00
d57f9906bd
read -r -a, not read -a -r
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-10-26 19:24:43 +01:00
3d4fea6510
Move -r to before the -p
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-10-26 19:17:49 +01:00
3ec84553ef
fix debug service check via sysvinit
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-10-24 10:06:11 -06:00
180d29c7b3
Prevent BASH from expanding Web Password
...
* Resolves issue #2471
Signed-off-by: WaLLy3K <wally3k@pi-hole.net >
2018-10-21 11:08:22 +11:00
85dceb12a1
Use curl -s instead of -q
...
See #2416
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2018-10-12 23:53:21 -04:00
d55012f724
Append versions (after the first) instead of overwriting in updatecheck
...
Fixes an issue brought up in #2435
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-09-30 20:56:44 -04:00
7c6eecc9c8
Ignore shellcheck warning
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-09-30 18:16:08 -04:00
e4cbf5023a
Fix error when reading in new password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-09-30 18:09:59 -04:00
DL6ER