Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 12:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

744 Commits

Author SHA1 Message Date
Mark Drobnak
9d4e545593 Use simpler check for dash in is_valid_domain_name 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-11-24 11:21:54 -05:00
Mcat12
e7f4ef8a09 Prevent domains sent to queryAds acting as command line options 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-23 14:43:08 -05:00
Mcat12
13c29336b2 Prevent possible attacks via admin email setting 
The admin email is now treated as a single string (surrounded by single
quotes), and it is not allowed to contain its own single quotes.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-23 14:35:43 -05:00
Mcat12
79c7c893ac Move footer script back to footer 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-10 13:55:37 -05:00
Mcat12
500b3b774c Move dependency scripts to header 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-11-10 13:54:33 -05:00
DL6ER
ba11c7b394 Disply that the privacy level wasn't changed when this is the case. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-10 08:40:05 +01:00
DL6ER
8c08ec2a10 Automatically restart DNS resolver when privacy level is lowered 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-10 08:38:55 +01:00
Mark Drobnak
f612e51f15 Merge pull request #852 from bitcynth/patch-1 
Error handling in savesettings.php
 2018-11-07 18:03:38 -05:00
Cynthia
34bbb9a70e Error handling in savesettings.php 
This is to address https://github.com/pi-hole/pi-hole/issues/2444

Signed-off-by: Cynthia Revstrom <me@cynthia.re>
 2018-10-03 02:28:27 +02:00
Mark Drobnak
02cc5fad15 Write newline after wildcard 
This makes the web interface add wildcards in the same way as the CLI.

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-09-01 19:34:25 -04:00
Mark Drobnak
4a63500d10 Merge pull request #834 from MikeSouza/new/list-api 
Add API support for list actions
 2018-09-01 19:29:01 -04:00
DL6ER
6441a675c5 Add Quad9 secondary IPv6 IP addresses. This was a feature request on Discourse. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-31 12:48:25 +02:00
DL6ER
9a950147c4 Add explanation what ECS is as we shouldn't use acronyms without explaining them. Further, this information may be useful for less tech-savvy users. 
Add that (at least) Google, OpenDNS, and Cloudflare use ECS (according to http://www.afasterinternet.com/participants.htm). I found no reference for the other providers in the table.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-30 17:56:11 +02:00
DL6ER
a2ade60cea Add more detailed selections for the services offered by Quad9 and improve responsive design 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-30 17:35:47 +02:00
Mike Souza
203d41103a Add API support for list actions 
Signed-off-by: Mike Souza <contact@michael-souza.com>
 2018-08-26 11:56:44 -04:00
DL6ER
d67f8c66ee Wrong token is either when users try to do it via an old session or through a script. Hence, the message should tell the user to re-login 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-24 19:09:24 +02:00
DL6ER
7a9fcc1676 The "Wrong Token." message is shown whenever the token is wrong or not available. This commit adds more details into this message to help user's in their own troubleshooting. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-24 19:00:42 +02:00
Mcat12
78ae865d62 Add support for privacy level 4 (no stats) 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 17:33:29 -04:00
DL6ER
78d262d7b0 Offer possibility to import auditlog.list from teleporter archive 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-10 18:25:12 +02:00
DL6ER
82f4d718aa Merge pull request #812 from pi-hole/fix/settings_page_adlists_show_everything 
Don't require adlists to start in "http"
 2018-08-08 21:32:18 +02:00
DL6ER
2df4a0d052 Improve logic 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-08 21:17:10 +02:00
DL6ER
8b1313b864 Don't require adlists to start in "http". This also displays lists that start in e.g., "ftp://" or "file://" or without a protocol. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-08 12:06:59 +02:00
DL6ER
73265605c2 Acknowledge possible custom time interval set by MAXLOGAGE in pihole-FTL.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-08 10:35:31 +02:00
Mark Drobnak
c847144152 Merge pull request #802 from pi-hole/devel 
Bring missing v4.0 changes into release branch
 2018-08-03 23:28:58 -04:00
DL6ER
1e7e0dc0f9 Merge pull request #798 from pi-hole/fix/list-comments 
Ignore commented lines in list files
 2018-08-02 12:20:55 +02:00
Mcat12
57698ba45a Fix permissive regex 
The `\.?` is too permissive, letting in anything that ends in the domain

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-31 22:17:25 -04:00
Mcat12
b7ad22c51e Use simpler regex format for wildcards 
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-31 21:35:27 -04:00
Mark Drobnak
97023278b3 Ignore commented lines in list files 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-07-31 21:12:41 -04:00
Mcat12
2188103b5c Update blocklist wording and help page 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-22 11:57:16 -04:00
DL6ER
7c9f09db0e Directly write imported regex file to disk instead of useing bash callbacks 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-15 12:56:40 +02:00
DL6ER
3e4613caf0 Move function add_regex($regex) to func.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-15 12:48:46 +02:00
DL6ER
65d0c7a1d9 Also try to import legacy wildcard list if found in imported teleporter archive 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 22:25:17 +02:00
DL6ER
e67695d51a Add files backed up from /etc/dnsmasq.d into a separate directory to tidy up the generated archive 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:46:22 +02:00
DL6ER
ed8dbfd10e Show number of processed items when importing whitelist, blacklist, and regex filters 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:34:42 +02:00
DL6ER
50885d092a Import regex.list if requested. Don't check validity of regex filters as they are not necessarily in valid domain format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:33:52 +02:00
DL6ER
6dc8bf300c Export regex.list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-07-14 15:27:54 +02:00
Mcat12
fbe9516cbe Fix incorrect regex removal code 
If you had these in the regex list:
- example\.com
- example
- ^example.*

And you removed "example", then the list would look like this:
- \.com
- ^.*

This behavior is fixed.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-08 16:27:38 -04:00
Mcat12
2759ec0da5 Add missing break statements 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-30 15:18:13 -04:00
DL6ER
e8b2cbe698 Tag regex filters as "regex" to avoid the domain validation (otherwise regex lines could not get removed). Also ensure that deleting the first wildcard/regex does not hide the first exact blocking domain (this bug has been in since the very beginning of wildcard blocking) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:42:52 +02:00
DL6ER
4566db2a7c Use passed argument in new function add_regex() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:30:45 +02:00
DL6ER
ec0afceeed Add new button to allow both regex filters and legacy wildcards (get automatically converted to regex format) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-30 14:19:03 +02:00
Mcat12
4259aada78 Don't leave a newline at the end of the regex file 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-29 23:03:01 -04:00
Mcat12
aef5f7c7ce Keep trailing newline in regex file after removal 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-28 23:16:11 -04:00
DL6ER
c0da231fa6 Force reload of the regex filters in FTLDNS after having added/removed one from the dashboard 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-24 12:42:05 +02:00
DL6ER
1935544183 Directly manipulate regex.list from PHP to avoid detour over bash. This needs read/write permissions of the PHP user on "/etc/pihole/regex.list" ! 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-23 15:50:19 +02:00
DL6ER
3f7246968e Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 20:01:46 +02:00
DL6ER
36930e3834 Add regex support on the web interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-05 10:35:41 +02:00
Rob Gill
96039f52a5 fix typo in cookie check 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 09:52:07 +10:00
Mark Drobnak
523b4c390d Merge pull request #522 from Th3M3/clean_up_style-rules 
Clean up style rules
 2018-05-29 18:16:31 -04:00
Kevin Kirsche
49d6feb4c3 Fix 579 | Add interface option for administrator email address (Redo of #757) 
Signed-off-by: Kevin Kirsche <Kev.Kirsche@gmail.com>
 2018-05-26 23:17:17 -04:00