root/ubuntu-based-kiosk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix power menu IPC and export/import permissions

Browse Source 
- Power menu: Send IPC to views[] instead of mainWindow.webContents
  (preload.js runs in BrowserViews, not mainWindow)
- Export: Add chmod 777 to temp dir, use sudo for all file operations,
  use sudo tar and fix archive ownership
- Import: Use sudo tar, add proper permissions to temp directory
This commit is contained in:
Claude
2025-12-28 21:35:37 +00:00
parent 79d112794b
commit eb2f31f818
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install_kiosk_v0.9.9.1.sh
+17 -14
View File
@@ -5257,12 +5257,12 @@ function showPowerMenu(){
// For normal mode, use custom overlay with 30-second timeout // For normal mode, use custom overlay with 30-second timeout
console.log('[POWER] Showing custom power menu overlay'); console.log('[POWER] Showing custom power menu overlay');
if(mainWindow&&!mainWindow.isDestroyed()){ const powerInfo={version:VERSION,localIP:localIP,vpnIP:vpnIP.trim()};
mainWindow.webContents.send('display-power-menu',{ // Send to all views (preload.js runs in views, not mainWindow)
version:VERSION, for(const view of views){
localIP:localIP, if(view&&view.webContents&&!view.webContents.isDestroyed()){
vpnIP:vpnIP.trim() view.webContents.send('display-power-menu',powerInfo);
}); }
} }
} }
@@ -10359,10 +10359,11 @@ export_settings() {
local export_dir="/tmp/kiosk-backup-$(date +%Y%m%d-%H%M%S)" local export_dir="/tmp/kiosk-backup-$(date +%Y%m%d-%H%M%S)"
mkdir -p "$export_dir" mkdir -p "$export_dir"
chmod 777 "$export_dir"
echo "[1/7] Exporting core configuration..." echo "[1/7] Exporting core configuration..."
if [[ -f "$CONFIG_PATH" ]]; then if [[ -f "$CONFIG_PATH" ]]; then
sudo -u "$KIOSK_USER" cp "$CONFIG_PATH" "$export_dir/config.json" sudo cp "$CONFIG_PATH" "$export_dir/config.json"
log_success "Core config exported" log_success "Core config exported"
else else
log_warning "No core config found" log_warning "No core config found"
@@ -10482,12 +10483,12 @@ export_settings() {
home_dir="/tmp" home_dir="/tmp"
fi fi
# Fix permissions for tar # Fix permissions for tar (make readable by all)
sudo chmod -R 644 "$export_dir"/* 2>/dev/null sudo chmod -R a+r "$export_dir" 2>/dev/null
sudo chmod -R 755 "$export_dir" 2>/dev/null sudo find "$export_dir" -type d -exec chmod a+rx {} \; 2>/dev/null
find "$export_dir" -type d -exec chmod 755 {} \; 2>/dev/null
tar -czf "$home_dir/$archive_name" -C /tmp "$(basename "$export_dir")" sudo tar -czf "$home_dir/$archive_name" -C /tmp "$(basename "$export_dir")"
sudo chown "${SUDO_USER:-$USER}:${SUDO_USER:-$USER}" "$home_dir/$archive_name" 2>/dev/null
sudo rm -rf "$export_dir" sudo rm -rf "$export_dir"
echo echo
@@ -10574,10 +10575,12 @@ import_settings() {
local import_dir="/tmp/kiosk-import-$$" local import_dir="/tmp/kiosk-import-$$"
mkdir -p "$import_dir" mkdir -p "$import_dir"
chmod 777 "$import_dir"
echo echo
echo "Extracting backup..." echo "Extracting backup..."
tar -xzf "$import_file" -C "$import_dir" sudo tar -xzf "$import_file" -C "$import_dir"
sudo chmod -R a+r "$import_dir"
# Find the extracted directory # Find the extracted directory
local backup_dir=$(find "$import_dir" -maxdepth 1 -type d -name "kiosk-backup-*" | head -1) local backup_dir=$(find "$import_dir" -maxdepth 1 -type d -name "kiosk-backup-*" | head -1)
@@ -10585,7 +10588,7 @@ import_settings() {
echo "[1/7] Importing core configuration..." echo "[1/7] Importing core configuration..."
if [[ -f "$backup_dir/config.json" ]]; then if [[ -f "$backup_dir/config.json" ]]; then
sudo -u "$KIOSK_USER" cp "$backup_dir/config.json" "$CONFIG_PATH" sudo cp "$backup_dir/config.json" "$CONFIG_PATH"
sudo chown "$KIOSK_USER:$KIOSK_USER" "$CONFIG_PATH" sudo chown "$KIOSK_USER:$KIOSK_USER" "$CONFIG_PATH"
log_success "Core config restored" log_success "Core config restored"
fi fi