Commit Graph

1612 Commits

Author SHA1 Message Date
yubiuser
e045ec3d32 Fix prettier complains
Signed-off-by: yubiuser <ckoenig@posteo.de>
2021-02-18 20:24:03 +01:00
yubiuser
cc2030968d Don't count new status types as blocked queries
Signed-off-by: yubiuser <ckoenig@posteo.de>
2021-02-17 22:55:27 +01:00
DL6ER
6a4634c185 Merge pull request #1742 from pi-hole/master
Sync master back to devel
2021-02-17 11:02:11 +01:00
Jonny Bolton
590749b7eb Typo fixed in save settings
Signed-off-by: Jonny Bolton <jonnybolton@gmail.com>
2021-02-16 17:39:39 +00:00
DL6ER
64b36564c5 Regenerate session ID on successful login to prevent session fixation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-02-03 14:37:58 +01:00
DL6ER
d4e46df28e Prevent javascript XSS attacks aimed to steal the session ID
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-02-03 14:18:29 +01:00
DL6ER
22d7df9116 Properly escape possible user-input
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-02-03 14:18:06 +01:00
DL6ER
2d02855830 Add interpretation of new query status 14 = already forwarded
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-24 10:38:22 +01:00
DL6ER
cfce364c84 Change tooltip wording to "% of shown items" to be more universal
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-19 08:04:22 +01:00
DL6ER
02389490dc Also compute and show share of displayed quantities in the doghount charts (only if some items are hidden)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-19 07:59:07 +01:00
DL6ER
92dbd9dd37 Only add link to Query Log when filtering property is available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-19 07:11:11 +01:00
DL6ER
d065328eb1 Merge branch 'devel' into new/OTHER_types
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-01-15 05:52:16 +01:00
Adam Warner
136006b1ee Merge pull request #1675 from pi-hole/new/SVCB_HTTPS
Add SVCB and HTTPS types
2021-01-13 21:15:12 +00:00
Adam Warner
952c1572f5 Merge pull request #1683 from mdujava/basic_auth
Url of adlist can contain userinfo (basicauth)
2021-01-13 20:41:50 +00:00
Adam Warner
509a082d02 Update scripts/pi-hole/php/groups.php 2021-01-13 20:40:04 +00:00
DL6ER
012116a58d Merge pull request #1672 from pi-hole/fix/groups_backend
Bugfix allowing to effectively set empty domain/client/adlist groupsets
2021-01-13 21:28:20 +01:00
Matej Dujava
c09263b926 Adlist can contain userinfo (basicauth)
Web side of fix https://github.com/pi-hole/pi-hole/pull/3912

Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
2021-01-05 19:54:28 +01:00
Dan Schaper
2976254bbc unicorn/no-lonely-if
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-01-02 20:53:20 -08:00
Dan Schaper
e763993574 unicorn/prefer-dom-node-append
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-01-02 20:33:14 -08:00
Dan Schaper
3bd702563c Date.now() fixes
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-01-02 20:33:14 -08:00
buchwasa
650ae0bf56 Use new style constructors
Signed-off-by: buchwasa <17461354+buchwasa@users.noreply.github.com>
2020-12-31 15:00:21 -05:00
DL6ER
9b19104ae6 Merge pull request #1654 from buchwasa/phpstan-fixes
Fixes in func.php from phpstan
2020-12-31 11:59:23 +01:00
DL6ER
fa2279d473 Add SVCB and HTTPS types and reduce code duplication
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-12-31 10:54:01 +01:00
DL6ER
ba1ac8621f Use empty array for foreach() when no group is to be set, always commit when editing domains, and report any errors while commiting.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-12-28 07:57:58 +01:00
Fabian Preuß
54dfc54a61 Fix sorting by replies in query log
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de>
2020-12-27 04:45:24 +01:00
Adam Warner
f7733f430e Merge pull request #1664 from pi-hole/fix/transactions
Fix transactions in groups.php
2020-12-23 22:34:04 +00:00
DL6ER
8d73511005 Merge pull request #1665 from pi-hole/fix/escape-all-the-things
Prevent malformed DNS queries executing JS on querylog/long term query pages
2020-12-23 20:47:36 +01:00
Adam Warner
a28f4e4f18 Prevent malformed DNS queries executing JS on querylog/long term query log
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-23 18:11:14 +00:00
DL6ER
564a4838ae Fix transactions in groups.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-12-23 15:21:57 +01:00
yubiuser
42e7915b53 Fix typo
Signed-off-by: yubiuser <ckoenig@posteo.de>
2020-12-20 20:35:21 +01:00
yubiuser
c07b710d07 Validate target domain for CNAME records
Signed-off-by: yubiuser <ckoenig@posteo.de>
2020-12-20 20:26:37 +01:00
buchwasa
98e6a45242 Fixes in func.php from phpstan
Signed-off-by: buchwasa <17461354+buchwasa@users.noreply.github.com>
2020-12-10 16:51:42 -05:00
DL6ER
ad5679ae70 Merge pull request #1619 from notriddle/master
Switch from fontawesome webfonts to SVG + JS
2020-12-10 22:24:11 +01:00
DL6ER
835f12ddec Merge pull request #1594 from yubiuser/tweak/colors
Change color of blocked queries in dashboard piechart forward destination to red
2020-12-10 22:08:35 +01:00
DL6ER
6ade8df31f Merge pull request #1646 from dnhp/bf-dnhp-1643
Fix issue 1643 - Show status of retried DNS queries in query log correctly
2020-12-10 22:06:36 +01:00
Aidan Woods
85c7a3b437 Use hash_equals when comparing to pwhash from cookie
This should prevent a timing attack against this parameter to
disclose the stored passsword hash.

