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

Workaround for logs permissions not sticking

Browse Source
This commit is contained in:
Taikuh 2020-03-10 05:08:26 +08:00
parent c44d58d51b
commit 4a85188a22
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installers/common.sh
View File

@ -108,13 +108,6 @@ function create_hostapd_scripts() {
sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions" sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions"
} }
# Generate dnsmasq logfile
function create_dnsmasq_log() {
install_log "Creating dnsmasq logfile"
sudo touch /tmp/dnsmasq.log || install_error "Unable to create logfile /tmp/dnsmasq.log"
sudo chown dnsmasq:"$raspap_user" /tmp/dnsmasq.log || install_error "Unable to change file ownership"
}
# Generate lighttpd service control scripts # Generate lighttpd service control scripts
function create_lighttpd_scripts() { function create_lighttpd_scripts() {
install_log "Creating lighttpd control scripts" install_log "Creating lighttpd control scripts"
@ -252,8 +245,6 @@ function default_configuration() {
'echo 1 > \/proc\/sys\/net\/ipv4\/ip_forward #RASPAP' 'echo 1 > \/proc\/sys\/net\/ipv4\/ip_forward #RASPAP'
'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP' 'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP'
'iptables -t nat -A POSTROUTING -s 192.168.50.0\/24 ! -d 192.168.50.0\/24 -j MASQUERADE #RASPAP' 'iptables -t nat -A POSTROUTING -s 192.168.50.0\/24 ! -d 192.168.50.0\/24 -j MASQUERADE #RASPAP'
'chown dnsmasq:www-data \/tmp\/dnsmasq.log #RASPAP'
'chown root:www-data \/tmp\/hostapd.log #RASPAP'
) )
for line in "${lines[@]}"; do for line in "${lines[@]}"; do
@ -335,6 +326,8 @@ function patch_system_files() {
"/etc/raspap/hostapd/servicestart.sh" "/etc/raspap/hostapd/servicestart.sh"
"/etc/raspap/lighttpd/configport.sh" "/etc/raspap/lighttpd/configport.sh"
"/etc/raspap/openvpn/configauth.sh" "/etc/raspap/openvpn/configauth.sh"
"/bin/chmod o+r /tmp/hostapd.log"
"/bin/chmod o+r /tmp/dnsmasq.log"
) )
# Check if sudoers needs patching # Check if sudoers needs patching
@ -449,7 +442,6 @@ function install_raspap() {
download_latest_files download_latest_files
change_file_ownership change_file_ownership
create_hostapd_scripts create_hostapd_scripts
create_dnsmasq_log
create_lighttpd_scripts create_lighttpd_scripts
move_config_file move_config_file
default_configuration default_configuration

1
installers/enablelog.sh
View File

@ -1,4 +1,3 @@
#!/bin/bash #!/bin/bash
/bin/sed -i 's|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|' /etc/default/hostapd /bin/sed -i 's|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|' /etc/default/hostapd
touch /tmp/hostapd.log touch /tmp/hostapd.log
chmod o+r /tmp/hostapd.log

1
templates/dhcp/logging.php
View File

@ -13,6 +13,7 @@
</div> </div>
<?php <?php
exec('sudo chmod o+r /tmp/dnsmasq.log');
$log = file_get_contents('/tmp/dnsmasq.log'); $log = file_get_contents('/tmp/dnsmasq.log');
echo '<textarea class="logoutput my-3">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>'; echo '<textarea class="logoutput my-3">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
?> ?>

1
templates/hostapd.php
View File

@ -113,6 +113,7 @@
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<?php <?php
if ($arrHostapdConf['LogEnable'] == 1) { if ($arrHostapdConf['LogEnable'] == 1) {
exec('sudo /bin/chmod o+r /tmp/hostapd.log');
$log = file_get_contents('/tmp/hostapd.log'); $log = file_get_contents('/tmp/hostapd.log');
echo '<br /><textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>'; echo '<br /><textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
} else { } else {