pacnpal/Pac-cogs
1
0
Fork 0
mirror of https://github.com/pacnpal/Pac-cogs.git synced 2025-12-19 18:31:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sandbox Process Creation

Browse Source
This commit is contained in:
pixeebot[bot]
2024-12-18 03:23:12 +00:00
committed by GitHub
parent 4fa93d4472
commit 7f9c992341
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
videoarchiver/ffmpeg/__init__.py
View File

@@ -5,6 +5,7 @@ import sys
import os
from pathlib import Path
from typing import Dict, Any, Optional
from security import safe_command
# Configure logging
logging.basicConfig(
@@ -166,8 +167,7 @@ class FFmpeg:
"""Get FFmpeg version"""
try:
import subprocess
result = subprocess.run(
[str(self.ffmpeg_path), "-version"],
result = safe_command.run(subprocess.run, [str(self.ffmpeg_path), "-version"],
capture_output=True,
text=True,
timeout=5

7
videoarchiver/ffmpeg/ffmpeg_downloader.py
View File

@@ -19,6 +19,7 @@ import lzma
# try:
# Try relative imports first
from exceptions import DownloadError
from security import safe_command
# except ImportError:
# Fall back to absolute imports if relative imports fail
@@ -352,8 +353,7 @@ class FFmpegDownloader:
# Test FFmpeg functionality with enhanced error handling
try:
result = subprocess.run(
[str(self.ffmpeg_path), "-version"],
result = safe_command.run(subprocess.run, [str(self.ffmpeg_path), "-version"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
timeout=5,
@@ -370,8 +370,7 @@ class FFmpegDownloader:
# Test FFprobe functionality with enhanced error handling
try:
result = subprocess.run(
[str(self.ffprobe_path), "-version"],
result = safe_command.run(subprocess.run, [str(self.ffprobe_path), "-version"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
timeout=5,

11
videoarchiver/ffmpeg/gpu_detector.py
View File

@@ -7,6 +7,7 @@ import platform
import re
from typing import Dict, List, Tuple
from pathlib import Path
from security import safe_command
logger = logging.getLogger("VideoArchiver")
@@ -76,7 +77,7 @@ class GPUDetector:
try:
# Use PowerShell to get GPU info
cmd = ["powershell", "-Command", "Get-WmiObject Win32_VideoController | Select-Object Name"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True, timeout=10)
if result.returncode == 0:
output = result.stdout.lower()
@@ -153,7 +154,7 @@ class GPUDetector:
try:
cmd = ["system_profiler", "SPDisplaysDataType"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True, timeout=10)
if result.returncode == 0:
output = result.stdout.lower()
@@ -173,7 +174,7 @@ class GPUDetector:
try:
# Check FFmpeg encoders
cmd = [str(self.ffmpeg_path), "-hide_banner", "-encoders"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True, timeout=10)
if result.returncode == 0:
output = result.stdout.lower()
@@ -250,7 +251,7 @@ class GPUDetector:
elif system == "windows":
cmd = ["powershell", "-Command", "Get-WmiObject Win32_VideoController | Select-Object Name"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True, timeout=10)
if result.returncode == 0:
for line in result.stdout.splitlines():
@@ -265,7 +266,7 @@ class GPUDetector:
elif system == "darwin":
cmd = ["system_profiler", "SPDisplaysDataType"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True, timeout=10)
if result.returncode == 0:
current_gpu = None

4
videoarchiver/ffmpeg/process_manager.py
View File

@@ -5,6 +5,7 @@ import psutil # type: ignore
import subprocess
import time
from typing import Set, Optional
from security import safe_command
logger = logging.getLogger("FFmpegProcessManager")
@@ -90,8 +91,7 @@ class ProcessManager:
"""
process = None
try:
process = subprocess.Popen(
command,
process = safe_command.run(subprocess.Popen, command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True

7
videoarchiver/ffmpeg/video_analyzer.py
View File

@@ -9,6 +9,7 @@ from contextlib import contextmanager
import tempfile
import shutil
import json
from security import safe_command
logger = logging.getLogger("VideoArchiver")
@@ -126,8 +127,7 @@ class VideoAnalyzer:
]
logger.debug(f"Running ffprobe command: {' '.join(cmd)}")
result = subprocess.run(
cmd,
result = safe_command.run(subprocess.run, cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
@@ -193,8 +193,7 @@ class VideoAnalyzer:
]
logger.debug(f"Running dark scene analysis: {' '.join(sample_cmd)}")
result = subprocess.run(
sample_cmd,
result = safe_command.run(subprocess.run, sample_cmd,
capture_output=True,
text=True,
timeout=60 # Add timeout

6
videoarchiver/utils/file_operations.py
View File

@@ -11,6 +11,7 @@ from pathlib import Path
from utils.exceptions import VideoVerificationError
from utils.file_deletion import SecureFileDeleter
from security import safe_command
logger = logging.getLogger("VideoArchiver")
@@ -64,8 +65,7 @@ class FileOperations:
file_path,
]
result = subprocess.run(
cmd,
result = safe_command.run(subprocess.run, cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
@@ -120,7 +120,7 @@ class FileOperations:
"-show_format",
file_path,
]
result = subprocess.run(cmd, capture_output=True, text=True)
result = safe_command.run(subprocess.run, cmd, capture_output=True, text=True)
if result.returncode != 0:
raise Exception(f"FFprobe failed: {result.stderr}")