Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Software | Pi-hole: Block access to blocking page from web by default #3054

Merged
merged 8 commits into from
Aug 19, 2019
Merged

DietPi-Software | Pi-hole: Block access to blocking page from web by default #3054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67f0fda
Add requested security enhancements from #3024
Aug 10, 2019
390cb35
Redid everything
Aug 12, 2019
3888e7f
v6.26
MichaIng Aug 13, 2019
c0c2d92
Added optional blocking of remote access to admin panel
Aug 13, 2019
5b67f6d
v6.26
MichaIng Aug 14, 2019
0d08f0c
v6.26
MichaIng Aug 14, 2019
5f948dc
v6.26
MichaIng Aug 14, 2019
287b364
v6.26
MichaIng Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .conf/dps_93/lighttpd.block_nonlocal_admin.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Block non-LAN access to Pi-hole admin panel
$HTTP["url"] =~ "^(/html)?/admin(/|$)" {
$HTTP["remoteip"] !~ "^1(27|92.168|0|72.(1[6-9]|2[0-9]|3[0-1]))\." {
url.access-deny = ("")
}
}
9 changes: 9 additions & 0 deletions .conf/dps_93/lighttpd.pihole.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,12 @@ $HTTP["url"] =~ "^/admin/" {
$HTTP["url"] =~ "^/admin/\.(.*)" {
url.access-deny = ("")
}

# If it's a request to Pi-hole blocking page...
$HTTP["url"] =~ "^(/html)?/pihole(/|$)" {
# ... and the request isn't local
$HTTP["remoteip"] !~ "^1(27|92.168|0|72.(1[6-9]|2[0-9]|3[0-1]))\." {
# block!
url.access-deny = ("")
}
}
11 changes: 11 additions & 0 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8756,6 +8756,17 @@ _EOF_
dps_index=$software_id Download_Install 'lighttpd.pihole.conf' /etc/lighttpd/conf-available/99-dietpi-pihole.conf
lighttpd-enable-mod dietpi-pihole

# Ask user if they want to block report access to the admin page
dps_index=$software_id Download_Install 'lighttpd.block_nonlocal_admin.conf' /etc/lighttpd/conf-available/99-dietpi-pihole-block_nonlocal_admin.conf

G_WHIP_BUTTON_OK_TEXT='YES'
G_WHIP_BUTTON_CANCEL_TEXT='NO'
G_WHIP_YESNO "In order to increase security, it is recommended that you block remote access to the Pi-hole admin panel, so that unless you're on a local network, the Pi-hole admin panel isn't accessible.\n
You can always enable/disable this at a later point using the commands:
- lighttpd-enable-mod dietpi-pihole-block_nonlocal_admin
- lighttpd-disable-mod dietpi-pihole-block_nonlocal_admin\n
Do you want to block remote access to the admin panel now?" && lighttpd-enable-mod dietpi-pihole-block_nonlocal_admin

fi

# Create symlinks to align Pi-hole admin and blocking page relative to webroot
Expand Down