Signed-off-by: Aidan Woods <aidantwoods@gmail.com>
2020-12-06 13:26:02 +00:00
dnhp
ef6a740370 Fix issue 1643 - quote numbers in switch case
Signed-off-by: dnhp <34394848+dnhp@users.noreply.github.com>
2020-12-01 12:04:16 +00:00
Adam Warner
68351a3a91 Merge pull request #1634 from pi-hole/new/unlink_DHCP_lease
Add button to remove dynamic DHCP leases
2020-11-28 16:32:37 +00:00
Adam Warner
483f5037db Merge pull request #1625 from pi-hole/tweak/replace_domains
Add new replace_domain action to allow adding domain(s) exclusively to a specific list
2020-11-28 16:25:38 +00:00
Adam Warner
99feecdf4d Merge pull request #1626 from pi-hole/fix/no_empty_names
Ensure empty clients/groups/adlists/audits cannot be added
2020-11-28 16:13:29 +00:00
DL6ER
6e0e1bbb41 Add button to remove dynamic DHCP leases. They are immediately removed both from FTL and the dhcp.leases file (FTL takes care of updating the file!) WITHOUT the need for a restart of the DHCP/DNS resolver.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-23 13:35:40 +01:00
DL6ER
1ea21911cf Merge pull request #1630 from pi-hole/new/mesage_dnsmasq_config_errors
Print fatal dnsmasq errors
2020-11-18 00:11:32 +01:00
DL6ER
5e808765e3 Print fatal dnsmasq errors
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-17 22:41:00 +01:00
DL6ER
4ee491115a Show upstream destination a query was sent to in the Query Log (both standard and long-term)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-13 01:01:49 +01:00
DL6ER
c8b85b8596 Use INSERT OR IGNORE instead of REPLACE
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-10 21:26:01 +01:00
DL6ER
0de0edcc9b Merge branch 'devel' into tweak/replace_domains 2020-11-09 22:28:13 +01:00
DL6ER
a3b24e08aa Reduce code-duplication by moving the addFromQueryLog() function into utils.js. This also fixes non-visible modals on the long-term query log page.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-09 21:33:09 +01:00
DL6ER
ad43e5a8dc Add missing space and extend error hiding timeout from 4 to 10 seconds.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-09 21:21:30 +01:00
DL6ER
4557846858 Use JOIN instead of nested SELECT
Signed-off-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2020-11-09 21:17:26 +01:00
DL6ER
f5a39ce1e4 Check if replacing the domain messes with existing special groups settings. Don't change it but show a warning if this is the case.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-11-08 22:52:03 +01:00