azcomputerguru/guru-connect
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Restrict session termination to support sessions only

Browse Source 
- Persistent agents: No "End Session" menu, shows "Managed by Administrator"
- Persistent agents: Always reconnect, can only be removed via admin disconnect
- Support sessions: User can end via tray icon
- Tray icon still shows for persistent agents (status display only)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Mike Swanson
2025-12-28 17:04:08 -07:00
parent 52c47b2de1
commit d7c272dabc
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
agent/src/main.rs
View File

@@ -187,7 +187,8 @@ async fn run_agent(config: config::Config) -> Result<()> {
}
// Create tray icon
let tray = match tray::TrayController::new(&hostname, config.support_code.as_deref()) {
// Only support sessions can be ended by user - persistent agents are admin-managed
let tray = match tray::TrayController::new(&hostname, config.support_code.as_deref(), is_support_session) {
Ok(t) => {
info!("Tray icon created");
Some(t)
@@ -208,11 +209,14 @@ async fn run_agent(config: config::Config) -> Result<()> {
loop {
info!("Connecting to server...");
// Check if user requested exit via tray before connecting
if let Some(ref t) = tray {
if t.exit_requested() {
info!("Exit requested by user");
return Ok(());
// Check if user requested exit via tray before connecting (support sessions only)
if is_support_session {
if let Some(ref t) = tray {
if t.exit_requested() {
info!("Exit requested by user");
cleanup_on_exit();
return Ok(());
}
}
}
@@ -290,16 +294,7 @@ async fn run_agent(config: config::Config) -> Result<()> {
return Ok(());
}
// Check if user requested exit via tray
if let Some(ref t) = tray {
if t.exit_requested() {
info!("Exit requested by user");
cleanup_on_exit();
return Ok(());
}
}
// Wait before reconnecting (only for persistent agent connections)
// Wait before reconnecting (persistent agents only - support sessions already exited above)
info!("Reconnecting in 5 seconds...");
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
}

14
agent/src/tray/mod.rs
View File

@@ -36,18 +36,26 @@ pub struct TrayController {
impl TrayController {
/// Create a new tray controller
pub fn new(machine_name: &str, support_code: Option<&str>) -> Result<Self> {
/// `allow_end_session` - If true, show "End Session" menu item (only for support sessions)
pub fn new(machine_name: &str, support_code: Option<&str>, allow_end_session: bool) -> Result<Self> {
// Create menu items
let status_text = if let Some(code) = support_code {
format!("Support Session: {}", code)
} else {
"Connected".to_string()
"Persistent Agent".to_string()
};
let status_item = MenuItem::new(&status_text, false, None);
let machine_item = MenuItem::new(format!("Machine: {}", machine_name), false, None);
let separator = PredefinedMenuItem::separator();
let end_session_item = MenuItem::new("End Session", true, None);
// Only show "End Session" for support sessions
// Persistent agents can only be removed by admin
let end_session_item = if allow_end_session {
MenuItem::new("End Session", true, None)
} else {
MenuItem::new("Managed by Administrator", false, None)
};
// Build menu
let menu = Menu::new();