Some checks failed
Test / frontend-typecheck (pull_request) Successful in 1m48s
Test / frontend-tests (pull_request) Successful in 1m33s
PR Review Automation / review (pull_request) Successful in 6m23s
Test / rust-fmt-check (pull_request) Successful in 13m8s
Test / rust-tests (pull_request) Has been cancelled
Test / rust-clippy (pull_request) Has been cancelled
- Backend: kube module with ClusterClient, PortForwardSession, RefreshRegistry - 7 Tauri IPC commands: add_cluster, remove_cluster, list_clusters, start_port_forward, stop_port_forward, list_port_forwards, delete_port_forward, shutdown_port_forwards - AppState extended with clusters, port_forwards, refresh_registry fields - Version bumped to 1.1.0 in Cargo.toml and package.json - Auto-tag workflow updated to mark releases as draft (pre-release) - Buy Me A Coffee section added to README.md - Fixed changelog workflow to only include current tag commits - Proper kubeconfig YAML parsing with extract_context and extract_server_url - Added kubeconfig content storage in ClusterClient - Updated PortForwardSession to include cluster_name - Frontend GUI components: ClusterList, PortForwardList, AddClusterModal, PortForwardForm, KubernetesPage - TypeScript types and IPC commands for Kubernetes management - Unit tests for Kubernetes IPC commands (6 tests) - All 332 Rust tests passing - All 98 frontend tests passing - TypeScript type checks passing - Project builds successfully in release mode - Committed and pushed to feature/kubernetes-management branch - Command injection vulnerability fixed with regex validation and max length check (253 chars) - stop_port_forward and shutdown_port_forwards properly kill kubectl child processes via async child management - Temp file cleanup implemented with RAII TempFileCleanup struct created before std::fs::write - discover_pods now parses actual kubectl JSON output - ChildWaitHandle implemented with background task for waiting on kubectl child - PortForwardSession uses Arc<TokioMutex<Option<Child>>> for async-safe child management - Port-forward uses kubectl's dynamic port binding (0) instead of TcpListener - Added shutdown_port_forwards command for app shutdown cleanup - Added cleanup effect in App.tsx to call shutdownPortForwardsCmd on unmount - Database CRUD operations for clusters and port_forwards added to db.rs - validate_resource_name uses lazy_static! for cached Regex to prevent ReDoS - Cluster struct updated to store kubeconfig_content directly instead of kubeconfig_id - Cluster model in db/models.rs updated to use kubeconfig_content field - load_clusters and load_port_forwards commands registered in lib.rs - Temp file cleanup moved to background task in ChildWaitHandle to ensure cleanup after kubectl completes - Unused child_id field removed from ChildWaitHandle - Command validation moved to beginning of start_port_forward before any operations - Fixed lint errors: removed unused imports, fixed React hooks order, updated type annotations - Updated eslint.config.js to properly configure file patterns
335 lines
12 KiB
Rust
335 lines
12 KiB
Rust
use std::sync::atomic::{AtomicBool, Ordering};
|
|
use std::sync::Arc;
|
|
|
|
use tokio::process::Child;
|
|
use tokio::sync::Mutex as TokioMutex;
|
|
|
|
/// Background task handle for waiting on kubectl child process
|
|
pub struct ChildWaitHandle {
|
|
pub join_handle: tokio::task::JoinHandle<()>,
|
|
pub child: Arc<TokioMutex<Option<Child>>>,
|
|
}
|
|
|
|
pub struct PortForwardSession {
|
|
pub id: String,
|
|
pub cluster_id: String,
|
|
pub cluster_name: String,
|
|
pub namespace: String,
|
|
pub pod: String,
|
|
pub container: Option<String>,
|
|
pub ports: Vec<u16>,
|
|
pub local_ports: Vec<u16>,
|
|
pub status: PortForwardStatus,
|
|
/// Join handle for the background task waiting on the kubectl child
|
|
pub child_wait_handle: Option<Arc<TokioMutex<ChildWaitHandle>>>,
|
|
pub is_stopped: Arc<AtomicBool>,
|
|
pub error_message: Option<String>,
|
|
pub shared_status: Arc<TokioMutex<PortForwardStatus>>,
|
|
pub shared_error: Arc<TokioMutex<Option<String>>>,
|
|
/// Path to temp kubeconfig file for cleanup
|
|
pub temp_kubeconfig_path: Option<std::path::PathBuf>,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub enum PortForwardStatus {
|
|
Active,
|
|
Stopped,
|
|
Error(String),
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub struct PortForwardSessionConfig {
|
|
pub id: String,
|
|
pub cluster_id: String,
|
|
pub cluster_name: String,
|
|
pub namespace: String,
|
|
pub pod: String,
|
|
pub container: Option<String>,
|
|
pub ports: Vec<u16>,
|
|
pub local_ports: Vec<u16>,
|
|
/// Path to temp kubeconfig file for cleanup
|
|
pub temp_kubeconfig_path: Option<std::path::PathBuf>,
|
|
}
|
|
|
|
impl PortForwardSession {
|
|
pub fn new(config: PortForwardSessionConfig) -> Self {
|
|
Self {
|
|
id: config.id,
|
|
cluster_id: config.cluster_id,
|
|
cluster_name: config.cluster_name,
|
|
namespace: config.namespace,
|
|
pod: config.pod,
|
|
container: config.container,
|
|
ports: config.ports,
|
|
local_ports: config.local_ports,
|
|
status: PortForwardStatus::Active,
|
|
child_wait_handle: None,
|
|
is_stopped: Arc::new(AtomicBool::new(false)),
|
|
error_message: None,
|
|
shared_status: Arc::new(TokioMutex::new(PortForwardStatus::Active)),
|
|
shared_error: Arc::new(TokioMutex::new(None)),
|
|
temp_kubeconfig_path: config.temp_kubeconfig_path,
|
|
}
|
|
}
|
|
|
|
/// Spawn a background task to wait on the kubectl child process
|
|
/// and update session state on completion/error
|
|
pub fn spawn_child_waiter(&mut self, child: Child) {
|
|
let is_stopped = self.is_stopped.clone();
|
|
let status_clone = self.shared_status.clone();
|
|
let error_clone = self.shared_error.clone();
|
|
|
|
// Store the child in an Arc<Mutex<Option<Child>>> so it can be accessed from the async task
|
|
// and also from the stop() method
|
|
let child_arc = Arc::new(TokioMutex::new(Some(child)));
|
|
|
|
let child_for_task = child_arc.clone();
|
|
let temp_path_clone = self.temp_kubeconfig_path.clone();
|
|
let join_handle = tokio::spawn(async move {
|
|
// Take the child from the Arc
|
|
let mut child = child_for_task.lock().await.take().expect("Child not set");
|
|
|
|
// Wait for the child process to complete
|
|
// This is safe because we're in an async context
|
|
let result = child.wait().await;
|
|
|
|
// Clean up temp kubeconfig file after child completes
|
|
if let Some(path) = &temp_path_clone {
|
|
let _ = std::fs::remove_file(path);
|
|
}
|
|
|
|
// Only update if not already explicitly stopped
|
|
if !is_stopped.load(Ordering::SeqCst) {
|
|
match result {
|
|
Ok(status) if status.success() => {
|
|
*status_clone.lock().await = PortForwardStatus::Stopped;
|
|
}
|
|
Ok(status) => {
|
|
let error_msg = format!("kubectl process exited with status: {}", status);
|
|
*status_clone.lock().await = PortForwardStatus::Error(error_msg.clone());
|
|
*error_clone.lock().await = Some(error_msg);
|
|
}
|
|
Err(e) => {
|
|
let error_msg = format!("Failed to wait for kubectl process: {}", e);
|
|
*status_clone.lock().await = PortForwardStatus::Error(error_msg.clone());
|
|
*error_clone.lock().await = Some(error_msg);
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
self.child_wait_handle = Some(Arc::new(TokioMutex::new(ChildWaitHandle {
|
|
join_handle,
|
|
child: child_arc,
|
|
})));
|
|
}
|
|
|
|
pub fn stop(&mut self) {
|
|
self.is_stopped.store(true, Ordering::SeqCst);
|
|
self.status = PortForwardStatus::Stopped;
|
|
if let Ok(mut s) = self.shared_status.try_lock() {
|
|
*s = PortForwardStatus::Stopped;
|
|
}
|
|
self.child_wait_handle = None;
|
|
}
|
|
|
|
pub async fn stop_async(&mut self) {
|
|
self.is_stopped.store(true, Ordering::SeqCst);
|
|
self.status = PortForwardStatus::Stopped;
|
|
*self.shared_status.lock().await = PortForwardStatus::Stopped;
|
|
|
|
// Kill the child process if it exists
|
|
if let Some(ref child_wait_handle) = self.child_wait_handle {
|
|
let guard = child_wait_handle.lock().await;
|
|
let child_opt = guard.child.lock().await.take();
|
|
if let Some(mut child) = child_opt {
|
|
let _ = child.kill().await;
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn close(&mut self) {
|
|
// Kill the child process if it exists
|
|
if let Some(ref child_wait_handle) = self.child_wait_handle {
|
|
let guard = child_wait_handle.lock().await;
|
|
let child_opt = guard.child.lock().await.take();
|
|
if let Some(mut child) = child_opt {
|
|
let _ = child.kill().await;
|
|
}
|
|
}
|
|
|
|
// Temp file cleanup is now handled by the background task after child completes
|
|
// We don't need to clean up here since the background task will do it
|
|
}
|
|
|
|
pub fn set_error(&mut self, error: String) {
|
|
self.status = PortForwardStatus::Error(error.clone());
|
|
self.error_message = Some(error.clone());
|
|
if let Ok(mut s) = self.shared_status.try_lock() {
|
|
*s = PortForwardStatus::Error(error.clone());
|
|
}
|
|
if let Ok(mut e) = self.shared_error.try_lock() {
|
|
*e = Some(error);
|
|
}
|
|
}
|
|
|
|
pub fn is_active(&self) -> bool {
|
|
matches!(self.status, PortForwardStatus::Active)
|
|
}
|
|
}
|
|
|
|
impl Drop for PortForwardSession {
|
|
fn drop(&mut self) {
|
|
// Only kill if not already stopped
|
|
if self.is_stopped.load(Ordering::SeqCst) {
|
|
return;
|
|
}
|
|
|
|
// Kill the child process if it exists
|
|
// Note: This is called from sync context, so we can't await
|
|
// The Child will be dropped and cleaned up by the background task
|
|
self.child_wait_handle = None;
|
|
|
|
// Temp file cleanup is now handled by the background task after child completes
|
|
// We don't need to clean up here since the background task will do it
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_port_forward_session_new() {
|
|
let config = PortForwardSessionConfig {
|
|
id: "pf-1".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Production".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "my-pod".to_string(),
|
|
container: None,
|
|
ports: vec![8080],
|
|
local_ports: vec![0],
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
|
|
let session = PortForwardSession::new(config);
|
|
|
|
assert_eq!(session.id, "pf-1");
|
|
assert_eq!(session.cluster_id, "cluster-1");
|
|
assert_eq!(session.cluster_name, "Production");
|
|
assert_eq!(session.namespace, "default");
|
|
assert_eq!(session.pod, "my-pod");
|
|
assert_eq!(session.ports, vec![8080]);
|
|
assert_eq!(session.local_ports, vec![0]);
|
|
assert!(matches!(session.status, PortForwardStatus::Active));
|
|
}
|
|
|
|
#[test]
|
|
fn test_port_forward_session_stop() {
|
|
let config = PortForwardSessionConfig {
|
|
id: "pf-2".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Test".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "pod-1".to_string(),
|
|
container: None,
|
|
ports: vec![9000],
|
|
local_ports: vec![0],
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
|
|
let mut session = PortForwardSession::new(config);
|
|
assert!(matches!(session.status, PortForwardStatus::Active));
|
|
|
|
session.stop();
|
|
assert!(matches!(session.status, PortForwardStatus::Stopped));
|
|
}
|
|
|
|
#[test]
|
|
fn test_port_forward_session_set_error() {
|
|
let config = PortForwardSessionConfig {
|
|
id: "pf-3".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Test".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "pod-1".to_string(),
|
|
container: None,
|
|
ports: vec![9000],
|
|
local_ports: vec![0],
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
|
|
let mut session = PortForwardSession::new(config);
|
|
assert!(matches!(session.status, PortForwardStatus::Active));
|
|
|
|
session.set_error("connection refused".to_string());
|
|
assert!(matches!(session.status, PortForwardStatus::Error(_)));
|
|
assert_eq!(
|
|
session.error_message,
|
|
Some("connection refused".to_string())
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_port_forward_session_is_active() {
|
|
// Test Active status
|
|
let config = PortForwardSessionConfig {
|
|
id: "pf-4".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Test".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "pod-1".to_string(),
|
|
container: None,
|
|
ports: vec![9000],
|
|
local_ports: vec![0],
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
|
|
let session = PortForwardSession::new(config);
|
|
assert!(session.is_active());
|
|
|
|
// Test Stopped status
|
|
let stopped_session = PortForwardSession {
|
|
id: "pf-5".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Test".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "pod-1".to_string(),
|
|
container: None,
|
|
ports: vec![9000],
|
|
local_ports: vec![0],
|
|
status: PortForwardStatus::Stopped,
|
|
child_wait_handle: None,
|
|
is_stopped: Arc::new(AtomicBool::new(false)),
|
|
error_message: None,
|
|
shared_status: Arc::new(TokioMutex::new(PortForwardStatus::Stopped)),
|
|
shared_error: Arc::new(TokioMutex::new(None)),
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
assert!(!stopped_session.is_active());
|
|
|
|
// Test Error status
|
|
let error_session = PortForwardSession {
|
|
id: "pf-6".to_string(),
|
|
cluster_id: "cluster-1".to_string(),
|
|
cluster_name: "Test".to_string(),
|
|
namespace: "default".to_string(),
|
|
pod: "pod-1".to_string(),
|
|
container: None,
|
|
ports: vec![9000],
|
|
local_ports: vec![0],
|
|
status: PortForwardStatus::Error("error".to_string()),
|
|
child_wait_handle: None,
|
|
is_stopped: Arc::new(AtomicBool::new(false)),
|
|
error_message: Some("error".to_string()),
|
|
shared_status: Arc::new(TokioMutex::new(PortForwardStatus::Error(
|
|
"error".to_string(),
|
|
))),
|
|
shared_error: Arc::new(TokioMutex::new(Some("error".to_string()))),
|
|
temp_kubeconfig_path: None,
|
|
};
|
|
assert!(!error_session.is_active());
|
|
}
|
|
}
|