cred.json with 0640 permissions

Fixes #70
christianTF · Mar 3, 2021 · 83ed395 · 83ed395
1 parent 8709771
commit 83ed395
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/bin/updateconfig.pl b/bin/updateconfig.pl
@@ -138,6 +138,7 @@ sub update_config
 		$Credentials{brokerpass} = $cfg->{Main}{brokerpass};
 		$cred->{Credentials} = \%Credentials;
 		$credobj->write();
+		chmod 0640, $credobj->filename();
 		delete $cfg->{Main}{brokeruser};
 		delete $cfg->{Main}{brokerpass};
 		LOGWARN "Migrated MQTT credentials.";
@@ -193,6 +194,7 @@ sub update_config
 
 		$cred->{Credentials} = \%Credentials;
 		$credobj->write();
+		chmod 0640, $credobj->filename();
 
 		print STDERR "COMMAND: $lbphtmlauthdir/ajax_brokercred.cgi action=setcred brokeruser=$Credentials{brokeruser} brokerpass=$Credentials{brokerpass} brokerpsk=$Credentials{brokerpsk} enable_mosquitto=$cfg->{Main}{enable_mosquitto}\n";
 

diff --git a/postinstall.sh b/postinstall.sh
@@ -59,15 +59,17 @@ PBIN=$LBPBIN/$PDIR
 # echo "<INFO> Plugin Log folder (on RAMDISK!) is: $PLOG"
 # echo "<INFO> Plugin CONFIG folder is: $PCONFIG"
 
-
 echo "<INFO> Copy back existing config files"
 cp -f -r /tmp/$PTEMPDIR\_upgrade/config/$PDIR/* $LBHOMEDIR/config/plugins/$PDIR/ 
+chmod 0640 $LBHOMEDIR/config/plugins/$PDIR/cred.json
+chmod 0640 $LBHOMEDIR/config/plugins/$PDIR/cred.json.*
 echo "<INFO> Copy back existing data files"
 cp -f -r /tmp/$PTEMPDIR\_upgrade/data/transform/custom/ $PDATA/transform/custom/
 chmod -R 0774 $LBHOMEDIR/data/plugins/$PDIR/transform/custom/
 cp -f -r /tmp/$PTEMPDIR\_upgrade/data/transform/datastore/ $PDATA/transform/datastore/
 chmod -R 0774 $LBHOMEDIR/data/plugins/$PDIR/transform/datastore/
 
+
 # echo "<INFO> Remove temporary folders"
 # rm -f -r /tmp/$PTEMPDIR\_upgrade
 

diff --git a/webfrontend/htmlauth/ajax_brokercred.cgi b/webfrontend/htmlauth/ajax_brokercred.cgi
@@ -101,6 +101,7 @@ sub setcred
 
 	$cred->{Credentials} = \%Credentials;
 	$credobj->write();
+	chmod 0640, $credobj->filename();
 
 	if($cred) {
 		%response = (%response, %$cred);