frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Update sudoers file handling. Resolves #41. Addresses #127

Browse Source
This commit is contained in:
billz 2020-03-19 09:37:05 +00:00
parent c52487c671
commit c649246614
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
installers/common.sh
View File

@ -6,14 +6,22 @@
raspap_dir="/etc/raspap" raspap_dir="/etc/raspap"
raspap_user="www-data" raspap_user="www-data"
raspap_sudoers="/etc/sudoers.d/090_raspap"
webroot_dir="/var/www/html" webroot_dir="/var/www/html"
git_source_url="https://github.com/$repo" # $repo from install.raspap.com git_source_url="https://github.com/$repo" # $repo from install.raspap.com
# Fetch details for various Linux distros
if type lsb_release >/dev/null 2>&1; then # linuxbase.org if type lsb_release >/dev/null 2>&1; then # linuxbase.org
OS=$(lsb_release -si) OS=$(lsb_release -si)
RELEASE=$(lsb_release -sr) RELEASE=$(lsb_release -sr)
CODENAME=$(lsb_release -sc) CODENAME=$(lsb_release -sc)
DESC=$(lsb_release -sd) DESC=$(lsb_release -sd)
elif [ -f /etc/os-release ]; then # freedesktop.org
. /etc/os-release
OS=$ID
RELEASE=$VERSION_ID
CODENAME=$VERSION_CODENAME
DESC=$PRETTY_NAME
else else
install_error "Unsupported Linux distribution" install_error "Unsupported Linux distribution"
fi fi
@ -30,7 +38,7 @@ elif [ "$RELEASE" -lt "8" ]; then
install_error "${DESC} is unsupported. Please install on a supported distro." install_error "${DESC} is unsupported. Please install on a supported distro."
fi fi
if [ "$OS" = "Debian" ]; then if [ ${OS,,} = "debian" ]; then
dhcpcd_package="dhcpcd5" dhcpcd_package="dhcpcd5"
fi fi
@ -309,7 +317,7 @@ function enable_raspap_daemon() {
# Add a single entry to the sudoers file # Add a single entry to the sudoers file
function sudo_add() { function sudo_add() {
sudo bash -c "echo \"$raspap_user ALL=(ALL) NOPASSWD:$1\" | (EDITOR=\"tee -a\" visudo)" \ sudo bash -c "echo \"$raspap_user ALL=(ALL) NOPASSWD:$1\" | tee -a $raspap_sudoers" \
|| install_error "Unable to patch /etc/sudoers" || install_error "Unable to patch /etc/sudoers"
} }
@ -356,14 +364,20 @@ function patch_system_files() {
"/bin/chmod o+r /tmp/dnsmasq.log" "/bin/chmod o+r /tmp/dnsmasq.log"
) )
# Create sudoers if not present
if [ ! -f $raspap_sudoers ]; then
install_log "Creating ${raspap_sudoers}"
sudo touch $raspap_sudoers
fi
# Check if sudoers needs patching # Check if sudoers needs patching
if [ $(sudo grep -c $raspap_user /etc/sudoers) -ne ${#cmds[@]} ] if [ $(sudo grep -c $raspap_user $raspap_sudoers) -ne ${#cmds[@]} ]; then
then
# Sudoers file has incorrect number of commands. Wiping them out. # Sudoers file has incorrect number of commands. Wiping them out.
install_log "Cleaning system sudoers file" install_log "Cleaning system sudoers file"
sudo sed -i "/$raspap_user/d" /etc/sudoers sudo sed -i "/$raspap_user/d" $raspap_sudoers
install_log "Patching system sudoers file" install_log "Patching system sudoers file"
# patch /etc/sudoers file
# patch /etc/sudoers.d/090_raspap file
for cmd in "${cmds[@]}" for cmd in "${cmds[@]}"
do do
sudo_add $cmd sudo_add $cmd