rick/LEDMatrix
1
0
Fork 0
mirror of https://github.com/ChuckBuilds/LEDMatrix.git synced 2026-04-11 13:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve cache directory handling for sudo execution with proper user ownership

Browse Source
This commit is contained in:
ChuckBuilds
2025-04-19 18:32:19 -05:00
parent d37cfef8f0
commit 77bf8d07fb
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cache_manager.py
View File

@@ -23,11 +23,21 @@ class CacheManager:
# Initialize logger first # Initialize logger first
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger(__name__)
# Get the actual user's home directory, even when running with sudo
try:
# Try to get the real user's home directory
real_user = os.environ.get('SUDO_USER') or os.environ.get('USER')
if real_user:
home_dir = f"/home/{real_user}"
else:
home_dir = os.path.expanduser('~')
except Exception:
home_dir = os.path.expanduser('~')
# Determine the appropriate cache directory # Determine the appropriate cache directory
if os.geteuid() == 0: # Running as root/sudo if os.geteuid() == 0: # Running as root/sudo
self.cache_dir = "/var/cache/ledmatrix" self.cache_dir = "/var/cache/ledmatrix"
else: else:
home_dir = os.path.expanduser('~')
self.cache_dir = os.path.join(home_dir, '.ledmatrix_cache') self.cache_dir = os.path.join(home_dir, '.ledmatrix_cache')
self._memory_cache = {} # In-memory cache for faster access self._memory_cache = {} # In-memory cache for faster access
@@ -44,6 +54,16 @@ class CacheManager:
# Set permissions to allow both root and the user to access # Set permissions to allow both root and the user to access
if os.geteuid() == 0: # Running as root/sudo if os.geteuid() == 0: # Running as root/sudo
os.chmod(self.cache_dir, 0o777) # Full permissions for all users os.chmod(self.cache_dir, 0o777) # Full permissions for all users
# Also set ownership to the real user if we're running as root
real_user = os.environ.get('SUDO_USER')
if real_user:
try:
import pwd
uid = pwd.getpwnam(real_user).pw_uid
gid = pwd.getpwnam(real_user).pw_gid
os.chown(self.cache_dir, uid, gid)
except Exception as e:
self.logger.warning(f"Could not set cache directory ownership: {e}")
except Exception as e: except Exception as e:
self.logger.error(f"Failed to create cache directory: {e}") self.logger.error(f"Failed to create cache directory: {e}")
# Fallback to temp directory if we can't create the cache directory # Fallback to temp directory if we can't create the cache directory