Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-21 18:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,576 Commits 27 Branches 113 Tags
ea24655a7bf844457eb9cd814dc8bc431ebdc18d
Commit Graph

89 Commits

Author SHA1 Message Date
RD WebDesign
b94884ae17 Show ignored items when adding new adlists (#1997) 
* Show ignored itens when adding new adlists

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* Show ignored itens when adding new adlists (new messages)

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
 2021-12-17 19:56:49 +01:00
Adam Warner
01191c7a1b Merge pull request from GHSA-mhr8-7rvg-8r43 
* Prevent possible XSS attack vector on add_client
Update JS code to prevent possible XSS vector

Co-authored-by: Harold Kim <root@stypr.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix both addClient and deleteClient to prevent XSS

Signed-off-by: Harold Kim <root@stypr.com>

Co-authored-by: Harold Kim <root@stypr.com>
 2021-10-23 19:26:07 +01:00
a1346054
48c63c0a0b Fix spelling 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:22:59 +00:00
Adam Warner
647eba40d3 Merge branch 'release/v5.6' into devel 2021-08-04 20:32:59 +01:00
Adam Warner
dacdb3d72c Merge pull request #1857 from pi-hole/master 
Sync Master -> Dev
 2021-08-04 20:21:44 +01:00
Adam Warner
8066069a1f Prevent arbritary js code from beign returned from the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 17:29:57 +01:00
DL6ER
559150bb1f Fix inverse logic when adding domains on the group management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 19:03:34 +02:00
DL6ER
03920e3595 Move validation functions into func.php and use the same validation in all cases. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 16:59:16 +02:00
DL6ER
ca71bc8df8 Check if we can get a host name from the database when looking up the MAC address of this client instead 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-04-29 09:28:12 +02: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
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
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
DL6ER
564a4838ae Fix transactions in groups.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-12-23 15:21:57 +01: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
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
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
DL6ER
90c9ebc54b Ensure empty clients/groups/adlists/audits cannot be added 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-08 22:06:30 +01:00
DL6ER
0e924fd910 Add new replace_domain action in groups.php to allow adding domain(s) exclusively to a specific list. In this mode, any occurrences of said domain are first removed from the list before adding the new ones. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-11-08 18:51:49 +01:00
DL6ER
1b129bcad0 Merge branch 'release/v5.2' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-30 21:56:21 +02:00
DL6ER
fdea341c9f Fix audit log button doing nothing (resp. wrongthing) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-20 22:04:59 +02:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 18:50:36 +01:00
Adam Warner
5b71dab0c7 Change INSERT statement to INSERT OR IGNORE on adlist management as a workaround for now 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-06 18:27:22 +01:00
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 22:24:17 +02:00
Adam Warner
efd9281fa4 Merge pull request #1442 from pi-hole/fix/null_comments_in_groups 
Store NULL for empty descriptions and comments in the groups database tables
 2020-06-05 19:17:57 +01:00
Adam Warner
7aa79a7a77 Merge pull request #1420 from pi-hole/tweak/improve_warnings 
Improve messages on the domain management pages
 2020-06-05 19:17:17 +01:00
DL6ER
a7bc6e8999 Store NULL for emtpty descriptions and comments in the groups database tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 11:53:10 +02:00
Adam Warner
981cba14f2 Use PHP builtin to split the input by space. Automatically takes into account " chars 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 16:50:33 +01:00
DL6ER
580149e91f Merge pull request #1292 from pi-hole/tweak/group_name_separators 
Allow spaces in groups when wrapping names in "..."
 2020-06-02 13:43:49 +02:00
DL6ER
332cff1d36 Improve warnings on the domain management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 11:37:23 +02:00
Adam Warner
7700d9b44a Merge pull request #1387 from pi-hole/new/api_add_sub_get_lists 
(Re-)Add API endpoints for list manipulations
 2020-05-29 23:30:40 +01:00
DL6ER
cce92ccde4 Remove obsolete add.php script, use groups.php everywhere instead. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 23:07:20 +02:00
Adam Warner
c2a634f80f Allow for ; in adlist urls 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-26 20:58:18 +01:00
DL6ER
2fac217943 Re-implement api.php?list actions for add, sub and get. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 18:40:33 +02:00
DL6ER
090e55ef99 Use host names stored in the network_addresses table when querying new client suggestions. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-18 14:29:41 +02:00
DL6ER
dca347c056 Fix missing separator when there is vendor and address but no hostname 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 18:44:12 +02:00
DL6ER
7a5235512b Order suggested clients by firstSeen (most recent on top). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 18:44:11 +02:00
DL6ER
f7647c9c6d Show hostname(s) first, then MAC vendor (if applicable) and then IP address(es). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-15 00:00:36 +02:00
DL6ER
29e048824e Ensure we're not adding IPs for mock devices. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 23:58:24 +02:00
DL6ER
389f1d1ecd Fix failed git auto-merge. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 20:29:42 +02:00
DL6ER
8a794bf9aa Also show IP addresses in MAC details 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 20:13:49 +02:00
DL6ER
fe10059517 Finalize sub-queries to ensure we're not running out of memory with hundreds of clients (can result in O(N^2) memory requirements). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:43:35 +02:00
DL6ER
8c53844ef3 Add device vendor (if available) to info string shown in the select dropdown 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:43:35 +02:00
DL6ER
3e1a1f59aa Add support for multiple hostnames per client (hardware address). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:43:35 +02:00
DL6ER
402e56e054 Allow adding groups with spaces in them when wrapping groups names in quotation marks. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:04:31 +02:00
Adam Warner
ef13e69125 Use REPLACE into instead of INSERT into. This allows for a domain's white/blacklist status to be toggled 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-13 22:01:58 +01:00
DL6ER
68b99658ad Ensure IP addresses w/o MAC addresses are also shown and that already added clients are hidden. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 22:59:28 +02:00
DL6ER
bdca8104e5 Add better select menu allowing users to filter inside the dropdown as well as add new entries in place. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 21:19:05 +02:00