feat: Add Sequential Thinking to Code Review + Frontend Validation
Enhanced code review and frontend validation with intelligent triggers: Code Review Agent Enhancement: - Added Sequential Thinking MCP integration for complex issues - Triggers on 2+ rejections or 3+ critical issues - New escalation format with root cause analysis - Comprehensive solution strategies with trade-off evaluation - Educational feedback to break rejection cycles - Files: .claude/agents/code-review.md (+308 lines) - Docs: CODE_REVIEW_ST_ENHANCEMENT.md, CODE_REVIEW_ST_TESTING.md Frontend Design Skill Enhancement: - Automatic invocation for ANY UI change - Comprehensive validation checklist (200+ checkpoints) - 8 validation categories (visual, interactive, responsive, a11y, etc.) - 3 validation levels (quick, standard, comprehensive) - Integration with code review workflow - Files: .claude/skills/frontend-design/SKILL.md (+120 lines) - Docs: UI_VALIDATION_CHECKLIST.md (462 lines), AUTOMATIC_VALIDATION_ENHANCEMENT.md (587 lines) Settings Optimization: - Repaired .claude/settings.local.json (fixed m365 pattern) - Reduced permissions from 49 to 33 (33% reduction) - Removed duplicates, sorted alphabetically - Created SETTINGS_PERMISSIONS.md documentation Checkpoint Command Enhancement: - Dual checkpoint system (git + database) - Saves session context to API for cross-machine recall - Includes git metadata in database context - Files: .claude/commands/checkpoint.md (+139 lines) Decision Rationale: - Sequential Thinking MCP breaks rejection cycles by identifying root causes - Automatic frontend validation catches UI issues before code review - Dual checkpoints enable complete project memory across machines - Settings optimization improves maintainability Total: 1,200+ lines of documentation and enhancements Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
Found 9 files
|
||||
session-logs\2025-12-19-session.md
|
||||
session-logs\2025-12-16-session-3.md
|
||||
session-logs\2025-12-16-session.md
|
||||
session-logs\2025-12-17-session.md
|
||||
session-logs\2025-12-18-session.md
|
||||
session-logs\2025-12-14-dataforth-dos-machines.md
|
||||
session-logs\2025-12-14-session.md
|
||||
session-logs\2025-12-15-gururmm-agent-services.md
|
||||
session-logs\2025-12-16-session-2.md
|
||||
@@ -0,0 +1,10 @@
|
||||
On branch main
|
||||
Your branch is up to date with 'origin/main'.
|
||||
|
||||
Changes not staged for commit:
|
||||
(use "git add <file>..." to update what will be committed)
|
||||
(use "git restore <file>..." to discard changes in working directory)
|
||||
modified: .claude/settings.local.json
|
||||
modified: claude-settings/settings.json
|
||||
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
@@ -0,0 +1,3 @@
|
||||
From https://git.azcomputerguru.com/azcomputerguru/claude-projects
|
||||
* branch main -> FETCH_HEAD
|
||||
Already up to date.
|
||||
@@ -0,0 +1,3 @@
|
||||
Cargo.toml
|
||||
PLAN.md
|
||||
src/
|
||||
@@ -0,0 +1,2 @@
|
||||
[main 9768abb] Clean up settings - remove one-off command permissions
|
||||
2 files changed, 27 insertions(+), 44 deletions(-)
|
||||
@@ -0,0 +1,92 @@
|
||||
1→[package]
|
||||
2→name = "gururmm-agent"
|
||||
3→version = "0.4.0"
|
||||
4→edition = "2021"
|
||||
5→description = "GuruRMM Agent - Cross-platform RMM agent"
|
||||
6→authors = ["GuruRMM"]
|
||||
7→
|
||||
8→[features]
|
||||
9→default = ["native-service"]
|
||||
10→# Modern Windows (10+, Server 2016+): Native Windows Service integration
|
||||
11→native-service = ["dep:windows-service", "dep:windows"]
|
||||
12→# Legacy Windows (7, Server 2008 R2): Console mode, use NSSM for service wrapper
|
||||
13→legacy = []
|
||||
14→
|
||||
15→[dependencies]
|
||||
16→# Async runtime
|
||||
17→tokio = { version = "1", features = ["full"] }
|
||||
18→
|
||||
19→# System information (cross-platform metrics)
|
||||
20→sysinfo = "0.31"
|
||||
21→
|
||||
22→# WebSocket client (native-tls for Windows 7/2008R2 compatibility)
|
||||
23→tokio-tungstenite = { version = "0.24", features = ["native-tls"] }
|
||||
24→futures-util = "0.3"
|
||||
25→
|
||||
26→# HTTP client (fallback/registration) - native-tls for Windows 7/2008R2 compatibility
|
||||
27→reqwest = { version = "0.12", default-features = false, features = ["json", "native-tls"] }
|
||||
28→
|
||||
29→# Serialization
|
||||
30→serde = { version = "1", features = ["derive"] }
|
||||
31→serde_json = "1"
|
||||
32→toml = "0.8"
|
||||
33→
|
||||
34→# CLI arguments
|
||||
35→clap = { version = "4", features = ["derive"] }
|
||||
36→
|
||||
37→# Logging
|
||||
38→tracing = "0.1"
|
||||
39→tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
40→
|
||||
41→# Error handling
|
||||
42→anyhow = "1"
|
||||
43→thiserror = "1"
|
||||
44→
|
||||
45→# UUID for identifiers
|
||||
46→uuid = { version = "1", features = ["v4", "serde"] }
|
||||
47→
|
||||
48→# SHA256 checksums for update verification
|
||||
49→sha2 = "0.10"
|
||||
50→
|
||||
51→# Time handling
|
||||
52→chrono = { version = "0.4", features = ["serde"] }
|
||||
53→
|
||||
54→# Hostname detection
|
||||
55→hostname = "0.4"
|
||||
56→
|
||||
57→# Network interface enumeration (LAN IPs)
|
||||
58→local-ip-address = "0.6"
|
||||
59→
|
||||
60→# Async file operations
|
||||
61→tokio-util = "0.7"
|
||||
62→
|
||||
63→[target.'cfg(windows)'.dependencies]
|
||||
64→# Windows service support (optional, only for native-service feature)
|
||||
65→windows-service = { version = "0.7", optional = true }
|
||||
66→# Windows-specific APIs for service management and IPC (optional for native-service)
|
||||
67→windows = { version = "0.58", optional = true, features = [
|
||||
68→ "Win32_System_Services",
|
||||
69→ "Win32_Foundation",
|
||||
70→ "Win32_Security",
|
||||
71→ "Win32_System_Pipes",
|
||||
72→ "Win32_Storage_FileSystem",
|
||||
73→ "Win32_System_IO",
|
||||
74→ "Win32_System_RemoteDesktop",
|
||||
75→ "Win32_System_Threading",
|
||||
76→] }
|
||||
77→
|
||||
78→[target.'cfg(unix)'.dependencies]
|
||||
79→# Unix signal handling and user detection
|
||||
80→nix = { version = "0.29", features = ["signal", "user"] }
|
||||
81→
|
||||
82→[profile.release]
|
||||
83→# Optimize for size while maintaining performance
|
||||
84→opt-level = "z"
|
||||
85→lto = true
|
||||
86→codegen-units = 1
|
||||
87→strip = true
|
||||
88→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,10 @@
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 4982 Dec 19 13:10 2025-12-15-grabbanddurando-calendar-fix.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 5824 Dec 19 13:10 2025-12-15-grabbanddurando-user-report.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 5662 Dec 19 13:10 2025-12-15-gururmm-agent-services.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 8170 Dec 19 13:10 2025-12-16-session.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 4167 Dec 19 13:10 2025-12-16-session-2.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 4420 Dec 19 13:10 2025-12-16-session-3.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 5549 Dec 19 13:10 2025-12-17-session.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 12558 Dec 19 13:10 2025-12-18-session.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 12157 Dec 20 17:42 2025-12-19-session.md
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 5627 Dec 20 17:42 2025-12-20-session.md
|
||||
@@ -0,0 +1 @@
|
||||
gururmm directory not found in claude-projects
|
||||
@@ -0,0 +1 @@
|
||||
No files found
|
||||
@@ -0,0 +1,269 @@
|
||||
Updating crates.io index
|
||||
Locking 263 packages to latest compatible versions
|
||||
Adding generic-array v0.14.7 (available: v0.14.9)
|
||||
Adding nix v0.29.0 (available: v0.30.1)
|
||||
Adding sysinfo v0.31.4 (available: v0.37.2)
|
||||
Adding thiserror v1.0.69 (available: v2.0.17)
|
||||
Adding tokio-tungstenite v0.24.0 (available: v0.28.0)
|
||||
Adding toml v0.8.23 (available: v0.9.10+spec-1.1.0)
|
||||
Adding windows v0.58.0 (available: v0.62.2)
|
||||
Adding windows-service v0.7.0 (available: v0.8.0)
|
||||
Downloading crates ...
|
||||
Downloaded ryu v1.0.21
|
||||
Downloaded ntapi v0.4.2
|
||||
Compiling proc-macro2 v1.0.103
|
||||
Compiling unicode-ident v1.0.22
|
||||
Compiling quote v1.0.42
|
||||
Compiling windows-link v0.2.1
|
||||
Compiling cfg-if v1.0.4
|
||||
Compiling smallvec v1.15.1
|
||||
Compiling windows_x86_64_msvc v0.53.1
|
||||
Compiling stable_deref_trait v1.2.1
|
||||
Compiling pin-project-lite v0.2.16
|
||||
Compiling bytes v1.11.0
|
||||
Compiling windows_x86_64_msvc v0.52.6
|
||||
Compiling parking_lot_core v0.9.12
|
||||
Compiling serde_core v1.0.228
|
||||
Compiling scopeguard v1.2.0
|
||||
Compiling futures-core v0.3.31
|
||||
Compiling itoa v1.0.15
|
||||
Compiling version_check v0.9.5
|
||||
Compiling typenum v1.19.0
|
||||
Compiling serde v1.0.228
|
||||
Compiling litemap v0.8.1
|
||||
Compiling httparse v1.10.1
|
||||
Compiling writeable v0.6.2
|
||||
Compiling futures-sink v0.3.31
|
||||
Compiling pin-utils v0.1.0
|
||||
Compiling windows-sys v0.61.2
|
||||
Compiling icu_normalizer_data v2.1.1
|
||||
Compiling once_cell v1.21.3
|
||||
Compiling lock_api v0.4.14
|
||||
Compiling crossbeam-utils v0.8.21
|
||||
Compiling native-tls v0.2.14
|
||||
Compiling futures-task v0.3.31
|
||||
Compiling slab v0.4.11
|
||||
Compiling icu_properties_data v2.1.2
|
||||
Compiling generic-array v0.14.7
|
||||
Compiling zerocopy v0.8.31
|
||||
Compiling percent-encoding v2.3.2
|
||||
Compiling libc v0.2.178
|
||||
Compiling getrandom v0.2.16
|
||||
Compiling http v1.4.0
|
||||
Compiling tracing-core v0.1.36
|
||||
Compiling log v0.4.29
|
||||
Compiling try-lock v0.2.5
|
||||
Compiling tower-service v0.3.3
|
||||
Compiling futures-channel v0.3.31
|
||||
Compiling mio v1.1.1
|
||||
Compiling schannel v0.1.28
|
||||
Compiling once_cell_polyfill v1.70.2
|
||||
Compiling rand_core v0.6.4
|
||||
Compiling http-body v1.0.1
|
||||
Compiling want v0.3.1
|
||||
Compiling cpufeatures v0.2.17
|
||||
Compiling thiserror v1.0.69
|
||||
Compiling atomic-waker v1.1.2
|
||||
Compiling utf8parse v0.2.2
|
||||
Compiling anstyle v1.0.13
|
||||
Compiling autocfg v1.5.0
|
||||
Compiling windows-targets v0.53.5
|
||||
Compiling windows-targets v0.52.6
|
||||
Compiling parking_lot v0.12.5
|
||||
Compiling winapi v0.3.9
|
||||
Compiling rayon-core v1.13.0
|
||||
Compiling form_urlencoded v1.2.2
|
||||
Compiling anstyle-query v1.1.5
|
||||
Compiling sync_wrapper v1.0.2
|
||||
Compiling is_terminal_polyfill v1.70.2
|
||||
Compiling hashbrown v0.16.1
|
||||
Compiling memchr v2.7.6
|
||||
Compiling anstyle-parse v0.2.7
|
||||
Compiling getrandom v0.3.4
|
||||
Compiling ryu v1.0.21
|
||||
Compiling windows-sys v0.60.2
|
||||
Compiling crossbeam-epoch v0.9.18
|
||||
Compiling windows-result v0.1.2
|
||||
Compiling windows-result v0.2.0
|
||||
Compiling num-traits v0.2.19
|
||||
Compiling syn v2.0.111
|
||||
Compiling anstyle-wincon v3.0.11
|
||||
Compiling colorchoice v1.0.4
|
||||
Compiling tower-layer v0.3.3
|
||||
Compiling ntapi v0.4.2
|
||||
Compiling serde_json v1.0.145
|
||||
Compiling utf8_iter v1.0.4
|
||||
Compiling equivalent v1.0.2
|
||||
Compiling thiserror v2.0.17
|
||||
Compiling regex-syntax v0.8.8
|
||||
Compiling block-buffer v0.10.4
|
||||
Compiling crypto-common v0.1.7
|
||||
Compiling ppv-lite86 v0.2.21
|
||||
Compiling ipnet v2.11.0
|
||||
Compiling bitflags v2.10.0
|
||||
Compiling base64 v0.22.1
|
||||
Compiling windows-strings v0.1.0
|
||||
Compiling crossbeam-deque v0.8.6
|
||||
Compiling anstream v0.6.21
|
||||
Compiling socket2 v0.6.1
|
||||
Compiling http-body-util v0.1.3
|
||||
Compiling data-encoding v2.9.0
|
||||
Compiling strsim v0.11.1
|
||||
Compiling lazy_static v1.5.0
|
||||
Compiling indexmap v2.12.1
|
||||
Compiling winnow v0.7.14
|
||||
Compiling synstructure v0.13.2
|
||||
Compiling digest v0.10.7
|
||||
Compiling rand_chacha v0.3.1
|
||||
Compiling either v1.15.0
|
||||
Compiling heck v0.5.0
|
||||
Compiling utf-8 v0.7.6
|
||||
Compiling clap_lex v0.7.6
|
||||
Compiling regex-automata v0.4.13
|
||||
Compiling zerovec-derive v0.11.2
|
||||
Compiling displaydoc v0.2.5
|
||||
Compiling tokio-macros v2.6.0
|
||||
Compiling serde_derive v1.0.228
|
||||
Compiling futures-macro v0.3.31
|
||||
Compiling tracing-attributes v0.1.31
|
||||
Compiling windows-interface v0.57.0
|
||||
Compiling windows-implement v0.57.0
|
||||
Compiling thiserror-impl v1.0.69
|
||||
Compiling windows-implement v0.58.0
|
||||
Compiling windows-interface v0.58.0
|
||||
Compiling thiserror-impl v2.0.17
|
||||
Compiling toml_write v0.1.2
|
||||
Compiling zerofrom-derive v0.1.6
|
||||
Compiling yoke-derive v0.8.1
|
||||
Compiling rand v0.8.5
|
||||
Compiling sha1 v0.10.6
|
||||
Compiling anyhow v1.0.100
|
||||
Compiling byteorder v1.5.0
|
||||
Compiling zeroize v1.8.2
|
||||
Compiling iri-string v0.7.9
|
||||
Compiling clap_derive v4.5.49
|
||||
Compiling rayon v1.11.0
|
||||
Compiling clap_builder v4.5.53
|
||||
Compiling tokio v1.48.0
|
||||
Compiling windows-core v0.57.0
|
||||
Compiling futures-util v0.3.31
|
||||
Compiling rustls-pki-types v1.13.2
|
||||
Compiling sharded-slab v0.1.7
|
||||
Compiling windows-sys v0.52.0
|
||||
Compiling windows-core v0.58.0
|
||||
Compiling tracing v0.1.44
|
||||
Compiling tracing-log v0.2.0
|
||||
Compiling nu-ansi-term v0.50.3
|
||||
Compiling thread_local v1.1.9
|
||||
Compiling zerofrom v0.1.6
|
||||
Compiling matchers v0.2.0
|
||||
Compiling widestring v1.2.1
|
||||
Compiling uuid v1.19.0
|
||||
Compiling sha2 v0.10.9
|
||||
Compiling windows v0.57.0
|
||||
Compiling hostname v0.4.2
|
||||
Compiling tungstenite v0.24.0
|
||||
Compiling clap v4.5.53
|
||||
Compiling yoke v0.8.1
|
||||
Compiling tracing-subscriber v0.3.22
|
||||
Compiling local-ip-address v0.6.8
|
||||
Compiling windows v0.58.0
|
||||
Compiling zerovec v0.11.5
|
||||
Compiling zerotrie v0.2.3
|
||||
Compiling toml_datetime v0.6.11
|
||||
Compiling serde_spanned v0.6.9
|
||||
Compiling serde_urlencoded v0.7.1
|
||||
Compiling chrono v0.4.42
|
||||
Compiling windows-service v0.7.0
|
||||
Compiling toml_edit v0.22.27
|
||||
Compiling tinystr v0.8.2
|
||||
Compiling potential_utf v0.1.4
|
||||
Compiling icu_collections v2.1.1
|
||||
Compiling icu_locale_core v2.1.1
|
||||
Compiling toml v0.8.23
|
||||
Compiling icu_provider v2.1.1
|
||||
Compiling icu_properties v2.1.2
|
||||
Compiling icu_normalizer v2.1.1
|
||||
Compiling tokio-native-tls v0.3.1
|
||||
Compiling hyper v1.8.1
|
||||
Compiling tower v0.5.2
|
||||
Compiling tokio-util v0.7.17
|
||||
Compiling tokio-tungstenite v0.24.0
|
||||
Compiling idna_adapter v1.2.1
|
||||
Compiling tower-http v0.6.8
|
||||
Compiling idna v1.1.0
|
||||
Compiling hyper-util v0.1.19
|
||||
Compiling url v2.5.7
|
||||
Compiling hyper-tls v0.6.0
|
||||
Compiling reqwest v0.12.26
|
||||
Compiling sysinfo v0.31.4
|
||||
Compiling gururmm-agent v0.4.0 (C:\Users\MikeSwanson\claude-projects\gururmm\agent)
|
||||
warning: unused import: `std::ffi::OsStr`
|
||||
--> src\ipc.rs:290:9
|
||||
|
|
||||
290 | use std::ffi::OsStr;
|
||||
| ^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: unused import: `std::os::windows::ffi::OsStrExt`
|
||||
--> src\ipc.rs:291:9
|
||||
|
|
||||
291 | use std::os::windows::ffi::OsStrExt;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
warning: unused import: `warn`
|
||||
--> src\updater\mod.rs:16:35
|
||||
|
|
||||
16 | use tracing::{debug, error, info, warn};
|
||||
| ^^^^
|
||||
|
||||
warning: unused import: `Context`
|
||||
--> src\main.rs:14:14
|
||||
|
|
||||
14 | use anyhow::{Context, Result};
|
||||
| ^^^^^^^
|
||||
|
||||
warning: variable does not need to be mutable
|
||||
--> src\main.rs:146:28
|
||||
|
|
||||
146 | let (force_checkin_tx, mut force_checkin_rx) = tokio::sync::mpsc::channel::<()>(8);
|
||||
| ----^^^^^^^^^^^^^^^^
|
||||
| |
|
||||
| help: remove this `mut`
|
||||
|
|
||||
= note: `#[warn(unused_mut)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: unused variable: `force_checkin_rx`
|
||||
--> src\main.rs:146:28
|
||||
|
|
||||
146 | let (force_checkin_tx, mut force_checkin_rx) = tokio::sync::mpsc::channel::<()>(8);
|
||||
| ^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_force_checkin_rx`
|
||||
|
|
||||
= note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: method `update_policy` is never used
|
||||
--> src\ipc.rs:217:18
|
||||
|
|
||||
190 | impl IpcState {
|
||||
| ------------- method in this implementation
|
||||
...
|
||||
217 | pub async fn update_policy(&self, policy: TrayPolicy) {
|
||||
| ^^^^^^^^^^^^^
|
||||
|
|
||||
= note: `#[warn(dead_code)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: methods `cancel_rollback_watchdog` and `cleanup_backup` are never used
|
||||
--> src\updater\mod.rs:524:18
|
||||
|
|
||||
86 | impl AgentUpdater {
|
||||
| ----------------- methods in this implementation
|
||||
...
|
||||
524 | pub async fn cancel_rollback_watchdog(&self) {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
...
|
||||
550 | pub async fn cleanup_backup(&self) {
|
||||
| ^^^^^^^^^^^^^^
|
||||
|
||||
warning: `gururmm-agent` (bin "gururmm-agent") generated 8 warnings (run `cargo fix --bin "gururmm-agent" -p gururmm-agent` to apply 6 suggestions)
|
||||
Finished `release` profile [optimized] target(s) in 2m 06s
|
||||
@@ -0,0 +1,116 @@
|
||||
1→{
|
||||
2→ "permissions": {
|
||||
3→ "allow": [
|
||||
4→ "Bash(git:*)",
|
||||
5→ "Bash(gh:*)",
|
||||
6→ "Bash(ssh:*)",
|
||||
7→ "Bash(scp:*)",
|
||||
8→ "Bash(rsync:*)",
|
||||
9→ "Bash(wsl:*)",
|
||||
10→ "Bash(wsl.exe:*)",
|
||||
11→ "Bash(cat:*)",
|
||||
12→ "Bash(ls:*)",
|
||||
13→ "Bash(find:*)",
|
||||
14→ "Bash(grep:*)",
|
||||
15→ "Bash(echo:*)",
|
||||
16→ "Bash(chmod:*)",
|
||||
17→ "Bash(chown:*)",
|
||||
18→ "Bash(mkdir:*)",
|
||||
19→ "Bash(rm:*)",
|
||||
20→ "Bash(cp:*)",
|
||||
21→ "Bash(mv:*)",
|
||||
22→ "Bash(curl:*)",
|
||||
23→ "Bash(wget:*)",
|
||||
24→ "Bash(nslookup:*)",
|
||||
25→ "Bash(dig:*)",
|
||||
26→ "Bash(ping:*)",
|
||||
27→ "Bash(python:*)",
|
||||
28→ "Bash(python3:*)",
|
||||
29→ "Bash(node:*)",
|
||||
30→ "Bash(npm:*)",
|
||||
31→ "Bash(npx:*)",
|
||||
32→ "Bash(cargo:*)",
|
||||
33→ "Bash(rustc:*)",
|
||||
34→ "Bash(powershell.exe:*)",
|
||||
35→ "Bash(pwsh:*)",
|
||||
36→ "Bash(which:*)",
|
||||
37→ "Bash(where:*)",
|
||||
38→ "Bash(whoami:*)",
|
||||
39→ "Bash(date:*)",
|
||||
40→ "Bash(head:*)",
|
||||
41→ "Bash(tail:*)",
|
||||
42→ "Bash(less:*)",
|
||||
43→ "Bash(more:*)",
|
||||
44→ "Bash(diff:*)",
|
||||
45→ "Bash(tar:*)",
|
||||
46→ "Bash(unzip:*)",
|
||||
47→ "Bash(zip:*)",
|
||||
48→ "Bash(docker:*)",
|
||||
49→ "Bash(docker-compose:*)",
|
||||
50→ "Bash(systemctl:*)",
|
||||
51→ "Bash(service:*)",
|
||||
52→ "Bash(journalctl:*)",
|
||||
53→ "Bash(apt:*)",
|
||||
54→ "Bash(apt-get:*)",
|
||||
55→ "Bash(brew:*)",
|
||||
56→ "Bash(code:*)",
|
||||
57→ "Bash(make:*)",
|
||||
58→ "Bash(cmake:*)",
|
||||
59→ "WebFetch(domain:*)",
|
||||
60→ "Bash(TOKEN=\"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0OTBlMmQwZi0wNjdkLTQxMzAtOThmZC04M2YwNmVkMGI5MzIiLCJyb2xlIjoiYWRtaW4iLCJleHAiOjE3NjYxOTI1MTcsImlhdCI6MTc2NjEwNjExN30.l5CmWuaeX80CeDYlIG4wRqsZL6VKPWSTm-tVJkxCoH4\")",
|
||||
61→ "Bash(dir:*)",
|
||||
62→ "Bash(rustup target list:*)",
|
||||
63→ "Bash(rustup target add:*)",
|
||||
64→ "Bash(wc:*)",
|
||||
65→ "Bash(\"/c/Program Files \\(x86\\)/Microsoft Visual Studio/Installer/vswhere.exe\" -all -format json)",
|
||||
66→ "Bash(winget:*)",
|
||||
67→ "Bash(choco --version:*)",
|
||||
68→ "Bash(\"/c/Program Files \\(x86\\)/Microsoft Visual Studio/Installer/vswhere.exe\" -all -products \"*\" -format value -property installationPath)",
|
||||
69→ "Skill(s)",
|
||||
70→ "Bash(powershell -Command \"\\(Get-Content service.rs -Raw\\) -replace ''#\\\\[cfg\\\\\\(windows\\\\\\)\\\\]\\\\r?\\\\npub mod windows \\\\{'', ''#[cfg\\(all\\(windows, feature = \"\"native-service\"\"\\)\\)]\npub mod windows {'' | Set-Content service.rs -NoNewline\")",
|
||||
71→ "Bash(powershell -Command \"\\(Get-Content service.rs -Raw\\) -replace ''println!\\\\\\(\"\"Binary: \\\\{\\\\}\\\\gururmm-agent.exe\"\", INSTALL_DIR\\\\\\);'', ''println!\\(\"\"Binary: {}\\\\\\\\gururmm-agent.exe\"\", INSTALL_DIR\\);'' -replace ''println!\\\\\\(\"\"Config: \\\\{\\\\}\\\\agent.toml\"\", CONFIG_DIR\\\\\\);'', ''println!\\(\"\"Config: {}\\\\\\\\agent.toml\"\", CONFIG_DIR\\);'' | Set-Content service.rs -NoNewline\")",
|
||||
72→ "Bash(perl -i -pe:*)",
|
||||
73→ "Bash(xxd:*)",
|
||||
74→ "Bash(timeout:*)",
|
||||
75→ "Bash(C:WindowsSystem32OpenSSHssh.exe root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf\")",
|
||||
76→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf\")",
|
||||
77→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/imunify360.conf 2>/dev/null | head -20\")",
|
||||
78→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat > /var/cpanel/apps/cloudflare_dns.conf << ''EOF''\nname=cloudflare_dns\nservice=whostmgr\nuser=root\nurl=addon_cloudflareDNS.cgi\nacls=all\ndisplayname=Cloudflare DNS Manager\nentryurl=addon_cloudflareDNS.cgi\nicon=icon_cloudflare_dns.svg\ntarget=_self\nsearchtext=cloudflare dns\nEOF\")",
|
||||
79→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf && /usr/local/cpanel/bin/rebuild_whm_chrome\")",
|
||||
80→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/scripts/rebuild_whostmgr_chrome 2>&1 || /scripts/rebuild_whostmgr_chrome 2>&1\")",
|
||||
81→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"ls /usr/local/cpanel/scripts/ | grep -i chrome; ls /usr/local/cpanel/bin/ | grep -i chrome\")",
|
||||
82→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/scripts/rebuild_whm_chrome\")",
|
||||
83→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/cloudflare_dns.conf && echo ''---'' && ls -la /usr/local/cpanel/whostmgr/docroot/cgi/addon_cloudflareDNS.cgi\")",
|
||||
84→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>/dev/null | grep -i cloudflare || echo ''Not in list''\")",
|
||||
85→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/imunify360.conf\")",
|
||||
86→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"ls /var/cpanel/apps/ && cat /var/cpanel/apps/addon_configserver_csf.conf 2>/dev/null | head -20\")",
|
||||
87→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/whm-360-monitoring.conf\")",
|
||||
88→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat > /var/cpanel/apps/cloudflare_dns.conf << ''EOF''\nname=cloudflare_dns\nservice=whostmgr\nuser=root\nurl=/cgi/addon_cloudflareDNS.cgi\nacls=all\ndisplayname=Cloudflare DNS Manager\nentryurl=addon_cloudflareDNS.cgi\nicon=icon_cloudflare_dns.svg\ntarget=_self\nsearchtext=cloudflare dns\nEOF\")",
|
||||
89→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf 2>&1\")",
|
||||
90→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>/dev/null | grep -i cloudflare && /usr/local/cpanel/scripts/rebuild_whm_chrome 2>&1\")",
|
||||
91→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>&1\")",
|
||||
92→ "Bash(ipconfig:*)",
|
||||
93→ "Bash(net view \\\\192.168.0.27)",
|
||||
94→ "Bash(powershell -Command \"$cred = New-Object System.Management.Automation.PSCredential\\(''INTRANET\\\\sysadmin'', \\(ConvertTo-SecureString ''Paper123!@#'' -AsPlainText -Force\\)\\); Invoke-Command -ComputerName 192.168.0.27 -Credential $cred -ScriptBlock { Get-WindowsFeature NPAS* | Select-Object Name,InstallState }\")",
|
||||
95→ "Bash(powershell -Command \"Set-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts -Value ''192.168.0.27'' -Force; Get-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts\")",
|
||||
96→ "Bash(powershell -Command \"Start-Service WinRM; Set-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts -Value ''192.168.0.27'' -Force\")",
|
||||
97→ "Bash(powershell -Command \"$pass = ConvertTo-SecureString ''Paper123!@#'' -AsPlainText -Force; $cred = New-Object System.Management.Automation.PSCredential\\(''INTRANET\\\\sysadmin'', $pass\\); Invoke-Command -ComputerName 192.168.0.27 -Credential $cred -ScriptBlock { Get-WindowsFeature NPAS* | Select-Object Name,InstallState }\")",
|
||||
98→ "Bash(powershell -ExecutionPolicy Bypass -File \"C:\\\\Users\\\\MikeSwanson\\\\claude-projects\\\\check-nps.ps1\")",
|
||||
99→ "Bash(powershell -ExecutionPolicy Bypass -File \"C:\\\\Users\\\\MikeSwanson\\\\claude-projects\\\\get-nps-config.ps1\")",
|
||||
100→ "Bash(powershell:*)",
|
||||
101→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -batch -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"hostname; uname -a; cat /mnt/data/unifi-os/unifi-core/config/settings.yaml 2>/dev/null | head -50\")",
|
||||
102→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -batch -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"find /mnt/data -name ''*vpn*'' -o -name ''*radius*'' 2>/dev/null | head -20\")",
|
||||
103→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"cat /mnt/data/udapi-config/raddb/clients.conf 2>/dev/null; ls -la /mnt/data/udapi-config/ 2>/dev/null\")",
|
||||
104→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" -no-antispoof root@192.168.0.254 \"ls /mnt/data/\")",
|
||||
105→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" -no-antispoof root@192.168.0.254 \"ls /data/ 2>/dev/null; ls /etc/openvpn/ 2>/dev/null; ps aux | grep -i vpn\")",
|
||||
106→ "Bash(claude --version)"
|
||||
107→ ],
|
||||
108→ "deny": [],
|
||||
109→ "ask": []
|
||||
110→ }
|
||||
111→}
|
||||
112→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,81 @@
|
||||
The file C:\Users\MikeSwanson\claude-projects\.claude\settings.local.json has been updated. Here's the result of running `cat -n` on a snippet of the edited file:
|
||||
1→{
|
||||
2→ "permissions": {
|
||||
3→ "allow": [
|
||||
4→ "Bash(git:*)",
|
||||
5→ "Bash(gh:*)",
|
||||
6→ "Bash(ssh:*)",
|
||||
7→ "Bash(scp:*)",
|
||||
8→ "Bash(rsync:*)",
|
||||
9→ "Bash(wsl:*)",
|
||||
10→ "Bash(wsl.exe:*)",
|
||||
11→ "Bash(cat:*)",
|
||||
12→ "Bash(ls:*)",
|
||||
13→ "Bash(find:*)",
|
||||
14→ "Bash(grep:*)",
|
||||
15→ "Bash(echo:*)",
|
||||
16→ "Bash(chmod:*)",
|
||||
17→ "Bash(chown:*)",
|
||||
18→ "Bash(mkdir:*)",
|
||||
19→ "Bash(rm:*)",
|
||||
20→ "Bash(cp:*)",
|
||||
21→ "Bash(mv:*)",
|
||||
22→ "Bash(curl:*)",
|
||||
23→ "Bash(wget:*)",
|
||||
24→ "Bash(nslookup:*)",
|
||||
25→ "Bash(dig:*)",
|
||||
26→ "Bash(ping:*)",
|
||||
27→ "Bash(python:*)",
|
||||
28→ "Bash(python3:*)",
|
||||
29→ "Bash(node:*)",
|
||||
30→ "Bash(npm:*)",
|
||||
31→ "Bash(npx:*)",
|
||||
32→ "Bash(cargo:*)",
|
||||
33→ "Bash(rustc:*)",
|
||||
34→ "Bash(rustup:*)",
|
||||
35→ "Bash(powershell:*)",
|
||||
36→ "Bash(powershell.exe:*)",
|
||||
37→ "Bash(pwsh:*)",
|
||||
38→ "Bash(which:*)",
|
||||
39→ "Bash(where:*)",
|
||||
40→ "Bash(whoami:*)",
|
||||
41→ "Bash(date:*)",
|
||||
42→ "Bash(head:*)",
|
||||
43→ "Bash(tail:*)",
|
||||
44→ "Bash(less:*)",
|
||||
45→ "Bash(more:*)",
|
||||
46→ "Bash(diff:*)",
|
||||
47→ "Bash(tar:*)",
|
||||
48→ "Bash(unzip:*)",
|
||||
49→ "Bash(zip:*)",
|
||||
50→ "Bash(docker:*)",
|
||||
51→ "Bash(docker-compose:*)",
|
||||
52→ "Bash(systemctl:*)",
|
||||
53→ "Bash(service:*)",
|
||||
54→ "Bash(journalctl:*)",
|
||||
55→ "Bash(apt:*)",
|
||||
56→ "Bash(apt-get:*)",
|
||||
57→ "Bash(brew:*)",
|
||||
58→ "Bash(code:*)",
|
||||
59→ "Bash(make:*)",
|
||||
60→ "Bash(cmake:*)",
|
||||
61→ "Bash(dir:*)",
|
||||
62→ "Bash(wc:*)",
|
||||
63→ "Bash(winget:*)",
|
||||
64→ "Bash(choco:*)",
|
||||
65→ "Bash(ipconfig:*)",
|
||||
66→ "Bash(net:*)",
|
||||
67→ "Bash(perl:*)",
|
||||
68→ "Bash(xxd:*)",
|
||||
69→ "Bash(timeout:*)",
|
||||
70→ "Bash(claude:*)",
|
||||
71→ "Bash(plink:*)",
|
||||
72→ "WebFetch(domain:*)",
|
||||
73→ "Skill(s)",
|
||||
74→ "Read(//c/Users/MikeSwanson/.claude/**)"
|
||||
75→ ],
|
||||
76→ "deny": [],
|
||||
77→ "ask": []
|
||||
78→ }
|
||||
79→}
|
||||
80→
|
||||
@@ -0,0 +1,2 @@
|
||||
2025-12-15-build-server-setup.md
|
||||
2025-12-20-v040-build.md
|
||||
@@ -0,0 +1,349 @@
|
||||
1→# Session Log: 2025-12-19
|
||||
2→
|
||||
3→## Update: 12:00 - Claude Code Desktop Shortcut & Workstation Setup
|
||||
4→
|
||||
5→### Desktop Shortcut
|
||||
6→- Created Windows `.lnk` shortcut to launch Claude Code in WSL
|
||||
7→- Target: `wsl.exe -d Ubuntu --cd /home/guru/claude-projects -e bash -lc claude`
|
||||
8→- Location: `C:\Users\guru\Desktop\Claude Code.lnk`
|
||||
9→
|
||||
10→### Global Claude Permissions
|
||||
11→- Created `~/.claude/settings.json` with broad command permissions
|
||||
12→- Applies to all projects: git, ssh, docker, npm, cargo, powershell, etc.
|
||||
13→- Synced to `claude-projects/claude-settings/settings.json`
|
||||
14→
|
||||
15→---
|
||||
16→
|
||||
17→## Update: 12:30 - AI 3D Printing Project
|
||||
18→
|
||||
19→### New Repository Created
|
||||
20→- **Gitea:** https://git.azcomputerguru.com/azcomputerguru/ai-3d-printing
|
||||
21→- **Local:** `~/claude-projects/ai-3d-printing/`
|
||||
22→- **Printer:** Bambu Lab P1S with AMS (4-slot multi-material)
|
||||
23→
|
||||
24→### Scrabble Tile Set Project
|
||||
25→Created complete 3D printable Scrabble tile replacement set:
|
||||
26→
|
||||
27→**Specifications:**
|
||||
28→- Tile size: 19mm x 19mm x 4mm (official dimensions)
|
||||
29→- Letters: Sunken 0.5mm below surface (matches original)
|
||||
30→- Letter thickness: 0.6mm
|
||||
31→- 100 tiles total with correct letter distribution
|
||||
32→
|
||||
33→**Files Created:**
|
||||
34→- `models/scrabble/scrabble-tile.scad` - Single tile parametric model
|
||||
35→- `models/scrabble/scrabble-full-plate.scad` - Full 100-tile plate (10x10 grid)
|
||||
36→- `scripts/generate-plate.bat` - Windows batch script with options:
|
||||
37→ 1. 3MF with colors pre-assigned (recommended)
|
||||
38→ 2. Single STL for color-change-by-height
|
||||
39→ 3. Two STLs (separate base + letters)
|
||||
40→- `scripts/create-3mf.py` - Python script to create Bambu Studio compatible 3MF
|
||||
41→- `docs/scrabble-tiles.md` - Full documentation
|
||||
42→
|
||||
43→**Multi-Color Setup:**
|
||||
44→- White PLA: Tile bases (AMS slot 1)
|
||||
45→- Black PLA: Sunken letters (AMS slot 2)
|
||||
46→
|
||||
47→**Note:** 3MF export requires Bambu-specific metadata. If "not from Bambu Lab" warning appears, use Option 3 (two STLs) and manually assign colors in Bambu Studio.
|
||||
48→
|
||||
49→---
|
||||
50→
|
||||
51→## Update: 18:45 - RRS-Law.com Email DNS Fix
|
||||
52→
|
||||
53→### Issue
|
||||
54→Email DNS records incomplete for Microsoft 365 on IX server.
|
||||
55→
|
||||
56→### Records Added via WHM API
|
||||
57→
|
||||
58→| Record | Type | Value |
|
||||
59→|--------|------|-------|
|
||||
60→| `_dmarc.rrs-law.com` | TXT | `v=DMARC1; p=quarantine; rua=mailto:admin@rrs-law.com` |
|
||||
61→| `selector1._domainkey.rrs-law.com` | CNAME | `selector1-rrslaw-com0i._domainkey.rrslaw.d-v1.dkim.mail.microsoft` |
|
||||
62→| `selector2._domainkey.rrs-law.com` | CNAME | `selector2-rrslaw-com0i._domainkey.rrslaw.d-v1.dkim.mail.microsoft` |
|
||||
63→
|
||||
64→### Final Email DNS Status for rrs-law.com
|
||||
65→
|
||||
66→| Record | Status |
|
||||
67→|--------|--------|
|
||||
68→| MX → M365 | ✅ |
|
||||
69→| SPF (includes M365) | ✅ |
|
||||
70→| DMARC | ✅ NEW |
|
||||
71→| Autodiscover | ✅ |
|
||||
72→| DKIM selector1 | ✅ NEW |
|
||||
73→| DKIM selector2 | ✅ NEW |
|
||||
74→| MS Verification | ✅ |
|
||||
75→| Enterprise Registration | ✅ |
|
||||
76→| Enterprise Enrollment | ✅ |
|
||||
77→
|
||||
78→### Propagation Status
|
||||
79→- DKIM selector1: Propagated ✅
|
||||
80→- DMARC: Propagated ✅
|
||||
81→
|
||||
82→### Follow-up Fix (19:15)
|
||||
83→- Verified DKIM selectors against M365 requirements
|
||||
84→- **selector2 was missing** - added via WHM API
|
||||
85→- Both selectors now verified by M365 as published
|
||||
86→- DKIM signing enabled in M365 Admin Center ✅
|
||||
87→
|
||||
88→---
|
||||
89→
|
||||
90→## Update: 13:00 - Windows Machine Setup (MikeSwanson)
|
||||
91→
|
||||
92→### Gitea Repository Connected
|
||||
93→- Initialized git in `C:\Users\MikeSwanson\claude-projects`
|
||||
94→- Connected to `https://git.azcomputerguru.com/azcomputerguru/claude-projects.git`
|
||||
95→- Synced 136 files from remote
|
||||
96→- Branch: main tracking origin/main
|
||||
97→
|
||||
98→### WSL Removed
|
||||
99→- Unregistered Ubuntu distribution
|
||||
100→- Uninstalled WSL components entirely
|
||||
101→- Note: guru@wsl SSH key no longer available from this machine
|
||||
102→
|
||||
103→---
|
||||
104→
|
||||
105→## Update: 13:30 - BG Builders LLC Email Investigation
|
||||
106→
|
||||
107→### Incident
|
||||
108→- User: Shelly Dooley (shelly@bgbuildersllc.com)
|
||||
109→- Report: Received phishing email appearing to be from herself
|
||||
110→- Subject: "Sonorangreenllc.com New Notice: All Employee Stipend..."
|
||||
111→- Attachment: "Shelly_Bonus.pdf" (52 KB)
|
||||
112→
|
||||
113→### Investigation Results
|
||||
114→
|
||||
115→**Account Status:** NOT COMPROMISED
|
||||
116→
|
||||
117→| Check | Result |
|
||||
118→|-------|--------|
|
||||
119→| Mailbox Forwarding | None configured ✅ |
|
||||
120→| Inbox Rules | None configured ✅ |
|
||||
121→| Send-As Permissions | None granted ✅ |
|
||||
122→| Mailbox Permissions | Normal ✅ |
|
||||
123→| Account Enabled | Yes |
|
||||
124→| Last Password Change | April 15, 2025 |
|
||||
125→| Mailbox Size | 17,256 items (12.42 GB) |
|
||||
126→| Last Logon | Dec 19, 2025 14:02 |
|
||||
127→
|
||||
128→**Conclusion:** Email SPOOFING, not account compromise
|
||||
129→- Attacker forged From address externally
|
||||
130→- M365 flagged: "We could not verify the identity of the sender"
|
||||
131→- Email correctly routed to Junk folder
|
||||
132→
|
||||
133→### Root Cause: Missing Email Authentication
|
||||
134→
|
||||
135→| Record | Before | After |
|
||||
136→|--------|--------|-------|
|
||||
137→| SPF | ✅ `-all` | ✅ (unchanged) |
|
||||
138→| DMARC | ❌ Missing | ✅ `p=reject` |
|
||||
139→| DKIM | ❌ Missing | ✅ Enabled |
|
||||
140→
|
||||
141→### DNS Records Added (GoDaddy - bgbuildersllc.com)
|
||||
142→
|
||||
143→**DMARC:**
|
||||
144→```
|
||||
145→_dmarc TXT "v=DMARC1; p=reject; rua=mailto:sysadmin@bgbuildersllc.com"
|
||||
146→```
|
||||
147→
|
||||
148→**DKIM:**
|
||||
149→```
|
||||
150→selector1._domainkey CNAME selector1-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
151→selector2._domainkey CNAME selector2-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
152→```
|
||||
153→
|
||||
154→### Follow-up Required
|
||||
155→- Enable DKIM signing in M365 Defender after DNS propagates
|
||||
156→- Verify records with: `nslookup -type=txt _dmarc.bgbuildersllc.com`
|
||||
157→
|
||||
158→---
|
||||
159→
|
||||
160→## Credentials Added
|
||||
161→
|
||||
162→### BG Builders LLC - Microsoft 365
|
||||
163→- **Tenant:** bgbuildersllc.com (ID: ededa4fb-f6eb-4398-851d-5eb3e11fab27)
|
||||
164→- **Admin User:** sysadmin@bgbuildersllc.com
|
||||
165→- **Password:** Window123!@#-bgb
|
||||
166→- **Related Domain:** sonorangreenllc.com (same tenant)
|
||||
167→- **onmicrosoft.com:** sonorangreenllc.onmicrosoft.com
|
||||
168→
|
||||
169→---
|
||||
170→
|
||||
171→## Update: 14:50 - BG Builders DNS Verification & Documentation
|
||||
172→
|
||||
173→### DNS Verification Results
|
||||
174→
|
||||
175→Checked both bgbuildersllc.com and sonorangreenllc.com:
|
||||
176→
|
||||
177→**SPF Status (both OK):**
|
||||
178→- bgbuildersllc.com: `v=spf1 include:spf.protection.outlook.com -all`
|
||||
179→- sonorangreenllc.com: `v=spf1 include:spf.protection.outlook.com -all`
|
||||
180→
|
||||
181→**DMARC Status (MISSING - needs to be added):**
|
||||
182→- bgbuildersllc.com: NOT FOUND
|
||||
183→- sonorangreenllc.com: NOT FOUND
|
||||
184→
|
||||
185→**DKIM Status (MISSING - needs to be added):**
|
||||
186→- Both domains missing selector1 and selector2 CNAME records
|
||||
187→
|
||||
188→### File Created
|
||||
189→Saved DNS records needed to: `C:\Users\MikeSwanson\claude-projects\bgbuilders-dns-records.txt`
|
||||
190→
|
||||
191→Contains all records needed for both domains in GoDaddy.
|
||||
192→
|
||||
193→### Pending Actions
|
||||
194→1. Add DMARC and DKIM records in GoDaddy for both domains
|
||||
195→2. Wait for DNS propagation (5-10 min)
|
||||
196→3. Enable DKIM signing in M365 Defender for both domains
|
||||
197→
|
||||
198→### Records Needed (GoDaddy)
|
||||
199→
|
||||
200→**bgbuildersllc.com:**
|
||||
201→- _dmarc TXT: v=DMARC1; p=reject; rua=mailto:sysadmin@bgbuildersllc.com
|
||||
202→- selector1._domainkey CNAME: selector1-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
203→- selector2._domainkey CNAME: selector2-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
204→
|
||||
205→**sonorangreenllc.com:**
|
||||
206→- _dmarc TXT: v=DMARC1; p=reject; rua=mailto:sysadmin@bgbuildersllc.com
|
||||
207→- selector1._domainkey CNAME: selector1-sonorangreenllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
208→- selector2._domainkey CNAME: selector2-sonorangreenllc-com._domainkey.sonorangreenllc.onmicrosoft.com
|
||||
209→
|
||||
210→---
|
||||
211→
|
||||
212→## Update: 17:00 - Cloudflare DNS Manager WHM Plugin & BG Builders DNS
|
||||
213→
|
||||
214→### WHM Plugin 403 Fix
|
||||
215→
|
||||
216→Fixed plugin registration error ("unregistered application"):
|
||||
217→
|
||||
218→**Problem:** AppConfig URL format was wrong
|
||||
219→**Fix:** Changed `url=addon_cloudflareDNS.cgi` to `url=/cgi/addon_cloudflareDNS.cgi`
|
||||
220→
|
||||
221→```bash
|
||||
222→# Fixed AppConfig at /var/cpanel/apps/cloudflare_dns.conf
|
||||
223→/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf
|
||||
224→/usr/local/cpanel/scripts/rebuild_whm_chrome
|
||||
225→```
|
||||
226→
|
||||
227→### bgbuildersllc.com Cloudflare Setup
|
||||
228→
|
||||
229→Zone is now active in Cloudflare:
|
||||
230→- **Zone ID:** 156b997e3f7113ddbd9145f04aadb2df
|
||||
231→- **Nameservers:** amir.ns.cloudflare.com, mckinley.ns.cloudflare.com
|
||||
232→
|
||||
233→**Missing A Records Fixed:**
|
||||
234→- Recovered original IPs from GoDaddy nameservers: 3.33.130.190, 15.197.148.33
|
||||
235→- Added both to Cloudflare (proxied)
|
||||
236→
|
||||
237→**Current Cloudflare Records (14 total):**
|
||||
238→
|
||||
239→| Type | Name | Content |
|
||||
240→|------|------|---------|
|
||||
241→| A | @ | 3.33.130.190 (proxied) |
|
||||
242→| A | @ | 15.197.148.33 (proxied) |
|
||||
243→| MX | @ | bgbuildersllc-com.mail.protection.outlook.com (pri 0) |
|
||||
244→| TXT | @ | v=spf1 include:spf.protection.outlook.com -all |
|
||||
245→| TXT | _dmarc | v=DMARC1; p=reject; rua=mailto:sysadmin@bgbuildersllc.com |
|
||||
246→| CNAME | autodiscover | autodiscover.outlook.com |
|
||||
247→| CNAME | enterpriseenrollment | enterpriseenrollment.manage.microsoft.com |
|
||||
248→| CNAME | enterpriseregistration | enterpriseregistration.windows.net |
|
||||
249→| CNAME | lyncdiscover | webdir.online.lync.com |
|
||||
250→| CNAME | selector1._domainkey | selector1-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com |
|
||||
251→| CNAME | selector2._domainkey | selector2-bgbuildersllc-com._domainkey.sonorangreenllc.onmicrosoft.com |
|
||||
252→| CNAME | sip | sipdir.online.lync.com |
|
||||
253→| SRV | _sip._tls | sipdir.online.lync.com:443 |
|
||||
254→| SRV | _sipfederationtls._tcp | sipfed.online.lync.com:5061 |
|
||||
255→
|
||||
256→### sonorangreenllc.com Status
|
||||
257→
|
||||
258→- Still on GoDaddy nameservers (not migrated to Cloudflare yet)
|
||||
259→- A record points to private IP 172.16.10.200 (problematic)
|
||||
260→- Email records properly configured for M365
|
||||
261→
|
||||
262→### WHM Account Planning
|
||||
263→
|
||||
264→Plan to create cPanel account for bgbuildersllc.com on IX server:
|
||||
265→1. Create account in WHM (user action)
|
||||
266→2. Update Cloudflare A records:
|
||||
267→ - Delete: 3.33.130.190, 15.197.148.33 (GoDaddy website builder)
|
||||
268→ - Add: 72.194.62.5 (IX server public IP)
|
||||
269→
|
||||
270→### Plugin Proxied Status Feature
|
||||
271→
|
||||
272→Confirmed WHM plugin fully supports Cloudflare proxy (orange cloud):
|
||||
273→- **View:** Checkmark column shows proxy status
|
||||
274→- **Add:** Checkbox to enable proxy for new records
|
||||
275→- **Edit:** Toggle for A/AAAA/CNAME records
|
||||
276→
|
||||
277→### GoDaddy Zone File Saved
|
||||
278→
|
||||
279→Saved original zone file export to: `C:\Users\MikeSwanson\claude-projects\bgbuildersllc-godaddy-zonefile.txt`
|
||||
280→
|
||||
281→### Pending Actions
|
||||
282→
|
||||
283→1. Create cPanel account for bgbuildersllc.com in WHM
|
||||
284→2. After account creation, update Cloudflare A records to IX server IP
|
||||
285→3. Enable DKIM signing in M365 Defender
|
||||
286→4. Consider migrating sonorangreenllc.com to Cloudflare
|
||||
287→
|
||||
288→---
|
||||
289→
|
||||
290→## Update: 18:00 - Mac Session (ACG-M-L5090)
|
||||
291→
|
||||
292→### Sync & Repository Maintenance
|
||||
293→
|
||||
294→1. **Synced from Gitea** - Pulled latest changes from other machines
|
||||
295→2. **Resolved git divergence** - Local had 63 commits, remote had 22 different commits after forced update
|
||||
296→ - Reset to remote state to reconcile
|
||||
297→
|
||||
298→3. **Fixed /s slash command** (again)
|
||||
299→ - Local copy had old broken version after sync
|
||||
300→ - Updated `~/.claude/commands/s.md` from repo
|
||||
301→
|
||||
302→### MailProtector Admin Guide
|
||||
303→
|
||||
304→Created comprehensive admin documentation:
|
||||
305→- **File:** `mailprotector-config/HOWTO-Admin-Guide.md`
|
||||
306→- **Contents:** Step-by-step domain setup, SPF requirements, troubleshooting, all management commands
|
||||
307→
|
||||
308→### CLAUDE.md Reorganization
|
||||
309→
|
||||
310→Reorganized main CLAUDE.md for better flow:
|
||||
311→- **Before:** 240 lines, redundant sections
|
||||
312→- **After:** 147 lines, clean structure
|
||||
313→- Removed duplicate credential instructions (was mentioned 3x)
|
||||
314→- Added missing projects (AI 3D Printing, MailProtector)
|
||||
315→- Added missing servers (Build Server, WebSvr, IX)
|
||||
316→- Consolidated pending tasks at end
|
||||
317→
|
||||
318→### Cross-Platform Agent Discussion
|
||||
319→
|
||||
320→Discussed GuruRMM agent cross-compilation:
|
||||
321→- **Linux → Linux/Windows:** Easy with Rust
|
||||
322→- **Linux → macOS:** Difficult (Apple SDK licensing)
|
||||
323→- **Mac → All:** Best option - Mac can cross-compile to all 3 platforms
|
||||
324→- **Plan:** Use older Mac Mini as dedicated build machine
|
||||
325→
|
||||
326→---
|
||||
327→
|
||||
328→## Machine: Mac (ACG-M-L5090)
|
||||
329→
|
||||
330→Working directory: `/Users/azcomputerguru/claude-projects`
|
||||
331→
|
||||
332→---
|
||||
333→
|
||||
334→## Pending Tasks (All Machines)
|
||||
335→
|
||||
336→### GuruRMM
|
||||
337→- [ ] Build updated agent with extended metrics on build server (172.16.3.30)
|
||||
338→- [ ] Set up cross-platform builds (older Mac Mini as build machine)
|
||||
339→
|
||||
340→### BG Builders
|
||||
341→- [ ] Create cPanel account for bgbuildersllc.com in WHM
|
||||
342→- [ ] Update Cloudflare A records to IX server IP after account creation
|
||||
343→- [ ] Enable DKIM signing in M365 Defender
|
||||
344→- [ ] Consider migrating sonorangreenllc.com to Cloudflare
|
||||
345→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,54 @@
|
||||
1→//! GuruRMM Tray Application
|
||||
2→//!
|
||||
3→//! System tray interface for the GuruRMM agent.
|
||||
4→//! Communicates with the agent service via IPC (named pipe on Windows).
|
||||
5→
|
||||
6→// Hide console window on Windows release builds
|
||||
7→#![cfg_attr(
|
||||
8→ all(target_os = "windows", not(debug_assertions)),
|
||||
9→ windows_subsystem = "windows"
|
||||
10→)]
|
||||
11→
|
||||
12→mod ipc;
|
||||
13→mod menu;
|
||||
14→mod tray;
|
||||
15→
|
||||
16→use anyhow::Result;
|
||||
17→use tracing::{error, info};
|
||||
18→use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
|
||||
19→
|
||||
20→use crate::ipc::IpcClient;
|
||||
21→use crate::tray::TrayApp;
|
||||
22→
|
||||
23→fn main() -> Result<()> {
|
||||
24→ // Initialize logging
|
||||
25→ tracing_subscriber::registry()
|
||||
26→ .with(
|
||||
27→ tracing_subscriber::EnvFilter::try_from_default_env()
|
||||
28→ .unwrap_or_else(|_| "gururmm_tray=info".into()),
|
||||
29→ )
|
||||
30→ .with(tracing_subscriber::fmt::layer())
|
||||
31→ .init();
|
||||
32→
|
||||
33→ info!("GuruRMM Tray starting...");
|
||||
34→
|
||||
35→ // Run the tray application
|
||||
36→ if let Err(e) = run_tray() {
|
||||
37→ error!("Tray application error: {}", e);
|
||||
38→ return Err(e);
|
||||
39→ }
|
||||
40→
|
||||
41→ info!("GuruRMM Tray exiting");
|
||||
42→ Ok(())
|
||||
43→}
|
||||
44→
|
||||
45→fn run_tray() -> Result<()> {
|
||||
46→ // Create and run the tray application
|
||||
47→ let app = TrayApp::new()?;
|
||||
48→ app.run()
|
||||
49→}
|
||||
50→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,295 @@
|
||||
1→//! Main tray application logic
|
||||
2→
|
||||
3→use anyhow::{Context, Result};
|
||||
4→use std::sync::Arc;
|
||||
5→use tokio::sync::{mpsc, RwLock};
|
||||
6→use tray_icon::{
|
||||
7→ menu::MenuEvent,
|
||||
8→ Icon, TrayIcon, TrayIconBuilder,
|
||||
9→};
|
||||
10→use tracing::{debug, error, info, warn};
|
||||
11→use winit::event_loop::{ControlFlow, EventLoop};
|
||||
12→
|
||||
13→use crate::ipc::{AgentStatus, ConnectionState, IpcClient, IpcRequest, TrayPolicy};
|
||||
14→use crate::menu::{self, MenuAction};
|
||||
15→
|
||||
16→/// Icon state
|
||||
17→#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
18→pub enum IconState {
|
||||
19→ Connected,
|
||||
20→ Reconnecting,
|
||||
21→ Error,
|
||||
22→ Disabled,
|
||||
23→}
|
||||
24→
|
||||
25→/// Embedded icon data (will be replaced with actual icons)
|
||||
26→mod icons {
|
||||
27→ // Placeholder: 16x16 RGBA icons
|
||||
28→ // In production, these would be loaded from the assets folder
|
||||
29→
|
||||
30→ pub fn connected() -> Vec<u8> {
|
||||
31→ // Green circle placeholder (16x16 RGBA)
|
||||
32→ create_circle_icon(0x22, 0xc5, 0x5e, 0xff)
|
||||
33→ }
|
||||
34→
|
||||
35→ pub fn reconnecting() -> Vec<u8> {
|
||||
36→ // Yellow circle placeholder
|
||||
37→ create_circle_icon(0xea, 0xb3, 0x08, 0xff)
|
||||
38→ }
|
||||
39→
|
||||
40→ pub fn error() -> Vec<u8> {
|
||||
41→ // Red circle placeholder
|
||||
42→ create_circle_icon(0xef, 0x44, 0x44, 0xff)
|
||||
43→ }
|
||||
44→
|
||||
45→ pub fn disabled() -> Vec<u8> {
|
||||
46→ // Gray circle placeholder
|
||||
47→ create_circle_icon(0x6b, 0x72, 0x80, 0xff)
|
||||
48→ }
|
||||
49→
|
||||
50→ fn create_circle_icon(r: u8, g: u8, b: u8, a: u8) -> Vec<u8> {
|
||||
51→ let size = 32;
|
||||
52→ let mut data = vec![0u8; size * size * 4];
|
||||
53→ let center = size as f32 / 2.0;
|
||||
54→ let radius = center - 2.0;
|
||||
55→
|
||||
56→ for y in 0..size {
|
||||
57→ for x in 0..size {
|
||||
58→ let dx = x as f32 - center;
|
||||
59→ let dy = y as f32 - center;
|
||||
60→ let dist = (dx * dx + dy * dy).sqrt();
|
||||
61→
|
||||
62→ let idx = (y * size + x) * 4;
|
||||
63→ if dist <= radius {
|
||||
64→ data[idx] = r;
|
||||
65→ data[idx + 1] = g;
|
||||
66→ data[idx + 2] = b;
|
||||
67→ data[idx + 3] = a;
|
||||
68→ } else if dist <= radius + 1.0 {
|
||||
69→ // Anti-aliased edge
|
||||
70→ let alpha = ((radius + 1.0 - dist) * a as f32) as u8;
|
||||
71→ data[idx] = r;
|
||||
72→ data[idx + 1] = g;
|
||||
73→ data[idx + 2] = b;
|
||||
74→ data[idx + 3] = alpha;
|
||||
75→ }
|
||||
76→ }
|
||||
77→ }
|
||||
78→
|
||||
79→ data
|
||||
80→ }
|
||||
81→}
|
||||
82→
|
||||
83→/// Main tray application
|
||||
84→pub struct TrayApp {
|
||||
85→ /// Tokio runtime for async operations
|
||||
86→ runtime: tokio::runtime::Runtime,
|
||||
87→
|
||||
88→ /// IPC client state
|
||||
89→ connection_state: Arc<RwLock<ConnectionState>>,
|
||||
90→ status: Arc<RwLock<AgentStatus>>,
|
||||
91→ policy: Arc<RwLock<TrayPolicy>>,
|
||||
92→
|
||||
93→ /// Request sender
|
||||
94→ request_tx: mpsc::Sender<IpcRequest>,
|
||||
95→}
|
||||
96→
|
||||
97→impl TrayApp {
|
||||
98→ /// Create a new tray application
|
||||
99→ pub fn new() -> Result<Self> {
|
||||
100→ let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||
101→ .enable_all()
|
||||
102→ .build()
|
||||
103→ .context("Failed to create tokio runtime")?;
|
||||
104→
|
||||
105→ let connection_state = Arc::new(RwLock::new(ConnectionState::Disconnected));
|
||||
106→ let status = Arc::new(RwLock::new(AgentStatus::default()));
|
||||
107→ let policy = Arc::new(RwLock::new(TrayPolicy::default_permissive()));
|
||||
108→
|
||||
109→ let (request_tx, request_rx) = mpsc::channel(32);
|
||||
110→ let (update_tx, _update_rx) = mpsc::channel(32);
|
||||
111→
|
||||
112→ // Spawn IPC connection task
|
||||
113→ let conn_state = Arc::clone(&connection_state);
|
||||
114→ let conn_status = Arc::clone(&status);
|
||||
115→ let conn_policy = Arc::clone(&policy);
|
||||
116→
|
||||
117→ runtime.spawn(async move {
|
||||
118→ crate::ipc::connection::run_connection(
|
||||
119→ conn_state,
|
||||
120→ conn_status,
|
||||
121→ conn_policy,
|
||||
122→ request_rx,
|
||||
123→ update_tx,
|
||||
124→ )
|
||||
125→ .await;
|
||||
126→ });
|
||||
127→
|
||||
128→ Ok(Self {
|
||||
129→ runtime,
|
||||
130→ connection_state,
|
||||
131→ status,
|
||||
132→ policy,
|
||||
133→ request_tx,
|
||||
134→ })
|
||||
135→ }
|
||||
136→
|
||||
137→ /// Run the tray application (blocking)
|
||||
138→ pub fn run(self) -> Result<()> {
|
||||
139→ let event_loop = EventLoop::new().context("Failed to create event loop")?;
|
||||
140→
|
||||
141→ // Create initial icon
|
||||
142→ let icon = create_icon(IconState::Reconnecting)?;
|
||||
143→
|
||||
144→ // Get initial status and policy for menu
|
||||
145→ let (status, policy) = self.runtime.block_on(async {
|
||||
146→ let s = self.status.read().await.clone();
|
||||
147→ let p = self.policy.read().await.clone();
|
||||
148→ (s, p)
|
||||
149→ });
|
||||
150→
|
||||
151→ // Build initial menu
|
||||
152→ let menu = menu::build_menu(&status, &policy);
|
||||
153→
|
||||
154→ // Create tray icon
|
||||
155→ let tooltip = policy
|
||||
156→ .tooltip_text
|
||||
157→ .clone()
|
||||
158→ .unwrap_or_else(|| "GuruRMM Agent".to_string());
|
||||
159→
|
||||
160→ let tray_icon = TrayIconBuilder::new()
|
||||
161→ .with_menu(Box::new(menu))
|
||||
162→ .with_tooltip(&tooltip)
|
||||
163→ .with_icon(icon)
|
||||
164→ .build()
|
||||
165→ .context("Failed to create tray icon")?;
|
||||
166→
|
||||
167→ info!("Tray icon created");
|
||||
168→
|
||||
169→ // Menu event receiver
|
||||
170→ let menu_channel = MenuEvent::receiver();
|
||||
171→
|
||||
172→ // Track last known state for icon updates
|
||||
173→ let mut last_icon_state = IconState::Reconnecting;
|
||||
174→ let mut last_connected = false;
|
||||
175→
|
||||
176→ // Run event loop
|
||||
177→ event_loop.run(move |_event, event_loop| {
|
||||
178→ event_loop.set_control_flow(ControlFlow::Wait);
|
||||
179→
|
||||
180→ // Check for menu events (non-blocking)
|
||||
181→ if let Ok(event) = menu_channel.try_recv() {
|
||||
182→ let action = menu::handle_menu_event(event);
|
||||
183→ debug!("Menu action: {:?}", action);
|
||||
184→
|
||||
185→ match action {
|
||||
186→ MenuAction::ForceCheckin => {
|
||||
187→ let tx = self.request_tx.clone();
|
||||
188→ self.runtime.spawn(async move {
|
||||
189→ if let Err(e) = tx.send(IpcRequest::ForceCheckin).await {
|
||||
190→ error!("Failed to send force checkin: {}", e);
|
||||
191→ }
|
||||
192→ });
|
||||
193→ }
|
||||
194→ MenuAction::ViewLogs => {
|
||||
195→ // Open log file location
|
||||
196→ #[cfg(windows)]
|
||||
197→ {
|
||||
198→ let _ = std::process::Command::new("explorer")
|
||||
199→ .arg(r"C:\ProgramData\GuruRMM\logs")
|
||||
200→ .spawn();
|
||||
201→ }
|
||||
202→ }
|
||||
203→ MenuAction::OpenDashboard => {
|
||||
204→ let policy = self.runtime.block_on(async {
|
||||
205→ self.policy.read().await.clone()
|
||||
206→ });
|
||||
207→ if let Some(url) = policy.dashboard_url {
|
||||
208→ let _ = open::that(&url);
|
||||
209→ }
|
||||
210→ }
|
||||
211→ MenuAction::StopAgent => {
|
||||
212→ // Show confirmation dialog before stopping
|
||||
213→ // For now, just send the request
|
||||
214→ let tx = self.request_tx.clone();
|
||||
215→ self.runtime.spawn(async move {
|
||||
216→ if let Err(e) = tx.send(IpcRequest::StopAgent).await {
|
||||
217→ error!("Failed to send stop agent: {}", e);
|
||||
218→ }
|
||||
219→ });
|
||||
220→ }
|
||||
221→ MenuAction::ExitTray => {
|
||||
222→ info!("Exit requested");
|
||||
223→ event_loop.exit();
|
||||
224→ }
|
||||
225→ MenuAction::Unknown(id) => {
|
||||
226→ warn!("Unknown menu action: {}", id);
|
||||
227→ }
|
||||
228→ }
|
||||
229→ }
|
||||
230→
|
||||
231→ // Periodically update icon and menu based on state
|
||||
232→ let (conn_state, status, policy) = self.runtime.block_on(async {
|
||||
233→ let c = *self.connection_state.read().await;
|
||||
234→ let s = self.status.read().await.clone();
|
||||
235→ let p = self.policy.read().await.clone();
|
||||
236→ (c, s, p)
|
||||
237→ });
|
||||
238→
|
||||
239→ // Determine icon state
|
||||
240→ let icon_state = match conn_state {
|
||||
241→ ConnectionState::Connected if status.connected => IconState::Connected,
|
||||
242→ ConnectionState::Connected => IconState::Error,
|
||||
243→ ConnectionState::Connecting => IconState::Reconnecting,
|
||||
244→ ConnectionState::Disconnected => IconState::Disabled,
|
||||
245→ };
|
||||
246→
|
||||
247→ // Update icon if state changed
|
||||
248→ if icon_state != last_icon_state {
|
||||
249→ last_icon_state = icon_state;
|
||||
250→ if let Ok(new_icon) = create_icon(icon_state) {
|
||||
251→ if let Err(e) = tray_icon.set_icon(Some(new_icon)) {
|
||||
252→ warn!("Failed to update icon: {}", e);
|
||||
253→ }
|
||||
254→ }
|
||||
255→
|
||||
256→ // Update tooltip
|
||||
257→ let tooltip = match icon_state {
|
||||
258→ IconState::Connected => format!("GuruRMM - Connected to {}",
|
||||
259→ status.server_url.split('/').nth(2).unwrap_or(&status.server_url)),
|
||||
260→ IconState::Reconnecting => "GuruRMM - Reconnecting...".to_string(),
|
||||
261→ IconState::Error => format!("GuruRMM - Error: {}",
|
||||
262→ status.error.as_deref().unwrap_or("Unknown")),
|
||||
263→ IconState::Disabled => "GuruRMM - Disabled".to_string(),
|
||||
264→ };
|
||||
265→ let _ = tray_icon.set_tooltip(Some(&tooltip));
|
||||
266→ }
|
||||
267→
|
||||
268→ // Rebuild menu if connection state changed
|
||||
269→ if status.connected != last_connected {
|
||||
270→ last_connected = status.connected;
|
||||
271→ let new_menu = menu::build_menu(&status, &policy);
|
||||
272→ tray_icon.set_menu(Some(Box::new(new_menu)));
|
||||
273→ }
|
||||
274→ })?;
|
||||
275→
|
||||
276→ Ok(())
|
||||
277→ }
|
||||
278→}
|
||||
279→
|
||||
280→/// Create an icon for the given state
|
||||
281→fn create_icon(state: IconState) -> Result<Icon> {
|
||||
282→ let data = match state {
|
||||
283→ IconState::Connected => icons::connected(),
|
||||
284→ IconState::Reconnecting => icons::reconnecting(),
|
||||
285→ IconState::Error => icons::error(),
|
||||
286→ IconState::Disabled => icons::disabled(),
|
||||
287→ };
|
||||
288→
|
||||
289→ Icon::from_rgba(data, 32, 32).context("Failed to create icon")
|
||||
290→}
|
||||
291→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,104 @@
|
||||
1→//! GuruRMM Agent - Cross-platform Remote Monitoring and Management Agent
|
||||
2→//!
|
||||
3→//! This agent connects to the GuruRMM server, reports system metrics,
|
||||
4→//! monitors services (watchdog), and executes remote commands.
|
||||
5→
|
||||
6→mod config;
|
||||
7→mod device_id;
|
||||
8→mod ipc;
|
||||
9→mod metrics;
|
||||
10→mod service;
|
||||
11→mod transport;
|
||||
12→mod updater;
|
||||
13→
|
||||
14→use anyhow::{Context, Result};
|
||||
15→use clap::{Parser, Subcommand};
|
||||
16→use std::path::PathBuf;
|
||||
17→use std::sync::Arc;
|
||||
18→use tokio::sync::RwLock;
|
||||
19→use tracing::{error, info, warn};
|
||||
20→
|
||||
21→use crate::config::AgentConfig;
|
||||
22→use crate::metrics::MetricsCollector;
|
||||
23→use crate::transport::WebSocketClient;
|
||||
24→
|
||||
25→/// GuruRMM Agent - Remote Monitoring and Management
|
||||
26→#[derive(Parser)]
|
||||
27→#[command(name = "gururmm-agent")]
|
||||
28→#[command(author, version, about, long_about = None)]
|
||||
29→struct Cli {
|
||||
30→ /// Path to configuration file
|
||||
31→ #[arg(short, long, default_value = "agent.toml")]
|
||||
32→ config: PathBuf,
|
||||
33→
|
||||
34→ /// Subcommand to run
|
||||
35→ #[command(subcommand)]
|
||||
36→ command: Option<Commands>,
|
||||
37→}
|
||||
38→
|
||||
39→#[derive(Subcommand)]
|
||||
40→enum Commands {
|
||||
41→ /// Run the agent (default)
|
||||
42→ Run,
|
||||
43→
|
||||
44→ /// Install as a system service
|
||||
45→ Install {
|
||||
46→ /// Server WebSocket URL (e.g., wss://rmm-api.example.com/ws)
|
||||
47→ #[arg(long)]
|
||||
48→ server_url: Option<String>,
|
||||
49→
|
||||
50→ /// API key for authentication
|
||||
51→ #[arg(long)]
|
||||
52→ api_key: Option<String>,
|
||||
53→
|
||||
54→ /// Skip legacy service detection and cleanup
|
||||
55→ #[arg(long, default_value = "false")]
|
||||
56→ skip_legacy_check: bool,
|
||||
57→ },
|
||||
58→
|
||||
59→ /// Uninstall the system service
|
||||
60→ Uninstall,
|
||||
61→
|
||||
62→ /// Start the installed service
|
||||
63→ Start,
|
||||
64→
|
||||
65→ /// Stop the installed service
|
||||
66→ Stop,
|
||||
67→
|
||||
68→ /// Show agent status
|
||||
69→ Status,
|
||||
70→
|
||||
71→ /// Generate a sample configuration file
|
||||
72→ GenerateConfig {
|
||||
73→ /// Output path for config file
|
||||
74→ #[arg(short, long, default_value = "agent.toml")]
|
||||
75→ output: PathBuf,
|
||||
76→ },
|
||||
77→
|
||||
78→ /// Run as Windows service (called by SCM, not for manual use)
|
||||
79→ #[command(hide = true)]
|
||||
80→ Service,
|
||||
81→}
|
||||
82→
|
||||
83→/// Shared application state
|
||||
84→pub struct AppState {
|
||||
85→ pub config: AgentConfig,
|
||||
86→ pub metrics_collector: MetricsCollector,
|
||||
87→ pub connected: RwLock<bool>,
|
||||
88→ pub last_checkin: RwLock<Option<chrono::DateTime<chrono::Utc>>>,
|
||||
89→ pub tray_policy: RwLock<ipc::TrayPolicy>,
|
||||
90→}
|
||||
91→
|
||||
92→#[tokio::main]
|
||||
93→async fn main() -> Result<()> {
|
||||
94→ // Initialize logging
|
||||
95→ tracing_subscriber::fmt()
|
||||
96→ .with_env_filter(
|
||||
97→ tracing_subscriber::EnvFilter::from_default_env()
|
||||
98→ .add_directive("gururmm_agent=info".parse()?)
|
||||
99→ .add_directive("info".parse()?),
|
||||
100→ )
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,158 @@
|
||||
1→# Session Log: 2025-12-20
|
||||
2→
|
||||
3→## Session Summary
|
||||
4→
|
||||
5→Completed RADIUS/OpenVPN authentication setup for Dataforth, troubleshooting why VPN connections were failing when RADIUS authentication was enabled on the Unifi UDM. Also created custom OpenVPN client profiles and investigated Windows Terminal rendering issues.
|
||||
6→
|
||||
7→### Key Accomplishments
|
||||
8→
|
||||
9→1. **Diagnosed and fixed RADIUS authentication failure** - VPN connections were timing out because NPS (Network Policy Server) required the Message-Authenticator attribute in RADIUS requests, but the UDM's pam_radius_auth module doesn't send it.
|
||||
10→
|
||||
11→2. **Created custom OpenVPN client profiles** - Built clean .ovpn files for Windows and Linux with split tunnel (no redirect-gateway) and proper DNS configuration.
|
||||
12→
|
||||
13→3. **Investigated Windows Terminal rendering glitch** - Added rendering options to Windows Terminal settings to try to fix visual artifacts.
|
||||
14→
|
||||
15→### Problems Solved
|
||||
16→
|
||||
17→- **RADIUS "failed to respond" error**: Root cause was NPS Event ID 17 showing Message-Authenticator requirement mismatch. Fixed by running `Set-NpsRadiusClient -Name "unifi" -AuthAttributeRequired $false` on AD1.
|
||||
18→
|
||||
19→- **UDM client profile includes redirect-gateway**: UniFi bug - the exported .ovpn includes `redirect-gateway def1` even though server config has `redirectGateway: false`. Workaround: created custom profiles without this line.
|
||||
20→
|
||||
21→---
|
||||
22→
|
||||
23→## Credentials
|
||||
24→
|
||||
25→### Dataforth - UDM Firewall
|
||||
26→- Host: 192.168.0.254
|
||||
27→- SSH: root / Paper123!@#-unifi
|
||||
28→- Web UI: azcomputerguru / r3tr0gradE99! (has 2FA)
|
||||
29→- SSH Key Added: `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIABnQjolTxDtfqOwdDjamK1oyFPiQnaNT/tAgsIHH1Zo claude-code`
|
||||
30→
|
||||
31→### Dataforth - Active Directory
|
||||
32→- AD1: 192.168.0.27
|
||||
33→- AD2: 192.168.0.6
|
||||
34→- Domain: INTRANET
|
||||
35→- Credentials: INTRANET\sysadmin / Paper123!@#
|
||||
36→
|
||||
37→### Dataforth - NPS RADIUS
|
||||
38→- Server: 192.168.0.27 (AD1)
|
||||
39→- Port: 1812/UDP
|
||||
40→- RADIUS Client Name: unifi
|
||||
41→- Shared Secret: Gptf*77ttb!@#!@#
|
||||
42→
|
||||
43→### Dataforth - VPN
|
||||
44→- Endpoint: 67.206.163.122:1194/TCP
|
||||
45→- VPN Subnet: 192.168.6.0/24
|
||||
46→- DNS Servers: 192.168.0.27, 192.168.0.6
|
||||
47→- Domain: intranet.dataforth.com
|
||||
48→
|
||||
49→---
|
||||
50→
|
||||
51→## Infrastructure & Configuration
|
||||
52→
|
||||
53→### OpenVPN Server Config (UDM)
|
||||
54→- Config location: `/etc/openvpn/openvpn-peer-1/`
|
||||
55→- RADIUS config: `/etc/openvpn/openvpn-peer-1/radius.server.conf.*`
|
||||
56→- PAM config: `/etc/pam.d/openvpn-peer-1*`
|
||||
57→- Server settings in: `/data/udapi-config/udapi-net-cfg.json`
|
||||
58→
|
||||
59→### Routes Pushed by VPN Server (Split Tunnel)
|
||||
60→- 192.168.0.0/24
|
||||
61→- 192.168.1.0/24
|
||||
62→- 192.168.4.0/24
|
||||
63→- 192.168.100.0/24
|
||||
64→- 192.168.200.0/24
|
||||
65→- 192.168.201.0/24
|
||||
66→
|
||||
67→### NPS Configuration on AD1
|
||||
68→- RADIUS Client "unifi" configured for 192.168.0.254
|
||||
69→- Network Policy "Unifi" allows Domain Users
|
||||
70→- **AuthAttributeRequired: False** (the fix)
|
||||
71→
|
||||
72→---
|
||||
73→
|
||||
74→## Commands Run
|
||||
75→
|
||||
76→### The Fix - Disable Message-Authenticator Requirement
|
||||
77→```powershell
|
||||
78→$pass = ConvertTo-SecureString 'Paper123!@#' -AsPlainText -Force
|
||||
79→$cred = New-Object System.Management.Automation.PSCredential('INTRANET\sysadmin', $pass)
|
||||
80→Invoke-Command -ComputerName 192.168.0.27 -Credential $cred -ScriptBlock {
|
||||
81→ Set-NpsRadiusClient -Name "unifi" -AuthAttributeRequired $false
|
||||
82→}
|
||||
83→Restart-Service IAS
|
||||
84→```
|
||||
85→
|
||||
86→### Verify NPS Authentication Success
|
||||
87→```powershell
|
||||
88→Get-WinEvent -FilterHashtable @{LogName='Security'; ID=6272,6273} -MaxEvents 5
|
||||
89→```
|
||||
90→- Event 6272 = Success: "Network Policy Server granted access to a user"
|
||||
91→- Event 6273 = Failure
|
||||
92→
|
||||
93→---
|
||||
94→
|
||||
95→## Files Created
|
||||
96→
|
||||
97→### OpenVPN Client Profiles (on Desktop)
|
||||
98→- `C:\Users\MikeSwanson\Desktop\dataforth-vpn.ovpn` - Windows client
|
||||
99→- `C:\Users\MikeSwanson\Desktop\dataforth-vpn-linux.ovpn` - Linux/RHEL client
|
||||
100→- `C:\Users\MikeSwanson\Desktop\dataforth-vpn-ticket-notes.txt` - Ticket documentation
|
||||
101→
|
||||
102→### PowerShell Scripts Created (for troubleshooting)
|
||||
103→- `C:\Users\MikeSwanson\claude-projects\fix-radius-client.ps1`
|
||||
104→- `C:\Users\MikeSwanson\claude-projects\check-nps.ps1`
|
||||
105→- `C:\Users\MikeSwanson\claude-projects\get-nps-config.ps1`
|
||||
106→- `C:\Users\MikeSwanson\claude-projects\check-nps-listening.ps1`
|
||||
107→- `C:\Users\MikeSwanson\claude-projects\trace-radius.ps1`
|
||||
108→- `C:\Users\MikeSwanson\claude-projects\monitor-radius.ps1`
|
||||
109→- `C:\Users\MikeSwanson\claude-projects\verify-and-restart-nps.ps1`
|
||||
110→- `C:\Users\MikeSwanson\claude-projects\fix-nps-logging.ps1`
|
||||
111→
|
||||
112→### Windows Terminal Settings Modified
|
||||
113→- `C:\Users\MikeSwanson\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json`
|
||||
114→- Added: `"rendering.forceFullRepaint": true`
|
||||
115→- Added: `"rendering.software": false`
|
||||
116→
|
||||
117→---
|
||||
118→
|
||||
119→## Testing Results
|
||||
120→
|
||||
121→- VPN connection with RADIUS auth: **SUCCESS**
|
||||
122→- User authenticated: INTRANET\sysadmin
|
||||
123→- NPS Event 6272 confirmed successful authentication
|
||||
124→- External test IP: 129.222.129.113
|
||||
125→
|
||||
126→---
|
||||
127→
|
||||
128→## Pending/Notes
|
||||
129→
|
||||
130→1. **Windows Terminal rendering glitch** - Added forceFullRepaint setting. User needs to restart terminal to test. If still happening, try `"rendering.software": true` instead.
|
||||
131→
|
||||
132→2. **OpenVPN client profiles** - Ready for distribution. Linux users need `openvpn-systemd-resolved` package for DNS to work.
|
||||
133→
|
||||
134→3. **UniFi bug** - Exported client profiles ignore `redirectGateway: false` setting. Custom profiles work around this.
|
||||
135→
|
||||
136→---
|
||||
137→
|
||||
138→## Reference
|
||||
139→
|
||||
140→### Useful NPS Event IDs
|
||||
141→- 6272: Access granted
|
||||
142→- 6273: Access denied
|
||||
143→- 6274: Request discarded
|
||||
144→- 6275: Accounting request discarded
|
||||
145→- 6276: User quarantined
|
||||
146→- 6278: Connection request discarded
|
||||
147→- 17 (System log): Message-Authenticator error
|
||||
148→
|
||||
149→### WinRM Setup for Remote PowerShell
|
||||
150→```powershell
|
||||
151→Start-Service WinRM
|
||||
152→Set-Item WSMan:\localhost\Client\TrustedHosts -Value '192.168.0.27' -Force
|
||||
153→```
|
||||
154→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,24 @@
|
||||
c24c48c Add session log: v0.4.0 build with tray icon
|
||||
f2711de Fix compilation errors for v0.4.0 build
|
||||
9f24a4e Bump agent version to 0.4.0 (tray support)
|
||||
60a3df4 Archive tray implementation plan
|
||||
e70f4d4 Add system tray application with IPC communication
|
||||
---
|
||||
total 57
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 ./
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 ../
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 1481 Dec 20 17:55 .env.example
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 .git/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 488 Dec 20 17:55 .gitignore
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 agent/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 agent-legacy/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 assets/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 dashboard/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 deploy/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 1684 Dec 20 17:55 docker-compose.yml
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 docs/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 screenshots/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 scripts/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 server/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 session-logs/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 tray/
|
||||
@@ -0,0 +1,127 @@
|
||||
1→# Session Log: GuruRMM v0.4.0 Build with Tray Icon
|
||||
2→**Date:** 2025-12-20
|
||||
3→**Focus:** Tray icon implementation, cross-platform builds
|
||||
4→
|
||||
5→---
|
||||
6→
|
||||
7→## Summary
|
||||
8→
|
||||
9→Built GuruRMM v0.4.0 with new system tray application for Windows.
|
||||
10→
|
||||
11→### Completed
|
||||
12→
|
||||
13→1. **Tray Icon Implementation** (from previous session)
|
||||
14→ - IPC infrastructure in `agent/src/ipc.rs` (Named Pipe for Windows)
|
||||
15→ - TrayPolicy struct for admin-controlled visibility
|
||||
16→ - Tray app crate with menu, icon states, IPC client
|
||||
17→ - SVG icon assets (green/yellow/red/gray states)
|
||||
18→
|
||||
19→2. **Compilation Fixes**
|
||||
20→ - Fixed `device_id::get_device_id()` return type (String, not Result)
|
||||
21→ - Added `TrayPolicyUpdate` match arm in WebSocket handler
|
||||
22→ - Added `last_checkin` and `tray_policy` fields to Windows service AppState
|
||||
23→ - Fixed tray-icon API change (`set_menu` returns unit now)
|
||||
24→
|
||||
25→3. **Cross-Platform Builds**
|
||||
26→ - Installed mingw-w64 via Homebrew on Mac
|
||||
27→ - Added `x86_64-pc-windows-gnu` target to Rust
|
||||
28→ - Configured cargo for Windows cross-compilation
|
||||
29→
|
||||
30→### Build Results (v0.4.0)
|
||||
31→
|
||||
32→| Component | Target | Size | Location |
|
||||
33→|-----------|--------|------|----------|
|
||||
34→| Agent | Linux x86_64 | 3.3 MB | Build server: `~/gururmm/agent/target/release/gururmm-agent` |
|
||||
35→| Agent | Windows x64 | 2.8 MB | Local: `agent/target/x86_64-pc-windows-gnu/release/gururmm-agent.exe` |
|
||||
36→| Tray App | Windows x64 | 1.6 MB | Local: `tray/target/x86_64-pc-windows-gnu/release/gururmm-tray.exe` |
|
||||
37→
|
||||
38→---
|
||||
39→
|
||||
40→## Architecture
|
||||
41→
|
||||
42→```
|
||||
43→┌─────────────────┐ Policy ┌─────────────────┐
|
||||
44→│ RMM Server │ ──────────────► │ Agent Service │
|
||||
45→│ (WebSocket) │ │ (Background) │
|
||||
46→└─────────────────┘ └────────┬────────┘
|
||||
47→ │ IPC
|
||||
48→ │ (Named Pipe)
|
||||
49→ ▼
|
||||
50→ ┌─────────────────┐
|
||||
51→ │ Tray App │
|
||||
52→ │ (User Session) │
|
||||
53→ └─────────────────┘
|
||||
54→```
|
||||
55→
|
||||
56→- Named pipe: `\\.\pipe\gururmm-agent`
|
||||
57→- Agent runs as SYSTEM, tray runs in user session
|
||||
58→- Policy controls: visibility, menu items, allowed actions
|
||||
59→
|
||||
60→---
|
||||
61→
|
||||
62→## Key Files
|
||||
63→
|
||||
64→### New Files
|
||||
65→- `agent/src/ipc.rs` - Named pipe IPC server, TrayPolicy, AgentStatus
|
||||
66→- `tray/Cargo.toml` - Tray app crate config
|
||||
67→- `tray/src/main.rs` - Entry point
|
||||
68→- `tray/src/tray.rs` - Tray icon management
|
||||
69→- `tray/src/menu.rs` - Dynamic menu building
|
||||
70→- `tray/src/ipc.rs` - Named pipe client
|
||||
71→- `assets/icons/*.svg` - Tray icon states
|
||||
72→
|
||||
73→### Modified Files
|
||||
74→- `agent/Cargo.toml` - Version 0.4.0, Windows IPC features
|
||||
75→- `agent/src/main.rs` - IPC server integration, AppState fields
|
||||
76→- `agent/src/service.rs` - Added last_checkin, tray_policy to AppState
|
||||
77→- `agent/src/transport/mod.rs` - Added TrayPolicyUpdate to ServerMessage
|
||||
78→- `agent/src/transport/websocket.rs` - Handle TrayPolicyUpdate
|
||||
79→
|
||||
80→---
|
||||
81→
|
||||
82→## Build Server (172.16.3.30)
|
||||
83→
|
||||
84→- **SSH:** `guru@172.16.3.30` or `root@172.16.3.30`
|
||||
85→- **Rust:** Installed via rustup
|
||||
86→- **Note:** Requires sudo for apt (password needed)
|
||||
87→- **Linux binary:** `~/gururmm/agent/target/release/gururmm-agent`
|
||||
88→
|
||||
89→### Cross-Compile from Mac
|
||||
90→```bash
|
||||
91→# Windows agent
|
||||
92→cd agent && cargo build --release --target x86_64-pc-windows-gnu
|
||||
93→
|
||||
94→# Windows tray
|
||||
95→cd tray && cargo build --release --target x86_64-pc-windows-gnu
|
||||
96→```
|
||||
97→
|
||||
98→---
|
||||
99→
|
||||
100→## Pending Tasks
|
||||
101→
|
||||
102→1. **Deploy Windows binaries** to downloads server
|
||||
103→2. **Implement tray launcher** in agent (auto-launch in user sessions)
|
||||
104→3. **Add TrayPolicy to server** data model and site settings API
|
||||
105→4. **Dashboard UI** for tray policy management
|
||||
106→5. **Mac/Linux tray support** (Unix domain socket instead of named pipe)
|
||||
107→
|
||||
108→---
|
||||
109→
|
||||
110→## Credentials Reference
|
||||
111→
|
||||
112→### Build Server (172.16.3.30)
|
||||
113→- SSH: guru/root with key
|
||||
114→- PostgreSQL: gururmm / gururmm / 43617ebf7eb242e814ca9988cc4df5ad
|
||||
115→
|
||||
116→### Site Code
|
||||
117→- Main Office: `SWIFT-CLOUD-6910`
|
||||
118→
|
||||
119→### URLs
|
||||
120→- Dashboard: https://rmm-api.azcomputerguru.com/
|
||||
121→- API: https://rmm-api.azcomputerguru.com/api/
|
||||
122→- WebSocket: wss://rmm-api.azcomputerguru.com/ws
|
||||
123→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,2 @@
|
||||
-rwxr-xr-x 2 AzureAD+MikeSwanson 4096 3.5M Dec 20 18:01 /c/Users/MikeSwanson/claude-projects/gururmm/agent/target/release/gururmm-agent.exe*
|
||||
-rwxr-xr-x 2 AzureAD+MikeSwanson 4096 1.3M Dec 20 18:02 /c/Users/MikeSwanson/claude-projects/gururmm/tray/target/release/gururmm-tray.exe*
|
||||
@@ -0,0 +1,4 @@
|
||||
C:\Users\MikeSwanson\claude-projects\.claude\commands\context.md
|
||||
C:\Users\MikeSwanson\claude-projects\.claude\commands\s.md
|
||||
C:\Users\MikeSwanson\claude-projects\.claude\commands\save.md
|
||||
C:\Users\MikeSwanson\claude-projects\.claude\commands\sync.md
|
||||
@@ -0,0 +1,21 @@
|
||||
The file C:\Users\MikeSwanson\claude-projects\gururmm\agent\Cargo.toml has been updated. Here's the result of running `cat -n` on a snippet of the edited file:
|
||||
63→[target.'cfg(windows)'.dependencies]
|
||||
64→# Windows service support (optional, only for native-service feature)
|
||||
65→windows-service = { version = "0.7", optional = true }
|
||||
66→# Windows-specific APIs for service management and IPC (optional for native-service)
|
||||
67→windows = { version = "0.58", optional = true, features = [
|
||||
68→ "Win32_System_Services",
|
||||
69→ "Win32_Foundation",
|
||||
70→ "Win32_Security",
|
||||
71→ "Win32_System_Pipes",
|
||||
72→ "Win32_Storage_FileSystem",
|
||||
73→ "Win32_System_IO",
|
||||
74→ "Win32_System_RemoteDesktop",
|
||||
75→ "Win32_System_Threading",
|
||||
76→ "Win32_System_StationsAndDesktops",
|
||||
77→ "Win32_UI_WindowsAndMessaging",
|
||||
78→] }
|
||||
79→
|
||||
80→[target.'cfg(unix)'.dependencies]
|
||||
81→# Unix signal handling and user detection
|
||||
82→nix = { version = "0.29", features = ["signal", "user"] }
|
||||
@@ -0,0 +1,784 @@
|
||||
1→//! Windows Service implementation for GuruRMM Agent
|
||||
2→//!
|
||||
3→//! This module implements the Windows Service Control Manager (SCM) protocol,
|
||||
4→//! allowing the agent to run as a native Windows service without third-party wrappers.
|
||||
5→
|
||||
6→#[cfg(all(windows, feature = "native-service"))]
|
||||
7→pub mod windows {
|
||||
8→ use std::ffi::OsString;
|
||||
9→ use std::path::PathBuf;
|
||||
10→ use std::sync::mpsc;
|
||||
11→ use std::time::Duration;
|
||||
12→
|
||||
13→ use anyhow::{Context, Result};
|
||||
14→ use tracing::{error, info, warn};
|
||||
15→ use windows_service::{
|
||||
16→ define_windows_service,
|
||||
17→ service::{
|
||||
18→ ServiceAccess, ServiceControl, ServiceControlAccept, ServiceErrorControl,
|
||||
19→ ServiceExitCode, ServiceInfo, ServiceStartType, ServiceState, ServiceStatus,
|
||||
20→ ServiceType,
|
||||
21→ },
|
||||
22→ service_control_handler::{self, ServiceControlHandlerResult},
|
||||
23→ service_dispatcher, service_manager::{ServiceManager, ServiceManagerAccess},
|
||||
24→ };
|
||||
25→
|
||||
26→ pub const SERVICE_NAME: &str = "GuruRMMAgent";
|
||||
27→ pub const SERVICE_DISPLAY_NAME: &str = "GuruRMM Agent";
|
||||
28→ pub const SERVICE_DESCRIPTION: &str =
|
||||
29→ "GuruRMM Agent - Remote Monitoring and Management service";
|
||||
30→ pub const INSTALL_DIR: &str = r"C:\Program Files\GuruRMM";
|
||||
31→ pub const CONFIG_DIR: &str = r"C:\ProgramData\GuruRMM";
|
||||
32→
|
||||
33→ // Generate the Windows service boilerplate
|
||||
34→ define_windows_service!(ffi_service_main, service_main);
|
||||
35→
|
||||
36→ /// Entry point called by the Windows Service Control Manager
|
||||
37→ pub fn run_as_service() -> Result<()> {
|
||||
38→ // This function is called when Windows starts the service.
|
||||
39→ // It blocks until the service is stopped.
|
||||
40→ service_dispatcher::start(SERVICE_NAME, ffi_service_main)
|
||||
41→ .context("Failed to start service dispatcher")?;
|
||||
42→ Ok(())
|
||||
43→ }
|
||||
44→
|
||||
45→ /// Main service function called by the SCM
|
||||
46→ fn service_main(arguments: Vec<OsString>) {
|
||||
47→ if let Err(e) = run_service(arguments) {
|
||||
48→ error!("Service error: {}", e);
|
||||
49→ }
|
||||
50→ }
|
||||
51→
|
||||
52→ /// The actual service implementation
|
||||
53→ fn run_service(_arguments: Vec<OsString>) -> Result<()> {
|
||||
54→ // Create a channel to receive stop events
|
||||
55→ let (shutdown_tx, shutdown_rx) = mpsc::channel();
|
||||
56→
|
||||
57→ // Create the service control handler
|
||||
58→ let event_handler = move |control_event| -> ServiceControlHandlerResult {
|
||||
59→ match control_event {
|
||||
60→ ServiceControl::Stop => {
|
||||
61→ info!("Received stop command from SCM");
|
||||
62→ let _ = shutdown_tx.send(());
|
||||
63→ ServiceControlHandlerResult::NoError
|
||||
64→ }
|
||||
65→ ServiceControl::Interrogate => ServiceControlHandlerResult::NoError,
|
||||
66→ ServiceControl::Shutdown => {
|
||||
67→ info!("Received shutdown command from SCM");
|
||||
68→ let _ = shutdown_tx.send(());
|
||||
69→ ServiceControlHandlerResult::NoError
|
||||
70→ }
|
||||
71→ _ => ServiceControlHandlerResult::NotImplemented,
|
||||
72→ }
|
||||
73→ };
|
||||
74→
|
||||
75→ // Register the service control handler
|
||||
76→ let status_handle = service_control_handler::register(SERVICE_NAME, event_handler)
|
||||
77→ .context("Failed to register service control handler")?;
|
||||
78→
|
||||
79→ // Report that we're starting
|
||||
80→ status_handle
|
||||
81→ .set_service_status(ServiceStatus {
|
||||
82→ service_type: ServiceType::OWN_PROCESS,
|
||||
83→ current_state: ServiceState::StartPending,
|
||||
84→ controls_accepted: ServiceControlAccept::empty(),
|
||||
85→ exit_code: ServiceExitCode::Win32(0),
|
||||
86→ checkpoint: 0,
|
||||
87→ wait_hint: Duration::from_secs(10),
|
||||
88→ process_id: None,
|
||||
89→ })
|
||||
90→ .context("Failed to set StartPending status")?;
|
||||
91→
|
||||
92→ // Determine config path
|
||||
93→ let config_path = PathBuf::from(format!(r"{}\\agent.toml", CONFIG_DIR));
|
||||
94→
|
||||
95→ // Create the tokio runtime for the agent
|
||||
96→ let runtime = tokio::runtime::Runtime::new().context("Failed to create tokio runtime")?;
|
||||
97→
|
||||
98→ // Start the agent in the runtime
|
||||
99→ let agent_result = runtime.block_on(async {
|
||||
100→ // Load configuration
|
||||
101→ let config = match crate::config::AgentConfig::load(&config_path) {
|
||||
102→ Ok(c) => c,
|
||||
103→ Err(e) => {
|
||||
104→ error!("Failed to load config from {:?}: {}", config_path, e);
|
||||
105→ return Err(anyhow::anyhow!("Config load failed: {}", e));
|
||||
106→ }
|
||||
107→ };
|
||||
108→
|
||||
109→ info!("GuruRMM Agent service starting...");
|
||||
110→ info!("Config loaded from {:?}", config_path);
|
||||
111→ info!("Server URL: {}", config.server.url);
|
||||
112→
|
||||
113→ // Initialize metrics collector
|
||||
114→ let metrics_collector = crate::metrics::MetricsCollector::new();
|
||||
115→ info!("Metrics collector initialized");
|
||||
116→
|
||||
117→ // Create shared state
|
||||
118→ let state = std::sync::Arc::new(crate::AppState {
|
||||
119→ config: config.clone(),
|
||||
120→ metrics_collector,
|
||||
121→ connected: tokio::sync::RwLock::new(false),
|
||||
122→ last_checkin: tokio::sync::RwLock::new(None),
|
||||
123→ tray_policy: tokio::sync::RwLock::new(crate::ipc::TrayPolicy::default_permissive()),
|
||||
124→ });
|
||||
125→
|
||||
126→ // Report that we're running
|
||||
127→ status_handle
|
||||
128→ .set_service_status(ServiceStatus {
|
||||
129→ service_type: ServiceType::OWN_PROCESS,
|
||||
130→ current_state: ServiceState::Running,
|
||||
131→ controls_accepted: ServiceControlAccept::STOP | ServiceControlAccept::SHUTDOWN,
|
||||
132→ exit_code: ServiceExitCode::Win32(0),
|
||||
133→ checkpoint: 0,
|
||||
134→ wait_hint: Duration::default(),
|
||||
135→ process_id: None,
|
||||
136→ })
|
||||
137→ .context("Failed to set Running status")?;
|
||||
138→
|
||||
139→ // Start WebSocket client task
|
||||
140→ let ws_state = std::sync::Arc::clone(&state);
|
||||
141→ let ws_handle = tokio::spawn(async move {
|
||||
142→ loop {
|
||||
143→ info!("Connecting to server...");
|
||||
144→ match crate::transport::WebSocketClient::connect_and_run(std::sync::Arc::clone(
|
||||
145→ &ws_state,
|
||||
146→ ))
|
||||
147→ .await
|
||||
148→ {
|
||||
149→ Ok(_) => {
|
||||
150→ warn!("WebSocket connection closed normally, reconnecting...");
|
||||
151→ }
|
||||
152→ Err(e) => {
|
||||
153→ error!("WebSocket error: {}, reconnecting in 10 seconds...", e);
|
||||
154→ }
|
||||
155→ }
|
||||
156→ *ws_state.connected.write().await = false;
|
||||
157→ tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
|
||||
158→ }
|
||||
159→ });
|
||||
160→
|
||||
161→ // Start metrics collection task
|
||||
162→ let metrics_state = std::sync::Arc::clone(&state);
|
||||
163→ let metrics_handle = tokio::spawn(async move {
|
||||
164→ let interval = metrics_state.config.metrics.interval_seconds;
|
||||
165→ let mut interval_timer =
|
||||
166→ tokio::time::interval(tokio::time::Duration::from_secs(interval));
|
||||
167→
|
||||
168→ loop {
|
||||
169→ interval_timer.tick().await;
|
||||
170→ let metrics = metrics_state.metrics_collector.collect().await;
|
||||
171→ if *metrics_state.connected.read().await {
|
||||
172→ info!(
|
||||
173→ "Metrics: CPU={:.1}%, Mem={:.1}%, Disk={:.1}%",
|
||||
174→ metrics.cpu_percent, metrics.memory_percent, metrics.disk_percent
|
||||
175→ );
|
||||
176→ }
|
||||
177→ }
|
||||
178→ });
|
||||
179→
|
||||
180→ // Wait for shutdown signal from SCM
|
||||
181→ // We use a separate task to poll the channel since it's not async
|
||||
182→ let shutdown_handle = tokio::spawn(async move {
|
||||
183→ loop {
|
||||
184→ match shutdown_rx.try_recv() {
|
||||
185→ Ok(_) => {
|
||||
186→ info!("Shutdown signal received");
|
||||
187→ break;
|
||||
188→ }
|
||||
189→ Err(mpsc::TryRecvError::Empty) => {
|
||||
190→ tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
|
||||
191→ }
|
||||
192→ Err(mpsc::TryRecvError::Disconnected) => {
|
||||
193→ warn!("Shutdown channel disconnected");
|
||||
194→ break;
|
||||
195→ }
|
||||
196→ }
|
||||
197→ }
|
||||
198→ });
|
||||
199→
|
||||
200→ // Wait for shutdown
|
||||
201→ tokio::select! {
|
||||
202→ _ = shutdown_handle => {
|
||||
203→ info!("Service shutting down gracefully");
|
||||
204→ }
|
||||
205→ _ = ws_handle => {
|
||||
206→ error!("WebSocket task ended unexpectedly");
|
||||
207→ }
|
||||
208→ _ = metrics_handle => {
|
||||
209→ error!("Metrics task ended unexpectedly");
|
||||
210→ }
|
||||
211→ }
|
||||
212→
|
||||
213→ Ok::<(), anyhow::Error>(())
|
||||
214→ });
|
||||
215→
|
||||
216→ // Report that we're stopping
|
||||
217→ status_handle
|
||||
218→ .set_service_status(ServiceStatus {
|
||||
219→ service_type: ServiceType::OWN_PROCESS,
|
||||
220→ current_state: ServiceState::StopPending,
|
||||
221→ controls_accepted: ServiceControlAccept::empty(),
|
||||
222→ exit_code: ServiceExitCode::Win32(0),
|
||||
223→ checkpoint: 0,
|
||||
224→ wait_hint: Duration::from_secs(5),
|
||||
225→ process_id: None,
|
||||
226→ })
|
||||
227→ .ok();
|
||||
228→
|
||||
229→ // Report that we've stopped
|
||||
230→ status_handle
|
||||
231→ .set_service_status(ServiceStatus {
|
||||
232→ service_type: ServiceType::OWN_PROCESS,
|
||||
233→ current_state: ServiceState::Stopped,
|
||||
234→ controls_accepted: ServiceControlAccept::empty(),
|
||||
235→ exit_code: match &agent_result {
|
||||
236→ Ok(_) => ServiceExitCode::Win32(0),
|
||||
237→ Err(_) => ServiceExitCode::Win32(1),
|
||||
238→ },
|
||||
239→ checkpoint: 0,
|
||||
240→ wait_hint: Duration::default(),
|
||||
241→ process_id: None,
|
||||
242→ })
|
||||
243→ .ok();
|
||||
244→
|
||||
245→ agent_result
|
||||
246→ }
|
||||
247→
|
||||
248→ /// Known legacy service names to check and remove
|
||||
249→ const LEGACY_SERVICE_NAMES: &[&str] = &[
|
||||
250→ "GuruRMM-Agent", // NSSM-based service name
|
||||
251→ "gururmm-agent", // Alternative casing
|
||||
252→ ];
|
||||
253→
|
||||
254→ /// Detect and remove legacy service installations (e.g., NSSM-based)
|
||||
255→ fn cleanup_legacy_services() -> Result<()> {
|
||||
256→ let manager = match ServiceManager::local_computer(
|
||||
257→ None::<&str>,
|
||||
258→ ServiceManagerAccess::CONNECT,
|
||||
259→ ) {
|
||||
260→ Ok(m) => m,
|
||||
261→ Err(_) => return Ok(()), // Can't connect, skip legacy cleanup
|
||||
262→ };
|
||||
263→
|
||||
264→ for legacy_name in LEGACY_SERVICE_NAMES {
|
||||
265→ if let Ok(service) = manager.open_service(
|
||||
266→ *legacy_name,
|
||||
267→ ServiceAccess::QUERY_STATUS | ServiceAccess::STOP | ServiceAccess::DELETE,
|
||||
268→ ) {
|
||||
269→ info!("Found legacy service '{}', removing...", legacy_name);
|
||||
270→
|
||||
271→ // Stop if running
|
||||
272→ if let Ok(status) = service.query_status() {
|
||||
273→ if status.current_state != ServiceState::Stopped {
|
||||
274→ info!("Stopping legacy service...");
|
||||
275→ let _ = service.stop();
|
||||
276→ std::thread::sleep(Duration::from_secs(3));
|
||||
277→ }
|
||||
278→ }
|
||||
279→
|
||||
280→ // Delete the service
|
||||
281→ match service.delete() {
|
||||
282→ Ok(_) => {
|
||||
283→ println!("** Removed legacy service: {}", legacy_name);
|
||||
284→ }
|
||||
285→ Err(e) => {
|
||||
286→ warn!("Failed to delete legacy service '{}': {}", legacy_name, e);
|
||||
287→ }
|
||||
288→ }
|
||||
289→ }
|
||||
290→ }
|
||||
291→
|
||||
292→ // Also check for NSSM in registry/service config
|
||||
293→ // NSSM services have specific registry keys under HKLM\SYSTEM\CurrentControlSet\Services\{name}\Parameters
|
||||
294→ for legacy_name in LEGACY_SERVICE_NAMES {
|
||||
295→ let params_key = format!(
|
||||
296→ r"SYSTEM\CurrentControlSet\Services\{}\Parameters",
|
||||
297→ legacy_name
|
||||
298→ );
|
||||
299→ // If this key exists, it was likely an NSSM service
|
||||
300→ if let Ok(output) = std::process::Command::new("reg")
|
||||
301→ .args(["query", &format!(r"HKLM\{}", params_key)])
|
||||
302→ .output()
|
||||
303→ {
|
||||
304→ if output.status.success() {
|
||||
305→ info!("Found NSSM registry keys for '{}', cleaning up...", legacy_name);
|
||||
306→ let _ = std::process::Command::new("reg")
|
||||
307→ .args(["delete", &format!(r"HKLM\{}", params_key), "/f"])
|
||||
308→ .output();
|
||||
309→ }
|
||||
310→ }
|
||||
311→ }
|
||||
312→
|
||||
313→ Ok(())
|
||||
314→ }
|
||||
315→
|
||||
316→ /// Install the agent as a Windows service using native APIs
|
||||
317→ pub fn install(
|
||||
318→ server_url: Option<String>,
|
||||
319→ api_key: Option<String>,
|
||||
320→ skip_legacy_check: bool,
|
||||
321→ ) -> Result<()> {
|
||||
322→ info!("Installing GuruRMM Agent as Windows service...");
|
||||
323→
|
||||
324→ // Clean up legacy installations unless skipped
|
||||
325→ if !skip_legacy_check {
|
||||
326→ info!("Checking for legacy service installations...");
|
||||
327→ if let Err(e) = cleanup_legacy_services() {
|
||||
328→ warn!("Legacy cleanup warning: {}", e);
|
||||
329→ }
|
||||
330→ }
|
||||
331→
|
||||
332→ // Get the current executable path
|
||||
333→ let current_exe =
|
||||
334→ std::env::current_exe().context("Failed to get current executable path")?;
|
||||
335→
|
||||
336→ let binary_dest = PathBuf::from(format!(r"{}\\gururmm-agent.exe", INSTALL_DIR));
|
||||
337→ let config_dest = PathBuf::from(format!(r"{}\\agent.toml", CONFIG_DIR));
|
||||
338→
|
||||
339→ // Create directories
|
||||
340→ info!("Creating directories...");
|
||||
341→ std::fs::create_dir_all(INSTALL_DIR).context("Failed to create install directory")?;
|
||||
342→ std::fs::create_dir_all(CONFIG_DIR).context("Failed to create config directory")?;
|
||||
343→
|
||||
344→ // Copy binary
|
||||
345→ info!("Copying binary to: {:?}", binary_dest);
|
||||
346→ std::fs::copy(¤t_exe, &binary_dest).context("Failed to copy binary")?;
|
||||
347→
|
||||
348→ // Handle configuration
|
||||
349→ let config_needs_manual_edit;
|
||||
350→ if !config_dest.exists() {
|
||||
351→ info!("Creating config: {:?}", config_dest);
|
||||
352→
|
||||
353→ // Start with sample config
|
||||
354→ let mut config = crate::config::AgentConfig::sample();
|
||||
355→
|
||||
356→ // Apply provided values
|
||||
357→ if let Some(url) = &server_url {
|
||||
358→ config.server.url = url.clone();
|
||||
359→ }
|
||||
360→ if let Some(key) = &api_key {
|
||||
361→ config.server.api_key = key.clone();
|
||||
362→ }
|
||||
363→
|
||||
364→ let toml_str = toml::to_string_pretty(&config)?;
|
||||
365→ std::fs::write(&config_dest, toml_str).context("Failed to write config file")?;
|
||||
366→
|
||||
367→ config_needs_manual_edit = server_url.is_none() || api_key.is_none();
|
||||
368→ } else {
|
||||
369→ info!("Config already exists: {:?}", config_dest);
|
||||
370→ config_needs_manual_edit = false;
|
||||
371→
|
||||
372→ // If server_url or api_key provided, update existing config
|
||||
373→ if server_url.is_some() || api_key.is_some() {
|
||||
374→ info!("Updating existing configuration...");
|
||||
375→ let config_content = std::fs::read_to_string(&config_dest)?;
|
||||
376→ let mut config: crate::config::AgentConfig = toml::from_str(&config_content)
|
||||
377→ .context("Failed to parse existing config")?;
|
||||
378→
|
||||
379→ if let Some(url) = &server_url {
|
||||
380→ config.server.url = url.clone();
|
||||
381→ }
|
||||
382→ if let Some(key) = &api_key {
|
||||
383→ config.server.api_key = key.clone();
|
||||
384→ }
|
||||
385→
|
||||
386→ let toml_str = toml::to_string_pretty(&config)?;
|
||||
387→ std::fs::write(&config_dest, toml_str)
|
||||
388→ .context("Failed to update config file")?;
|
||||
389→ }
|
||||
390→ }
|
||||
391→
|
||||
392→ // Open the service manager
|
||||
393→ let manager = ServiceManager::local_computer(
|
||||
394→ None::<&str>,
|
||||
395→ ServiceManagerAccess::CONNECT | ServiceManagerAccess::CREATE_SERVICE,
|
||||
396→ )
|
||||
397→ .context("Failed to connect to Service Control Manager. Run as Administrator.")?;
|
||||
398→
|
||||
399→ // Check if service already exists
|
||||
400→ if let Ok(service) = manager.open_service(
|
||||
401→ SERVICE_NAME,
|
||||
402→ ServiceAccess::QUERY_STATUS | ServiceAccess::DELETE | ServiceAccess::STOP,
|
||||
403→ ) {
|
||||
404→ info!("Removing existing service...");
|
||||
405→
|
||||
406→ // Stop the service if running
|
||||
407→ if let Ok(status) = service.query_status() {
|
||||
408→ if status.current_state != ServiceState::Stopped {
|
||||
409→ let _ = service.stop();
|
||||
410→ std::thread::sleep(Duration::from_secs(2));
|
||||
411→ }
|
||||
412→ }
|
||||
413→
|
||||
414→ // Delete the service
|
||||
415→ service.delete().context("Failed to delete existing service")?;
|
||||
416→ drop(service);
|
||||
417→
|
||||
418→ // Wait for deletion to complete
|
||||
419→ std::thread::sleep(Duration::from_secs(2));
|
||||
420→ }
|
||||
421→
|
||||
422→ // Create the service
|
||||
423→ // The service binary is called with "service" subcommand when started by SCM
|
||||
424→ let service_binary_path = format!(r#""{}" service"#, binary_dest.display());
|
||||
425→
|
||||
426→ info!("Creating service with path: {}", service_binary_path);
|
||||
427→
|
||||
428→ let service_info = ServiceInfo {
|
||||
429→ name: OsString::from(SERVICE_NAME),
|
||||
430→ display_name: OsString::from(SERVICE_DISPLAY_NAME),
|
||||
431→ service_type: ServiceType::OWN_PROCESS,
|
||||
432→ start_type: ServiceStartType::AutoStart,
|
||||
433→ error_control: ServiceErrorControl::Normal,
|
||||
434→ executable_path: binary_dest.clone(),
|
||||
435→ launch_arguments: vec![OsString::from("service")],
|
||||
436→ dependencies: vec![],
|
||||
437→ account_name: None, // LocalSystem
|
||||
438→ account_password: None,
|
||||
439→ };
|
||||
440→
|
||||
441→ let service = manager
|
||||
442→ .create_service(&service_info, ServiceAccess::CHANGE_CONFIG | ServiceAccess::START)
|
||||
443→ .context("Failed to create service")?;
|
||||
444→
|
||||
445→ // Set description
|
||||
446→ service
|
||||
447→ .set_description(SERVICE_DESCRIPTION)
|
||||
448→ .context("Failed to set service description")?;
|
||||
449→
|
||||
450→ // Configure recovery options using sc.exe (windows-service crate doesn't support this directly)
|
||||
451→ info!("Configuring recovery options...");
|
||||
452→ let _ = std::process::Command::new("sc")
|
||||
453→ .args([
|
||||
454→ "failure",
|
||||
455→ SERVICE_NAME,
|
||||
456→ "reset=86400",
|
||||
457→ "actions=restart/60000/restart/60000/restart/60000",
|
||||
458→ ])
|
||||
459→ .output();
|
||||
460→
|
||||
461→ println!("\n** GuruRMM Agent installed successfully!");
|
||||
462→ println!("\nInstalled files:");
|
||||
463→ println!(" Binary: {:?}", binary_dest);
|
||||
464→ println!(" Config: {:?}", config_dest);
|
||||
465→
|
||||
466→ if config_needs_manual_edit {
|
||||
467→ println!("\n** IMPORTANT: Edit {:?} with your server URL and API key!", config_dest);
|
||||
468→ println!("\nNext steps:");
|
||||
469→ println!(" 1. Edit {:?} with your server URL and API key", config_dest);
|
||||
470→ println!(" 2. Start the service:");
|
||||
471→ println!(" gururmm-agent start");
|
||||
472→ println!(" Or: sc start {}", SERVICE_NAME);
|
||||
473→ } else {
|
||||
474→ println!("\nStarting service...");
|
||||
475→ if let Err(e) = start() {
|
||||
476→ println!("** Failed to start service: {}. Start manually with:", e);
|
||||
477→ println!(" gururmm-agent start");
|
||||
478→ } else {
|
||||
479→ println!("** Service started successfully!");
|
||||
480→ }
|
||||
481→ }
|
||||
482→
|
||||
483→ println!("\nUseful commands:");
|
||||
484→ println!(" Status: gururmm-agent status");
|
||||
485→ println!(" Stop: gururmm-agent stop");
|
||||
486→ println!(" Start: gururmm-agent start");
|
||||
487→
|
||||
488→ Ok(())
|
||||
489→ }
|
||||
490→
|
||||
491→ /// Uninstall the Windows service
|
||||
492→ pub fn uninstall() -> Result<()> {
|
||||
493→ info!("Uninstalling GuruRMM Agent...");
|
||||
494→
|
||||
495→ let binary_path = PathBuf::from(format!(r"{}\\gururmm-agent.exe", INSTALL_DIR));
|
||||
496→
|
||||
497→ // Open the service manager
|
||||
498→ let manager = ServiceManager::local_computer(
|
||||
499→ None::<&str>,
|
||||
500→ ServiceManagerAccess::CONNECT,
|
||||
501→ )
|
||||
502→ .context("Failed to connect to Service Control Manager. Run as Administrator.")?;
|
||||
503→
|
||||
504→ // Open the service
|
||||
505→ match manager.open_service(
|
||||
506→ SERVICE_NAME,
|
||||
507→ ServiceAccess::QUERY_STATUS | ServiceAccess::STOP | ServiceAccess::DELETE,
|
||||
508→ ) {
|
||||
509→ Ok(service) => {
|
||||
510→ // Stop if running
|
||||
511→ if let Ok(status) = service.query_status() {
|
||||
512→ if status.current_state != ServiceState::Stopped {
|
||||
513→ info!("Stopping service...");
|
||||
514→ let _ = service.stop();
|
||||
515→ std::thread::sleep(Duration::from_secs(3));
|
||||
516→ }
|
||||
517→ }
|
||||
518→
|
||||
519→ // Delete the service
|
||||
520→ info!("Deleting service...");
|
||||
521→ service.delete().context("Failed to delete service")?;
|
||||
522→ }
|
||||
523→ Err(_) => {
|
||||
524→ warn!("Service was not installed");
|
||||
525→ }
|
||||
526→ }
|
||||
527→
|
||||
528→ // Remove binary
|
||||
529→ if binary_path.exists() {
|
||||
530→ info!("Removing binary: {:?}", binary_path);
|
||||
531→ // Wait a bit for service to fully stop
|
||||
532→ std::thread::sleep(Duration::from_secs(1));
|
||||
533→ if let Err(e) = std::fs::remove_file(&binary_path) {
|
||||
534→ warn!("Failed to remove binary (may be in use): {}", e);
|
||||
535→ }
|
||||
536→ }
|
||||
537→
|
||||
538→ // Remove install directory if empty
|
||||
539→ let _ = std::fs::remove_dir(INSTALL_DIR);
|
||||
540→
|
||||
541→ println!("\n** GuruRMM Agent uninstalled successfully!");
|
||||
542→ println!(
|
||||
543→ "\nNote: Config directory {:?} was preserved.",
|
||||
544→ CONFIG_DIR
|
||||
545→ );
|
||||
546→ println!("Remove it manually if no longer needed.");
|
||||
547→
|
||||
548→ Ok(())
|
||||
549→ }
|
||||
550→
|
||||
551→ /// Start the installed service
|
||||
552→ pub fn start() -> Result<()> {
|
||||
553→ info!("Starting GuruRMM Agent service...");
|
||||
554→
|
||||
555→ let manager = ServiceManager::local_computer(
|
||||
556→ None::<&str>,
|
||||
557→ ServiceManagerAccess::CONNECT,
|
||||
558→ )
|
||||
559→ .context("Failed to connect to Service Control Manager")?;
|
||||
560→
|
||||
561→ let service = manager
|
||||
562→ .open_service(SERVICE_NAME, ServiceAccess::START | ServiceAccess::QUERY_STATUS)
|
||||
563→ .context("Failed to open service. Is it installed?")?;
|
||||
564→
|
||||
565→ service
|
||||
566→ .start::<String>(&[])
|
||||
567→ .context("Failed to start service")?;
|
||||
568→
|
||||
569→ // Wait briefly and check status
|
||||
570→ std::thread::sleep(Duration::from_secs(2));
|
||||
571→
|
||||
572→ let status = service.query_status()?;
|
||||
573→ match status.current_state {
|
||||
574→ ServiceState::Running => {
|
||||
575→ println!("** Service started successfully");
|
||||
576→ println!("Check status: gururmm-agent status");
|
||||
577→ }
|
||||
578→ ServiceState::StartPending => {
|
||||
579→ println!("** Service is starting...");
|
||||
580→ println!("Check status: gururmm-agent status");
|
||||
581→ }
|
||||
582→ other => {
|
||||
583→ println!("Service state: {:?}", other);
|
||||
584→ }
|
||||
585→ }
|
||||
586→
|
||||
587→ Ok(())
|
||||
588→ }
|
||||
589→
|
||||
590→ /// Stop the installed service
|
||||
591→ pub fn stop() -> Result<()> {
|
||||
592→ info!("Stopping GuruRMM Agent service...");
|
||||
593→
|
||||
594→ let manager = ServiceManager::local_computer(
|
||||
595→ None::<&str>,
|
||||
596→ ServiceManagerAccess::CONNECT,
|
||||
597→ )
|
||||
598→ .context("Failed to connect to Service Control Manager")?;
|
||||
599→
|
||||
600→ let service = manager
|
||||
601→ .open_service(SERVICE_NAME, ServiceAccess::STOP | ServiceAccess::QUERY_STATUS)
|
||||
602→ .context("Failed to open service. Is it installed?")?;
|
||||
603→
|
||||
604→ service.stop().context("Failed to stop service")?;
|
||||
605→
|
||||
606→ // Wait and verify
|
||||
607→ std::thread::sleep(Duration::from_secs(2));
|
||||
608→
|
||||
609→ let status = service.query_status()?;
|
||||
610→ match status.current_state {
|
||||
611→ ServiceState::Stopped => {
|
||||
612→ println!("** Service stopped successfully");
|
||||
613→ }
|
||||
614→ ServiceState::StopPending => {
|
||||
615→ println!("** Service is stopping...");
|
||||
616→ }
|
||||
617→ other => {
|
||||
618→ println!("Service state: {:?}", other);
|
||||
619→ }
|
||||
620→ }
|
||||
621→
|
||||
622→ Ok(())
|
||||
623→ }
|
||||
624→
|
||||
625→ /// Query service status
|
||||
626→ pub fn status() -> Result<()> {
|
||||
627→ let manager = ServiceManager::local_computer(
|
||||
628→ None::<&str>,
|
||||
629→ ServiceManagerAccess::CONNECT,
|
||||
630→ )
|
||||
631→ .context("Failed to connect to Service Control Manager")?;
|
||||
632→
|
||||
633→ match manager.open_service(SERVICE_NAME, ServiceAccess::QUERY_STATUS) {
|
||||
634→ Ok(service) => {
|
||||
635→ let status = service.query_status()?;
|
||||
636→ println!("GuruRMM Agent Service Status");
|
||||
637→ println!("============================");
|
||||
638→ println!("Service Name: {}", SERVICE_NAME);
|
||||
639→ println!("Display Name: {}", SERVICE_DISPLAY_NAME);
|
||||
640→ println!("State: {:?}", status.current_state);
|
||||
641→ println!(
|
||||
642→ "Binary: {}\\gururmm-agent.exe",
|
||||
643→ INSTALL_DIR
|
||||
644→ );
|
||||
645→ println!("Config: {}\\agent.toml", CONFIG_DIR);
|
||||
646→ }
|
||||
647→ Err(_) => {
|
||||
648→ println!("GuruRMM Agent Service Status");
|
||||
649→ println!("============================");
|
||||
650→ println!("Status: NOT INSTALLED");
|
||||
651→ println!("\nTo install: gururmm-agent install");
|
||||
652→ }
|
||||
653→ }
|
||||
654→
|
||||
655→ Ok(())
|
||||
656→ }
|
||||
657→}
|
||||
658→
|
||||
659→/// Legacy Windows stub module (when native-service is not enabled)
|
||||
660→/// For legacy Windows (7, Server 2008 R2), use NSSM for service wrapper
|
||||
661→#[cfg(all(windows, not(feature = "native-service")))]
|
||||
662→pub mod windows {
|
||||
663→ use anyhow::{Result, bail};
|
||||
664→
|
||||
665→ pub const SERVICE_NAME: &str = "GuruRMMAgent";
|
||||
666→ pub const SERVICE_DISPLAY_NAME: &str = "GuruRMM Agent";
|
||||
667→ pub const SERVICE_DESCRIPTION: &str =
|
||||
668→ "GuruRMM Agent - Remote Monitoring and Management service";
|
||||
669→ pub const INSTALL_DIR: &str = r"C:\Program Files\GuruRMM";
|
||||
670→ pub const CONFIG_DIR: &str = r"C:\ProgramData\GuruRMM";
|
||||
671→
|
||||
672→ /// Legacy build doesn't support native service mode
|
||||
673→ pub fn run_as_service() -> Result<()> {
|
||||
674→ bail!("Native Windows service mode not available in legacy build. Use 'run' command with NSSM wrapper instead.")
|
||||
675→ }
|
||||
676→
|
||||
677→ /// Legacy install just copies binary and config, prints NSSM instructions
|
||||
678→ pub fn install(
|
||||
679→ server_url: Option<String>,
|
||||
680→ api_key: Option<String>,
|
||||
681→ _skip_legacy_check: bool,
|
||||
682→ ) -> Result<()> {
|
||||
683→ use std::path::PathBuf;
|
||||
684→ use tracing::info;
|
||||
685→
|
||||
686→ info!("Installing GuruRMM Agent (legacy mode)...");
|
||||
687→
|
||||
688→ // Get the current executable path
|
||||
689→ let current_exe = std::env::current_exe()?;
|
||||
690→ let binary_dest = PathBuf::from(format!(r"{}\\gururmm-agent.exe", INSTALL_DIR));
|
||||
691→ let config_dest = PathBuf::from(format!(r"{}\\agent.toml", CONFIG_DIR));
|
||||
692→
|
||||
693→ // Create directories
|
||||
694→ std::fs::create_dir_all(INSTALL_DIR)?;
|
||||
695→ std::fs::create_dir_all(CONFIG_DIR)?;
|
||||
696→
|
||||
697→ // Copy binary
|
||||
698→ info!("Copying binary to: {:?}", binary_dest);
|
||||
699→ std::fs::copy(¤t_exe, &binary_dest)?;
|
||||
700→
|
||||
701→ // Create config if needed
|
||||
702→ if !config_dest.exists() {
|
||||
703→ let mut config = crate::config::AgentConfig::sample();
|
||||
704→ if let Some(url) = &server_url {
|
||||
705→ config.server.url = url.clone();
|
||||
706→ }
|
||||
707→ if let Some(key) = &api_key {
|
||||
708→ config.server.api_key = key.clone();
|
||||
709→ }
|
||||
710→ let toml_str = toml::to_string_pretty(&config)?;
|
||||
711→ std::fs::write(&config_dest, toml_str)?;
|
||||
712→ }
|
||||
713→
|
||||
714→ println!("\n** GuruRMM Agent installed (legacy mode)!");
|
||||
715→ println!("\nInstalled files:");
|
||||
716→ println!(" Binary: {:?}", binary_dest);
|
||||
717→ println!(" Config: {:?}", config_dest);
|
||||
718→ println!("\n** IMPORTANT: This is a legacy build for Windows 7/Server 2008 R2");
|
||||
719→ println!(" Use NSSM to install as a service:");
|
||||
720→ println!();
|
||||
721→ println!(" nssm install {} {:?} run --config {:?}", SERVICE_NAME, binary_dest, config_dest);
|
||||
722→ println!(" nssm start {}", SERVICE_NAME);
|
||||
723→ println!();
|
||||
724→ println!(" Download NSSM from: https://nssm.cc/download");
|
||||
725→
|
||||
726→ Ok(())
|
||||
727→ }
|
||||
728→
|
||||
729→ pub fn uninstall() -> Result<()> {
|
||||
730→ use std::path::PathBuf;
|
||||
731→
|
||||
732→ let binary_path = PathBuf::from(format!(r"{}\\gururmm-agent.exe", INSTALL_DIR));
|
||||
733→
|
||||
734→ println!("** To uninstall legacy service, use NSSM:");
|
||||
735→ println!(" nssm stop {}", SERVICE_NAME);
|
||||
736→ println!(" nssm remove {} confirm", SERVICE_NAME);
|
||||
737→ println!();
|
||||
738→
|
||||
739→ if binary_path.exists() {
|
||||
740→ std::fs::remove_file(&binary_path)?;
|
||||
741→ println!("** Binary removed: {:?}", binary_path);
|
||||
742→ }
|
||||
743→
|
||||
744→ let _ = std::fs::remove_dir(INSTALL_DIR);
|
||||
745→ println!("\n** GuruRMM Agent uninstalled (legacy mode)!");
|
||||
746→ println!("Note: Config directory {} was preserved.", CONFIG_DIR);
|
||||
747→
|
||||
748→ Ok(())
|
||||
749→ }
|
||||
750→
|
||||
751→ pub fn start() -> Result<()> {
|
||||
752→ println!("** Legacy build: Use NSSM or sc.exe to start the service:");
|
||||
753→ println!(" nssm start {}", SERVICE_NAME);
|
||||
754→ println!(" -- OR --");
|
||||
755→ println!(" sc start {}", SERVICE_NAME);
|
||||
756→ Ok(())
|
||||
757→ }
|
||||
758→
|
||||
759→ pub fn stop() -> Result<()> {
|
||||
760→ println!("** Legacy build: Use NSSM or sc.exe to stop the service:");
|
||||
761→ println!(" nssm stop {}", SERVICE_NAME);
|
||||
762→ println!(" -- OR --");
|
||||
763→ println!(" sc stop {}", SERVICE_NAME);
|
||||
764→ Ok(())
|
||||
765→ }
|
||||
766→
|
||||
767→ pub fn status() -> Result<()> {
|
||||
768→ println!("GuruRMM Agent Service Status (Legacy Build)");
|
||||
769→ println!("==========================================");
|
||||
770→ println!("Service Name: {}", SERVICE_NAME);
|
||||
771→ println!();
|
||||
772→ println!("** Legacy build: Use sc.exe to query status:");
|
||||
773→ println!(" sc query {}", SERVICE_NAME);
|
||||
774→ println!();
|
||||
775→ println!("Binary: {}\\gururmm-agent.exe", INSTALL_DIR);
|
||||
776→ println!("Config: {}\\agent.toml", CONFIG_DIR);
|
||||
777→ Ok(())
|
||||
778→ }
|
||||
779→}
|
||||
780→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,116 @@
|
||||
1→{
|
||||
2→ "permissions": {
|
||||
3→ "allow": [
|
||||
4→ "Bash(git:*)",
|
||||
5→ "Bash(gh:*)",
|
||||
6→ "Bash(ssh:*)",
|
||||
7→ "Bash(scp:*)",
|
||||
8→ "Bash(rsync:*)",
|
||||
9→ "Bash(wsl:*)",
|
||||
10→ "Bash(wsl.exe:*)",
|
||||
11→ "Bash(cat:*)",
|
||||
12→ "Bash(ls:*)",
|
||||
13→ "Bash(find:*)",
|
||||
14→ "Bash(grep:*)",
|
||||
15→ "Bash(echo:*)",
|
||||
16→ "Bash(chmod:*)",
|
||||
17→ "Bash(chown:*)",
|
||||
18→ "Bash(mkdir:*)",
|
||||
19→ "Bash(rm:*)",
|
||||
20→ "Bash(cp:*)",
|
||||
21→ "Bash(mv:*)",
|
||||
22→ "Bash(curl:*)",
|
||||
23→ "Bash(wget:*)",
|
||||
24→ "Bash(nslookup:*)",
|
||||
25→ "Bash(dig:*)",
|
||||
26→ "Bash(ping:*)",
|
||||
27→ "Bash(python:*)",
|
||||
28→ "Bash(python3:*)",
|
||||
29→ "Bash(node:*)",
|
||||
30→ "Bash(npm:*)",
|
||||
31→ "Bash(npx:*)",
|
||||
32→ "Bash(cargo:*)",
|
||||
33→ "Bash(rustc:*)",
|
||||
34→ "Bash(powershell.exe:*)",
|
||||
35→ "Bash(pwsh:*)",
|
||||
36→ "Bash(which:*)",
|
||||
37→ "Bash(where:*)",
|
||||
38→ "Bash(whoami:*)",
|
||||
39→ "Bash(date:*)",
|
||||
40→ "Bash(head:*)",
|
||||
41→ "Bash(tail:*)",
|
||||
42→ "Bash(less:*)",
|
||||
43→ "Bash(more:*)",
|
||||
44→ "Bash(diff:*)",
|
||||
45→ "Bash(tar:*)",
|
||||
46→ "Bash(unzip:*)",
|
||||
47→ "Bash(zip:*)",
|
||||
48→ "Bash(docker:*)",
|
||||
49→ "Bash(docker-compose:*)",
|
||||
50→ "Bash(systemctl:*)",
|
||||
51→ "Bash(service:*)",
|
||||
52→ "Bash(journalctl:*)",
|
||||
53→ "Bash(apt:*)",
|
||||
54→ "Bash(apt-get:*)",
|
||||
55→ "Bash(brew:*)",
|
||||
56→ "Bash(code:*)",
|
||||
57→ "Bash(make:*)",
|
||||
58→ "Bash(cmake:*)",
|
||||
59→ "WebFetch(domain:*)",
|
||||
60→ "Bash(TOKEN=\"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0OTBlMmQwZi0wNjdkLTQxMzAtOThmZC04M2YwNmVkMGI5MzIiLCJyb2xlIjoiYWRtaW4iLCJleHAiOjE3NjYxOTI1MTcsImlhdCI6MTc2NjEwNjExN30.l5CmWuaeX80CeDYlIG4wRqsZL6VKPWSTm-tVJkxCoH4\")",
|
||||
61→ "Bash(dir:*)",
|
||||
62→ "Bash(rustup target list:*)",
|
||||
63→ "Bash(rustup target add:*)",
|
||||
64→ "Bash(wc:*)",
|
||||
65→ "Bash(\"/c/Program Files \\(x86\\)/Microsoft Visual Studio/Installer/vswhere.exe\" -all -format json)",
|
||||
66→ "Bash(winget:*)",
|
||||
67→ "Bash(choco --version:*)",
|
||||
68→ "Bash(\"/c/Program Files \\(x86\\)/Microsoft Visual Studio/Installer/vswhere.exe\" -all -products \"*\" -format value -property installationPath)",
|
||||
69→ "Skill(s)",
|
||||
70→ "Bash(powershell -Command \"\\(Get-Content service.rs -Raw\\) -replace ''#\\\\[cfg\\\\\\(windows\\\\\\)\\\\]\\\\r?\\\\npub mod windows \\\\{'', ''#[cfg\\(all\\(windows, feature = \"\"native-service\"\"\\)\\)]\npub mod windows {'' | Set-Content service.rs -NoNewline\")",
|
||||
71→ "Bash(powershell -Command \"\\(Get-Content service.rs -Raw\\) -replace ''println!\\\\\\(\"\"Binary: \\\\{\\\\}\\\\gururmm-agent.exe\"\", INSTALL_DIR\\\\\\);'', ''println!\\(\"\"Binary: {}\\\\\\\\gururmm-agent.exe\"\", INSTALL_DIR\\);'' -replace ''println!\\\\\\(\"\"Config: \\\\{\\\\}\\\\agent.toml\"\", CONFIG_DIR\\\\\\);'', ''println!\\(\"\"Config: {}\\\\\\\\agent.toml\"\", CONFIG_DIR\\);'' | Set-Content service.rs -NoNewline\")",
|
||||
72→ "Bash(perl -i -pe:*)",
|
||||
73→ "Bash(xxd:*)",
|
||||
74→ "Bash(timeout:*)",
|
||||
75→ "Bash(C:WindowsSystem32OpenSSHssh.exe root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf\")",
|
||||
76→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf\")",
|
||||
77→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/imunify360.conf 2>/dev/null | head -20\")",
|
||||
78→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat > /var/cpanel/apps/cloudflare_dns.conf << ''EOF''\nname=cloudflare_dns\nservice=whostmgr\nuser=root\nurl=addon_cloudflareDNS.cgi\nacls=all\ndisplayname=Cloudflare DNS Manager\nentryurl=addon_cloudflareDNS.cgi\nicon=icon_cloudflare_dns.svg\ntarget=_self\nsearchtext=cloudflare dns\nEOF\")",
|
||||
79→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf && /usr/local/cpanel/bin/rebuild_whm_chrome\")",
|
||||
80→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/scripts/rebuild_whostmgr_chrome 2>&1 || /scripts/rebuild_whostmgr_chrome 2>&1\")",
|
||||
81→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"ls /usr/local/cpanel/scripts/ | grep -i chrome; ls /usr/local/cpanel/bin/ | grep -i chrome\")",
|
||||
82→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/scripts/rebuild_whm_chrome\")",
|
||||
83→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/cloudflare_dns.conf && echo ''---'' && ls -la /usr/local/cpanel/whostmgr/docroot/cgi/addon_cloudflareDNS.cgi\")",
|
||||
84→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>/dev/null | grep -i cloudflare || echo ''Not in list''\")",
|
||||
85→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/imunify360.conf\")",
|
||||
86→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"ls /var/cpanel/apps/ && cat /var/cpanel/apps/addon_configserver_csf.conf 2>/dev/null | head -20\")",
|
||||
87→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat /var/cpanel/apps/whm-360-monitoring.conf\")",
|
||||
88→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"cat > /var/cpanel/apps/cloudflare_dns.conf << ''EOF''\nname=cloudflare_dns\nservice=whostmgr\nuser=root\nurl=/cgi/addon_cloudflareDNS.cgi\nacls=all\ndisplayname=Cloudflare DNS Manager\nentryurl=addon_cloudflareDNS.cgi\nicon=icon_cloudflare_dns.svg\ntarget=_self\nsearchtext=cloudflare dns\nEOF\")",
|
||||
89→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig /var/cpanel/apps/cloudflare_dns.conf 2>&1\")",
|
||||
90→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>/dev/null | grep -i cloudflare && /usr/local/cpanel/scripts/rebuild_whm_chrome 2>&1\")",
|
||||
91→ "Bash(\"C:/Program Files/Git/usr/bin/ssh.exe\" root@ix.azcomputerguru.com \"/usr/local/cpanel/bin/register_appconfig --list 2>&1\")",
|
||||
92→ "Bash(ipconfig:*)",
|
||||
93→ "Bash(net view \\\\192.168.0.27)",
|
||||
94→ "Bash(powershell -Command \"$cred = New-Object System.Management.Automation.PSCredential\\(''INTRANET\\\\sysadmin'', \\(ConvertTo-SecureString ''Paper123!@#'' -AsPlainText -Force\\)\\); Invoke-Command -ComputerName 192.168.0.27 -Credential $cred -ScriptBlock { Get-WindowsFeature NPAS* | Select-Object Name,InstallState }\")",
|
||||
95→ "Bash(powershell -Command \"Set-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts -Value ''192.168.0.27'' -Force; Get-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts\")",
|
||||
96→ "Bash(powershell -Command \"Start-Service WinRM; Set-Item WSMan:\\\\localhost\\\\Client\\\\TrustedHosts -Value ''192.168.0.27'' -Force\")",
|
||||
97→ "Bash(powershell -Command \"$pass = ConvertTo-SecureString ''Paper123!@#'' -AsPlainText -Force; $cred = New-Object System.Management.Automation.PSCredential\\(''INTRANET\\\\sysadmin'', $pass\\); Invoke-Command -ComputerName 192.168.0.27 -Credential $cred -ScriptBlock { Get-WindowsFeature NPAS* | Select-Object Name,InstallState }\")",
|
||||
98→ "Bash(powershell -ExecutionPolicy Bypass -File \"C:\\\\Users\\\\MikeSwanson\\\\claude-projects\\\\check-nps.ps1\")",
|
||||
99→ "Bash(powershell -ExecutionPolicy Bypass -File \"C:\\\\Users\\\\MikeSwanson\\\\claude-projects\\\\get-nps-config.ps1\")",
|
||||
100→ "Bash(powershell:*)",
|
||||
101→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -batch -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"hostname; uname -a; cat /mnt/data/unifi-os/unifi-core/config/settings.yaml 2>/dev/null | head -50\")",
|
||||
102→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -batch -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"find /mnt/data -name ''*vpn*'' -o -name ''*radius*'' 2>/dev/null | head -20\")",
|
||||
103→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" root@192.168.0.254 \"cat /mnt/data/udapi-config/raddb/clients.conf 2>/dev/null; ls -la /mnt/data/udapi-config/ 2>/dev/null\")",
|
||||
104→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" -no-antispoof root@192.168.0.254 \"ls /mnt/data/\")",
|
||||
105→ "Bash(\"C:\\\\Program Files\\\\PuTTY\\\\plink.exe\" -ssh -pw \"Paper123!@#-unifi\" -no-antispoof root@192.168.0.254 \"ls /data/ 2>/dev/null; ls /etc/openvpn/ 2>/dev/null; ps aux | grep -i vpn\")",
|
||||
106→ "Bash(claude --version)"
|
||||
107→ ],
|
||||
108→ "deny": [],
|
||||
109→ "ask": []
|
||||
110→ }
|
||||
111→}
|
||||
112→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,3 @@
|
||||
-rwxr-xr-x 1 AzureAD+MikeSwanson 4096 3.5M Dec 20 18:03 /c/Users/MikeSwanson/Desktop/gururmm-agent.exe*
|
||||
-rwxr-xr-x 1 AzureAD+MikeSwanson 4096 2.0M Dec 15 17:15 /c/Users/MikeSwanson/Desktop/gururmm-agent-new.exe*
|
||||
-rwxr-xr-x 1 AzureAD+MikeSwanson 4096 1.3M Dec 20 18:03 /c/Users/MikeSwanson/Desktop/gururmm-tray.exe*
|
||||
@@ -0,0 +1 @@
|
||||
EISDIR: illegal operation on a directory, read
|
||||
@@ -0,0 +1 @@
|
||||
File created successfully at: C:\Users\MikeSwanson\claude-projects\gururmm\agent\src\tray_launcher.rs
|
||||
@@ -0,0 +1,15 @@
|
||||
version = "0.4.0"
|
||||
---
|
||||
total 104
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 ./
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 ../
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 commands/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 8693 Dec 20 17:55 config.rs
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 6176 Dec 20 17:55 device_id.rs
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 15927 Dec 20 17:55 ipc.rs
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 24625 Dec 20 17:55 main.rs
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 metrics/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 30836 Dec 20 17:55 service.rs
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 transport/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 updater/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:55 watchdog/
|
||||
@@ -0,0 +1 @@
|
||||
Cloning into 'gururmm'...
|
||||
@@ -0,0 +1,319 @@
|
||||
1→# GuruRMM Tray Icon Implementation Plan
|
||||
2→
|
||||
3→## Overview
|
||||
4→
|
||||
5→Add a system tray application for the GuruRMM agent that provides user visibility and interaction, with all features controlled by admin policy from the server.
|
||||
6→
|
||||
7→## Architecture
|
||||
8→
|
||||
9→```
|
||||
10→┌─────────────────┐ Policy ┌─────────────────┐
|
||||
11→│ RMM Server │ ──────────────► │ Agent Service │
|
||||
12→│ (WebSocket) │ │ (Background) │
|
||||
13→└─────────────────┘ └────────┬────────┘
|
||||
14→ │ IPC
|
||||
15→ │ (Named Pipe)
|
||||
16→ ▼
|
||||
17→ ┌─────────────────┐
|
||||
18→ │ Tray App │
|
||||
19→ │ (User Session) │
|
||||
20→ └─────────────────┘
|
||||
21→```
|
||||
22→
|
||||
23→**Key Points:**
|
||||
24→- Agent service runs as SYSTEM, always running
|
||||
25→- Tray app runs in user session, started by service if policy enables it
|
||||
26→- IPC via Windows Named Pipe for status/commands
|
||||
27→- Policy controls everything: visibility, menu items, allowed actions
|
||||
28→
|
||||
29→---
|
||||
30→
|
||||
31→## Phase 1: IPC Infrastructure
|
||||
32→
|
||||
33→### 1.1 Add Named Pipe Server to Agent Service
|
||||
34→
|
||||
35→**File:** `agent/src/ipc.rs` (new)
|
||||
36→
|
||||
37→```rust
|
||||
38→// Named pipe: \\.\pipe\gururmm-agent
|
||||
39→// Protocol: JSON messages over pipe
|
||||
40→
|
||||
41→pub enum IpcRequest {
|
||||
42→ GetStatus, // Get current agent status
|
||||
43→ GetPolicy, // Get current tray policy
|
||||
44→ ForceCheckin, // Trigger immediate metrics send
|
||||
45→ StopAgent, // Stop the agent service (if allowed)
|
||||
46→ Subscribe, // Subscribe to status updates
|
||||
47→}
|
||||
48→
|
||||
49→pub enum IpcResponse {
|
||||
50→ Status(AgentStatus),
|
||||
51→ Policy(TrayPolicy),
|
||||
52→ Ok,
|
||||
53→ Error(String),
|
||||
54→ Denied(String), // Action not allowed by policy
|
||||
55→}
|
||||
56→
|
||||
57→pub struct AgentStatus {
|
||||
58→ pub connected: bool,
|
||||
59→ pub last_checkin: Option<DateTime<Utc>>,
|
||||
60→ pub server_url: String,
|
||||
61→ pub agent_version: String,
|
||||
62→ pub device_id: String,
|
||||
63→ pub hostname: String,
|
||||
64→}
|
||||
65→```
|
||||
66→
|
||||
67→### 1.2 Tray Policy Structure
|
||||
68→
|
||||
69→**Add to server → agent protocol:**
|
||||
70→
|
||||
71→```rust
|
||||
72→pub struct TrayPolicy {
|
||||
73→ pub enabled: bool, // Show tray icon at all
|
||||
74→ pub show_status: bool, // Show connection status
|
||||
75→ pub show_info: bool, // Show agent info in menu
|
||||
76→ pub allow_force_checkin: bool, // Allow manual check-in
|
||||
77→ pub allow_view_logs: bool, // Allow opening log file
|
||||
78→ pub allow_open_dashboard: bool, // Allow opening web dashboard
|
||||
79→ pub allow_stop_agent: bool, // Allow stopping the agent
|
||||
80→ pub dashboard_url: Option<String>,
|
||||
81→ pub custom_icon: Option<String>, // Base64 encoded custom icon
|
||||
82→ pub tooltip_text: Option<String>,
|
||||
83→}
|
||||
84→```
|
||||
85→
|
||||
86→---
|
||||
87→
|
||||
88→## Phase 2: Tray Application (Windows)
|
||||
89→
|
||||
90→### 2.1 New Crate Structure
|
||||
91→
|
||||
92→```
|
||||
93→gururmm/
|
||||
94→├── agent/ # Existing agent service
|
||||
95→│ └── src/
|
||||
96→│ ├── main.rs
|
||||
97→│ ├── ipc.rs # NEW: IPC server
|
||||
98→│ └── ...
|
||||
99→└── tray/ # NEW: Tray application
|
||||
100→ ├── Cargo.toml
|
||||
101→ └── src/
|
||||
102→ ├── main.rs # Entry point, IPC client
|
||||
103→ ├── tray.rs # Windows tray icon management
|
||||
104→ ├── menu.rs # Dynamic menu building
|
||||
105→ └── ipc.rs # Named pipe client
|
||||
106→```
|
||||
107→
|
||||
108→### 2.2 Tray Crate Dependencies
|
||||
109→
|
||||
110→```toml
|
||||
111→[package]
|
||||
112→name = "gururmm-tray"
|
||||
113→version = "0.1.0"
|
||||
114→
|
||||
115→[dependencies]
|
||||
116→tray-icon = "0.14" # Cross-platform tray (uses winit)
|
||||
117→winit = "0.29" # Window event loop
|
||||
118→image = "0.24" # Icon loading
|
||||
119→serde = { version = "1", features = ["derive"] }
|
||||
120→serde_json = "1"
|
||||
121→tokio = { version = "1", features = ["net", "io-util", "sync"] }
|
||||
122→anyhow = "1"
|
||||
123→tracing = "0.1"
|
||||
124→tracing-subscriber = "0.3"
|
||||
125→
|
||||
126→[target.'cfg(windows)'.dependencies]
|
||||
127→windows = { version = "0.58", features = [
|
||||
128→ "Win32_System_Pipes",
|
||||
129→ "Win32_Foundation",
|
||||
130→]}
|
||||
131→
|
||||
132→[profile.release]
|
||||
133→opt-level = "z"
|
||||
134→lto = true
|
||||
135→strip = true
|
||||
136→```
|
||||
137→
|
||||
138→### 2.3 Tray Icon States
|
||||
139→
|
||||
140→| State | Icon | Tooltip |
|
||||
141→|-------|------|---------|
|
||||
142→| Connected | Green circle | "GuruRMM - Connected" |
|
||||
143→| Disconnected | Yellow circle | "GuruRMM - Reconnecting..." |
|
||||
144→| Error | Red circle | "GuruRMM - Error: {message}" |
|
||||
145→| Disabled | Gray circle | "GuruRMM - Disabled by policy" |
|
||||
146→
|
||||
147→### 2.4 Menu Structure (Policy-Controlled)
|
||||
148→
|
||||
149→```
|
||||
150→GuruRMM Agent v1.0.0
|
||||
151→─────────────────────
|
||||
152→✓ Connected to rmm-api.example.com
|
||||
153→ Last check-in: 2 minutes ago
|
||||
154→ Device: WORKSTATION-01
|
||||
155→─────────────────────
|
||||
156→ Force Check-in [if allow_force_checkin]
|
||||
157→ View Logs [if allow_view_logs]
|
||||
158→ Open Dashboard [if allow_open_dashboard]
|
||||
159→─────────────────────
|
||||
160→ Stop Agent [if allow_stop_agent]
|
||||
161→ Exit Tray [always, hides tray only]
|
||||
162→```
|
||||
163→
|
||||
164→---
|
||||
165→
|
||||
166→## Phase 3: Agent Service Changes
|
||||
167→
|
||||
168→### 3.1 Tray Launcher
|
||||
169→
|
||||
170→Agent service launches tray app for each logged-in user session:
|
||||
171→
|
||||
172→**File:** `agent/src/tray_launcher.rs` (new)
|
||||
173→
|
||||
174→```rust
|
||||
175→// On Windows:
|
||||
176→// 1. Enumerate user sessions (WTSEnumerateSessions)
|
||||
177→// 2. For active sessions, launch tray in user context
|
||||
178→// 3. Monitor for new logons, launch tray
|
||||
179→// 4. If policy disables tray, terminate tray processes
|
||||
180→```
|
||||
181→
|
||||
182→### 3.2 Policy Handler
|
||||
183→
|
||||
184→When server sends policy update:
|
||||
185→
|
||||
186→```rust
|
||||
187→// In transport handler:
|
||||
188→ServerMessage::PolicyUpdate(policy) => {
|
||||
189→ // Store policy
|
||||
190→ self.policy.write().await = policy;
|
||||
191→
|
||||
192→ // Update tray processes
|
||||
193→ if policy.tray.enabled {
|
||||
194→ self.tray_launcher.ensure_running().await;
|
||||
195→ } else {
|
||||
196→ self.tray_launcher.terminate_all().await;
|
||||
197→ }
|
||||
198→
|
||||
199→ // Notify connected tray apps of policy change
|
||||
200→ self.ipc_server.broadcast_policy(&policy.tray).await;
|
||||
201→}
|
||||
202→```
|
||||
203→
|
||||
204→---
|
||||
205→
|
||||
206→## Phase 4: Server-Side Policy
|
||||
207→
|
||||
208→### 4.1 Database Schema Addition
|
||||
209→
|
||||
210→```sql
|
||||
211→ALTER TABLE sites ADD COLUMN tray_policy JSONB DEFAULT '{
|
||||
212→ "enabled": true,
|
||||
213→ "show_status": true,
|
||||
214→ "show_info": true,
|
||||
215→ "allow_force_checkin": true,
|
||||
216→ "allow_view_logs": true,
|
||||
217→ "allow_open_dashboard": true,
|
||||
218→ "allow_stop_agent": false,
|
||||
219→ "dashboard_url": null,
|
||||
220→ "custom_icon": null,
|
||||
221→ "tooltip_text": null
|
||||
222→}';
|
||||
223→```
|
||||
224→
|
||||
225→### 4.2 Dashboard UI
|
||||
226→
|
||||
227→Add to Site Settings page:
|
||||
228→- Toggle: "Show system tray icon"
|
||||
229→- Checkboxes for each menu option
|
||||
230→- Custom icon upload
|
||||
231→- Custom tooltip text
|
||||
232→
|
||||
233→---
|
||||
234→
|
||||
235→## Implementation Order
|
||||
236→
|
||||
237→### Step 1: IPC Infrastructure (Agent Side)
|
||||
238→1. Create `agent/src/ipc.rs` with named pipe server
|
||||
239→2. Add IPC task to agent main loop
|
||||
240→3. Define message protocol (GetStatus, GetPolicy, etc.)
|
||||
241→4. Test with simple client
|
||||
242→
|
||||
243→### Step 2: Tray Application (Windows)
|
||||
244→1. Create `tray/` crate with Cargo.toml
|
||||
245→2. Implement IPC client connecting to agent
|
||||
246→3. Create basic tray icon with `tray-icon` crate
|
||||
247→4. Build dynamic menu from policy
|
||||
248→5. Handle menu actions → IPC requests
|
||||
249→
|
||||
250→### Step 3: Tray Launcher (Agent Side)
|
||||
251→1. Add session enumeration (WTSEnumerateSessions)
|
||||
252→2. Launch tray in user context (CreateProcessAsUser)
|
||||
253→3. Monitor for logon/logoff events
|
||||
254→4. Handle policy enable/disable
|
||||
255→
|
||||
256→### Step 4: Server Integration
|
||||
257→1. Add tray_policy to server data model
|
||||
258→2. Add policy to site settings API
|
||||
259→3. Send policy to agent on connect
|
||||
260→4. Add dashboard UI for policy management
|
||||
261→
|
||||
262→### Step 5: Polish
|
||||
263→1. Icon assets (green/yellow/red/gray)
|
||||
264→2. Installer updates (include tray binary)
|
||||
265→3. Documentation
|
||||
266→
|
||||
267→---
|
||||
268→
|
||||
269→## Files to Create/Modify
|
||||
270→
|
||||
271→### New Files
|
||||
272→| File | Purpose |
|
||||
273→|------|---------|
|
||||
274→| `agent/src/ipc.rs` | Named pipe IPC server |
|
||||
275→| `agent/src/tray_launcher.rs` | Launch tray in user sessions |
|
||||
276→| `tray/Cargo.toml` | Tray app crate config |
|
||||
277→| `tray/src/main.rs` | Tray app entry point |
|
||||
278→| `tray/src/tray.rs` | Tray icon management |
|
||||
279→| `tray/src/menu.rs` | Dynamic menu building |
|
||||
280→| `tray/src/ipc.rs` | Named pipe client |
|
||||
281→| `assets/icons/` | Tray icon images |
|
||||
282→
|
||||
283→### Modified Files
|
||||
284→| File | Changes |
|
||||
285→|------|---------|
|
||||
286→| `agent/src/main.rs` | Add IPC server task, tray launcher |
|
||||
287→| `agent/src/transport/mod.rs` | Add TrayPolicy to protocol |
|
||||
288→| `agent/Cargo.toml` | Add windows crate for session APIs |
|
||||
289→| `server/src/models/` | Add tray_policy to site model |
|
||||
290→| `dashboard/src/` | Add tray policy UI to site settings |
|
||||
291→
|
||||
292→---
|
||||
293→
|
||||
294→## Future: Mac/Linux Support
|
||||
295→
|
||||
296→### macOS
|
||||
297→- Menu bar icon via same `tray-icon` crate
|
||||
298→- IPC via Unix domain socket instead of named pipe
|
||||
299→- Launch via launchd user agent
|
||||
300→
|
||||
301→### Linux
|
||||
302→- System tray via `tray-icon` (uses libappindicator/StatusNotifierItem)
|
||||
303→- IPC via Unix domain socket
|
||||
304→- Launch via XDG autostart or systemd user service
|
||||
305→- Note: GNOME requires extension for tray icons
|
||||
306→
|
||||
307→---
|
||||
308→
|
||||
309→## Security Considerations
|
||||
310→
|
||||
311→1. **IPC Authentication**: Tray must prove it's running in a valid user session
|
||||
312→2. **Policy Enforcement**: Agent validates actions against policy, not tray
|
||||
313→3. **Stop Agent**: Requires admin policy AND user confirmation dialog
|
||||
314→4. **Named Pipe ACL**: Restrict pipe access to authenticated users
|
||||
315→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,8 @@
|
||||
origin https://git.azcomputerguru.com/azcomputerguru/claude-projects.git (fetch)
|
||||
origin https://git.azcomputerguru.com/azcomputerguru/claude-projects.git (push)
|
||||
fatal: 'gitea' does not appear to be a git repository
|
||||
fatal: Could not read from remote repository.
|
||||
|
||||
Please make sure you have the correct access rights
|
||||
and the repository exists.
|
||||
Pull failed or no gitea remote
|
||||
@@ -0,0 +1,161 @@
|
||||
1→# Session Log: GuruRMM Agent - Service Installers & Network State
|
||||
2→
|
||||
3→**Date:** 2025-12-15
|
||||
4→**Project:** GuruRMM Agent Development
|
||||
5→**Status:** Working
|
||||
6→
|
||||
7→## Summary
|
||||
8→
|
||||
9→Implemented service installation for Linux (systemd) and Windows (SCM), network state collection with change detection, and added significant roadmap items for white-labeling and system tray features.
|
||||
10→
|
||||
11→## Work Completed
|
||||
12→
|
||||
13→### 1. Service Installation (Linux - systemd)
|
||||
14→
|
||||
15→**Commands:**
|
||||
16→- `sudo ./gururmm-agent install` - Copies to /usr/local/bin, creates config, enables service
|
||||
17→- `sudo ./gururmm-agent uninstall` - Stops, disables, removes service and binary
|
||||
18→- `sudo ./gururmm-agent start/stop` - Control the service
|
||||
19→
|
||||
20→**Features:**
|
||||
21→- Copies binary to `/usr/local/bin/gururmm-agent`
|
||||
22→- Creates config at `/etc/gururmm/agent.toml`
|
||||
23→- Unit file at `/etc/systemd/system/gururmm-agent.service`
|
||||
24→- `Restart=always` with 10-second delay (self-healing)
|
||||
25→- Security hardening: NoNewPrivileges, ProtectSystem=strict, ProtectHome=read-only, PrivateTmp
|
||||
26→- Logs to journald
|
||||
27→
|
||||
28→### 2. Service Installation (Windows - SCM)
|
||||
29→
|
||||
30→**Commands:**
|
||||
31→- `gururmm-agent.exe install` (Admin required)
|
||||
32→- `gururmm-agent.exe uninstall` (Admin required)
|
||||
33→- `gururmm-agent.exe start/stop`
|
||||
34→
|
||||
35→**Features:**
|
||||
36→- Copies to `C:\Program Files\GuruRMM\gururmm-agent.exe`
|
||||
37→- Creates config at `C:\ProgramData\GuruRMM\agent.toml`
|
||||
38→- Service name: `GuruRMMAgent`
|
||||
39→- Recovery: restart 3 times on failure (60-second delay each)
|
||||
40→- Auto-start on boot
|
||||
41→- Runs as LocalSystem
|
||||
42→
|
||||
43→### 3. Network State Collection
|
||||
44→
|
||||
45→**Data Collected:**
|
||||
46→```rust
|
||||
47→NetworkState {
|
||||
48→ timestamp: DateTime<Utc>,
|
||||
49→ interfaces: Vec<NetworkInterface>, // name, mac, ipv4[], ipv6[]
|
||||
50→ state_hash: String, // For change detection
|
||||
51→}
|
||||
52→```
|
||||
53→
|
||||
54→**Behavior:**
|
||||
55→- Sends initial state immediately after authentication
|
||||
56→- Checks for changes every 30 seconds
|
||||
57→- Only sends update when hash changes (interface add/remove, IP change)
|
||||
58→- Filters out loopback-only and link-local-only interfaces
|
||||
59→- WAN IP captured by server from connection source (no external API calls)
|
||||
60→
|
||||
61→**Added crate:** `local-ip-address = "0.6"` for cross-platform interface enumeration
|
||||
62→
|
||||
63→### 4. Feature Roadmap Additions
|
||||
64→
|
||||
65→Added to `docs/FEATURE_ROADMAP.md`:
|
||||
66→
|
||||
67→**Agent Updates (P1-P3):**
|
||||
68→- Built-in update handler (not shell script)
|
||||
69→- Server sends update command with version, URL, checksum
|
||||
70→- Download, verify SHA256, replace binary, restart
|
||||
71→- Rollback capability, staged rollouts
|
||||
72→
|
||||
73→**White-Labeling / Branding (P2-P3):**
|
||||
74→- Install-time: custom service name, display name, install path
|
||||
75→- Runtime: server-managed branding config, logo/icon URL, support contact
|
||||
76→
|
||||
77→**System Tray / End-User Self-Service (P2):**
|
||||
78→- Windows tray icon, macOS menu bar
|
||||
79→- Built-in actions: System Info, Create Ticket, Screenshot to Ticket
|
||||
80→- Admin-definable custom actions (RestartService, RunCommand, OpenUrl)
|
||||
81→- Per-customer action sets, confirmation dialogs, elevation support
|
||||
82→
|
||||
83→## Binary Sizes
|
||||
84→
|
||||
85→| Platform | Size |
|
||||
86→|----------|------|
|
||||
87→| Linux | 2.4MB |
|
||||
88→| Windows | 2.2MB |
|
||||
89→
|
||||
90→## Files Modified
|
||||
91→
|
||||
92→- `agent/Cargo.toml` - Added local-ip-address crate, nix user feature
|
||||
93→- `agent/src/main.rs` - Service install/uninstall/start/stop for Linux & Windows
|
||||
94→- `agent/src/metrics/mod.rs` - NetworkState, NetworkInterface structs, collection, change detection
|
||||
95→- `agent/src/transport/mod.rs` - Added NetworkState message type
|
||||
96→- `agent/src/transport/websocket.rs` - Send network state on connect, monitor for changes
|
||||
97→- `docs/FEATURE_ROADMAP.md` - Agent Updates, White-Labeling, System Tray sections
|
||||
98→
|
||||
99→## Git Commit
|
||||
100→
|
||||
101→```
|
||||
102→a65814b - Agent: service installers, network state collection, roadmap updates
|
||||
103→```
|
||||
104→
|
||||
105→## Discussion Topics
|
||||
106→
|
||||
107→### Data Collection
|
||||
108→- Interval metrics: CPU, memory, disk, network throughput (every 30s)
|
||||
109→- Network state: LAN IPs, MACs, interface names (on connect + change)
|
||||
110→- WAN IP: Captured server-side from WebSocket connection
|
||||
111→
|
||||
112→### Agent Versioning & Updates
|
||||
113→- Agent already sends version in auth payload
|
||||
114→- Update mechanism: Server sends update command, agent handles internally
|
||||
115→- Not shell script based - built-in download, verify, replace, restart
|
||||
116→- Queued for implementation
|
||||
117→
|
||||
118→### White-Labeling Discussion
|
||||
119→- MSPs need branded agents (service name, display name, icon)
|
||||
120→- Options: compile-time, config-file, install-time params, server-managed
|
||||
121→- Decided: hybrid - install-time params + server-managed runtime config
|
||||
122→
|
||||
123→### System Tray Features
|
||||
124→- End-user self-service reduces helpdesk calls
|
||||
125→- Built-in: System Info, Create Ticket, Screenshot to Ticket
|
||||
126→- Admin-definable: Restart Spooler, Clear Temp, etc.
|
||||
127→- Server pushes menu config, agent caches locally
|
||||
128→
|
||||
129→## Queued Tasks
|
||||
130→
|
||||
131→1. **Agent Update Handler** - Built-in update mechanism
|
||||
132→2. **macOS launchd installer** - Service installation for macOS
|
||||
133→3. **Watchdog module** - Monitor and restart other services
|
||||
134→
|
||||
135→## Test Results
|
||||
136→
|
||||
137→All 7 tests passing:
|
||||
138→- config::tests::test_default_metrics_config
|
||||
139→- config::tests::test_watch_action_default
|
||||
140→- config::tests::test_sample_config_is_valid_structure
|
||||
141→- metrics::tests::test_network_state_collection
|
||||
142→- metrics::tests::test_network_state_change_detection
|
||||
143→- metrics::tests::test_system_info
|
||||
144→- metrics::tests::test_metrics_collection
|
||||
145→
|
||||
146→## Related Files
|
||||
147→
|
||||
148→- Config: `/tmp/agent-live.toml` (test config pointing to Jupiter)
|
||||
149→- Linux binary: `/home/guru/claude-projects/gururmm/agent/target/release/gururmm-agent`
|
||||
150→- Windows binary: `C:\Users\MikeSwanson\Desktop\gururmm-agent.exe`
|
||||
151→
|
||||
152→## Server Info
|
||||
153→
|
||||
154→- GuruRMM API: ws://172.16.3.20:3001/ws (Jupiter)
|
||||
155→- Test agent ID: `0a73e56f-bb61-4dfa-bc6f-b36912fe0797`
|
||||
156→- API Key: `grmm_JsLT1OEps1spNdcn__79Av3wZRwbkIp8`
|
||||
157→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1,4 @@
|
||||
total 24
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 19 13:10 ./
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:42 ../
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 1422 Dec 19 13:10 settings.json
|
||||
@@ -0,0 +1,4 @@
|
||||
remote: . Processing 1 references
|
||||
remote: Processed 1 references in total
|
||||
To https://git.azcomputerguru.com/azcomputerguru/claude-projects.git
|
||||
56a402a..9768abb main -> main
|
||||
@@ -0,0 +1 @@
|
||||
ssh: Could not resolve hostname jupiter: No such host is known.
|
||||
@@ -0,0 +1,18 @@
|
||||
total 273
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:44 ./
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:43 ../
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 433 Dec 20 16:14 .credentials.json
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:43 debug/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Nov 29 14:29 downloads/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 19 14:52 file-history/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 161494 Dec 20 17:43 history.jsonl
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:44 plans/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 18 18:39 plugins/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 19 13:08 projects/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 1422 Dec 19 14:54 settings.json
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 16994 Dec 14 07:07 settings.local.json
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:43 shell-snapshots/
|
||||
-rw-r--r-- 1 AzureAD+MikeSwanson 4096 2211 Dec 20 17:43 stats-cache.json
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:43 statsig/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 07:24 telemetry/
|
||||
drwxr-xr-x 1 AzureAD+MikeSwanson 4096 0 Dec 20 17:43 todos/
|
||||
@@ -0,0 +1,2 @@
|
||||
rustc 1.92.0 (ded5c06cf 2025-12-08)
|
||||
cargo 1.92.0 (344c4567c 2025-10-21)
|
||||
@@ -0,0 +1,315 @@
|
||||
Updating crates.io index
|
||||
Locking 344 packages to latest compatible versions
|
||||
Adding toml v0.8.2 (available: v0.8.23)
|
||||
Adding toml_datetime v0.6.3 (available: v0.6.11)
|
||||
Adding toml_edit v0.20.2 (available: v0.20.7)
|
||||
Adding tray-icon v0.19.3 (available: v0.21.2)
|
||||
Downloading crates ...
|
||||
Downloaded aligned-vec v0.6.4
|
||||
Downloaded as-slice v0.2.1
|
||||
Downloaded equator-macro v0.4.2
|
||||
Downloaded profiling-procmacros v1.0.17
|
||||
Downloaded wasm-bindgen-macro v0.2.106
|
||||
Downloaded y4m v0.8.0
|
||||
Downloaded lebe v0.5.3
|
||||
Downloaded avif-serialize v0.8.6
|
||||
Downloaded zune-core v0.5.0
|
||||
Downloaded zune-inflate v0.2.54
|
||||
Downloaded weezl v0.1.12
|
||||
Downloaded zune-jpeg v0.4.21
|
||||
Downloaded zune-jpeg v0.5.7
|
||||
Downloaded tray-icon v0.19.3
|
||||
Downloaded png v0.18.0
|
||||
Downloaded nom v8.0.0
|
||||
Downloaded itertools v0.14.0
|
||||
Downloaded moxcms v0.7.11
|
||||
Downloaded muda v0.15.3
|
||||
Downloaded crossbeam-channel v0.5.15
|
||||
Downloaded zerocopy-derive v0.8.31
|
||||
Downloaded image-webp v0.2.4
|
||||
Downloaded exr v1.74.0
|
||||
Downloaded bumpalo v3.19.1
|
||||
Downloaded image v0.25.9
|
||||
Downloaded bitstream-io v4.9.0
|
||||
Downloaded qoi v0.4.1
|
||||
Downloaded imgref v1.12.0
|
||||
Downloaded wasm-bindgen v0.2.106
|
||||
Downloaded toml v0.5.11
|
||||
Downloaded keyboard-types v0.7.0
|
||||
Downloaded av-scenechange v0.14.1
|
||||
Downloaded half v2.7.1
|
||||
Downloaded gif v0.14.1
|
||||
Downloaded bytemuck v1.24.0
|
||||
Downloaded wasm-bindgen-macro-support v0.2.106
|
||||
Downloaded rgb v0.8.52
|
||||
Downloaded raw-window-handle v0.6.2
|
||||
Downloaded ravif v0.12.0
|
||||
Downloaded winit v0.30.12
|
||||
Downloaded open v5.3.3
|
||||
Downloaded num-rational v0.4.2
|
||||
Downloaded fdeflate v0.3.7
|
||||
Downloaded core2 v0.4.0
|
||||
Downloaded built v0.8.0
|
||||
Downloaded zune-core v0.4.12
|
||||
Downloaded winres v0.1.12
|
||||
Downloaded v_frame v0.3.9
|
||||
Downloaded paste v1.0.15
|
||||
Downloaded bit_field v0.10.3
|
||||
Downloaded wasm-bindgen-shared v0.2.106
|
||||
Downloaded simd_helpers v0.1.0
|
||||
Downloaded quick-error v2.0.1
|
||||
Downloaded pastey v0.1.1
|
||||
Downloaded noop_proc_macro v0.3.0
|
||||
Downloaded pxfm v0.1.27
|
||||
Downloaded maybe-rayon v0.1.1
|
||||
Downloaded smol_str v0.2.2
|
||||
Downloaded profiling v1.0.17
|
||||
Downloaded num-derive v0.4.2
|
||||
Downloaded av1-grain v0.2.5
|
||||
Downloaded new_debug_unreachable v1.0.6
|
||||
Downloaded loop9 v0.1.5
|
||||
Downloaded fax_derive v0.2.0
|
||||
Downloaded fax v0.2.6
|
||||
Downloaded dpi v0.1.2
|
||||
Downloaded cursor-icon v1.2.0
|
||||
Downloaded byteorder-lite v0.1.0
|
||||
Downloaded equator v0.4.2
|
||||
Downloaded color_quant v1.1.0
|
||||
Downloaded arrayvec v0.7.6
|
||||
Downloaded arg_enum_proc_macro v0.3.4
|
||||
Downloaded aligned v0.4.3
|
||||
Downloaded rav1e v0.8.1
|
||||
Downloaded tiff v0.10.3
|
||||
Downloaded windows-sys v0.59.0
|
||||
Compiling proc-macro2 v1.0.103
|
||||
Compiling quote v1.0.42
|
||||
Compiling unicode-ident v1.0.22
|
||||
Compiling autocfg v1.5.0
|
||||
Compiling crossbeam-utils v0.8.21
|
||||
Compiling serde_core v1.0.228
|
||||
Compiling cfg-if v1.0.4
|
||||
Compiling rayon-core v1.13.0
|
||||
Compiling memchr v2.7.6
|
||||
Compiling simd-adler32 v0.3.8
|
||||
Compiling windows_x86_64_msvc v0.52.6
|
||||
Compiling thiserror v2.0.17
|
||||
Compiling either v1.15.0
|
||||
Compiling log v0.4.29
|
||||
Compiling once_cell v1.21.3
|
||||
Compiling anyhow v1.0.100
|
||||
Compiling zerocopy v0.8.31
|
||||
Compiling windows_x86_64_msvc v0.53.1
|
||||
Compiling crc32fast v1.5.0
|
||||
Compiling windows-link v0.2.1
|
||||
Compiling serde v1.0.228
|
||||
Compiling adler2 v2.0.1
|
||||
Compiling stable_deref_trait v1.2.1
|
||||
Compiling arrayvec v0.7.6
|
||||
Compiling libc v0.2.178
|
||||
Compiling paste v1.0.15
|
||||
Compiling built v0.8.0
|
||||
Compiling av-scenechange v0.14.1
|
||||
Compiling core2 v0.4.0
|
||||
Compiling nom v8.0.0
|
||||
Compiling num-traits v0.2.19
|
||||
Compiling windows-sys v0.61.2
|
||||
Compiling tracing-core v0.1.36
|
||||
Compiling as-slice v0.2.1
|
||||
Compiling miniz_oxide v0.8.9
|
||||
Compiling thiserror v1.0.69
|
||||
Compiling quick-error v2.0.1
|
||||
Compiling rav1e v0.8.1
|
||||
Compiling pin-project-lite v0.2.16
|
||||
Compiling pastey v0.1.1
|
||||
Compiling unicode-segmentation v1.12.0
|
||||
Compiling y4m v0.8.0
|
||||
Compiling aligned v0.4.3
|
||||
Compiling bitstream-io v4.9.0
|
||||
Compiling itertools v0.14.0
|
||||
Compiling imgref v1.12.0
|
||||
Compiling smallvec v1.15.1
|
||||
Compiling new_debug_unreachable v1.0.6
|
||||
Compiling zune-core v0.4.12
|
||||
Compiling bitflags v2.10.0
|
||||
Compiling dpi v0.1.2
|
||||
Compiling noop_proc_macro v0.3.0
|
||||
Compiling cfg_aliases v0.2.1
|
||||
Compiling weezl v0.1.12
|
||||
Compiling regex-syntax v0.8.8
|
||||
Compiling avif-serialize v0.8.6
|
||||
Compiling fdeflate v0.3.7
|
||||
Compiling crossbeam-epoch v0.9.18
|
||||
Compiling windows-targets v0.52.6
|
||||
Compiling loop9 v0.1.5
|
||||
Compiling crossbeam-channel v0.5.15
|
||||
Compiling zune-inflate v0.2.54
|
||||
Compiling color_quant v1.1.0
|
||||
Compiling windows-targets v0.53.5
|
||||
Compiling zune-core v0.5.0
|
||||
Compiling bytemuck v1.24.0
|
||||
Compiling flate2 v1.1.5
|
||||
Compiling lazy_static v1.5.0
|
||||
Compiling zune-jpeg v0.4.21
|
||||
Compiling syn v2.0.111
|
||||
Compiling simd_helpers v0.1.0
|
||||
Compiling serde_json v1.0.145
|
||||
Compiling rgb v0.8.52
|
||||
Compiling winit v0.30.12
|
||||
Compiling lebe v0.5.3
|
||||
Compiling crossbeam-deque v0.8.6
|
||||
Compiling byteorder-lite v0.1.0
|
||||
Compiling windows-sys v0.59.0
|
||||
Compiling bit_field v0.10.3
|
||||
Compiling windows-sys v0.52.0
|
||||
Compiling mio v1.1.1
|
||||
Compiling num-integer v0.1.46
|
||||
Compiling windows-sys v0.60.2
|
||||
Compiling pxfm v0.1.27
|
||||
Compiling regex-automata v0.4.13
|
||||
Compiling zune-jpeg v0.5.7
|
||||
Compiling gif v0.14.1
|
||||
Compiling sharded-slab v0.1.7
|
||||
Compiling qoi v0.4.1
|
||||
Compiling nu-ansi-term v0.50.3
|
||||
Compiling png v0.18.0
|
||||
Compiling tracing-log v0.2.0
|
||||
Compiling thread_local v1.1.9
|
||||
Compiling itoa v1.0.15
|
||||
Compiling image-webp v0.2.4
|
||||
Compiling raw-window-handle v0.6.2
|
||||
Compiling smol_str v0.2.2
|
||||
Compiling num-bigint v0.4.6
|
||||
Compiling socket2 v0.6.1
|
||||
Compiling bytes v1.11.0
|
||||
Compiling ryu v1.0.21
|
||||
Compiling cursor-icon v1.2.0
|
||||
Compiling open v5.3.3
|
||||
Compiling matchers v0.2.0
|
||||
Compiling moxcms v0.7.11
|
||||
Compiling equator-macro v0.4.2
|
||||
Compiling thiserror-impl v2.0.17
|
||||
Compiling serde_derive v1.0.228
|
||||
Compiling zerocopy-derive v0.8.31
|
||||
Compiling arg_enum_proc_macro v0.3.4
|
||||
Compiling profiling-procmacros v1.0.17
|
||||
Compiling rayon v1.11.0
|
||||
Compiling fax_derive v0.2.0
|
||||
Compiling tracing-attributes v0.1.31
|
||||
Compiling num-derive v0.4.2
|
||||
Compiling thiserror-impl v1.0.69
|
||||
Compiling tokio-macros v2.6.0
|
||||
Compiling equator v0.4.2
|
||||
Compiling profiling v1.0.17
|
||||
Compiling num-rational v0.4.2
|
||||
Compiling fax v0.2.6
|
||||
Compiling aligned-vec v0.6.4
|
||||
Compiling v_frame v0.3.9
|
||||
Compiling tracing v0.1.44
|
||||
Compiling tokio v1.48.0
|
||||
Compiling av1-grain v0.2.5
|
||||
Compiling tracing-subscriber v0.3.22
|
||||
Compiling maybe-rayon v0.1.1
|
||||
Compiling keyboard-types v0.7.0
|
||||
Compiling chrono v0.4.42
|
||||
Compiling half v2.7.1
|
||||
Compiling tiff v0.10.3
|
||||
Compiling exr v1.74.0
|
||||
Compiling muda v0.15.3
|
||||
Compiling tray-icon v0.19.3
|
||||
Compiling ravif v0.12.0
|
||||
Compiling image v0.25.9
|
||||
Compiling gururmm-tray v0.1.0 (C:\Users\MikeSwanson\claude-projects\gururmm\tray)
|
||||
warning: unused import: `error`
|
||||
--> src\ipc.rs:8:22
|
||||
|
|
||||
8 | use tracing::{debug, error, info, warn};
|
||||
| ^^^^^
|
||||
|
|
||||
= note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: unused import: `Submenu`
|
||||
--> src\menu.rs:4:70
|
||||
|
|
||||
4 | use tray_icon::menu::{Menu, MenuEvent, MenuItem, PredefinedMenuItem, Submenu};
|
||||
| ^^^^^^^
|
||||
|
||||
warning: unused import: `TrayIcon`
|
||||
--> src\tray.rs:8:11
|
||||
|
|
||||
8 | Icon, TrayIcon, TrayIconBuilder,
|
||||
| ^^^^^^^^
|
||||
|
||||
warning: unused import: `IpcClient`
|
||||
--> src\tray.rs:13:48
|
||||
|
|
||||
13 | use crate::ipc::{AgentStatus, ConnectionState, IpcClient, IpcRequest, TrayPolicy};
|
||||
| ^^^^^^^^^
|
||||
|
||||
warning: unused import: `crate::ipc::IpcClient`
|
||||
--> src\main.rs:20:5
|
||||
|
|
||||
20 | use crate::ipc::IpcClient;
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
warning: use of deprecated method `winit::event_loop::EventLoop::<T>::run`: use `EventLoop::run_app` instead
|
||||
--> src\tray.rs:177:20
|
||||
|
|
||||
177 | event_loop.run(move |_event, event_loop| {
|
||||
| ^^^
|
||||
|
|
||||
= note: `#[warn(deprecated)]` on by default
|
||||
|
||||
warning: unused variable: `update_tx`
|
||||
--> src\ipc.rs:135:14
|
||||
|
|
||||
135 | let (update_tx, update_rx) = mpsc::channel(32);
|
||||
| ^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_update_tx`
|
||||
|
|
||||
= note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: struct `IpcClient` is never constructed
|
||||
--> src\ipc.rs:114:12
|
||||
|
|
||||
114 | pub struct IpcClient {
|
||||
| ^^^^^^^^^
|
||||
|
|
||||
= note: `#[warn(dead_code)]` (part of `#[warn(unused)]`) on by default
|
||||
|
||||
warning: multiple associated items are never used
|
||||
--> src\ipc.rs:133:12
|
||||
|
|
||||
131 | impl IpcClient {
|
||||
| -------------- associated items in this implementation
|
||||
132 | /// Create a new IPC client
|
||||
133 | pub fn new() -> (Self, mpsc::Receiver<IpcRequest>) {
|
||||
| ^^^
|
||||
...
|
||||
149 | pub async fn connection_state(&self) -> ConnectionState {
|
||||
| ^^^^^^^^^^^^^^^^
|
||||
...
|
||||
154 | pub async fn status(&self) -> AgentStatus {
|
||||
| ^^^^^^
|
||||
...
|
||||
159 | pub async fn policy(&self) -> TrayPolicy {
|
||||
| ^^^^^^
|
||||
...
|
||||
164 | pub async fn send(&self, request: IpcRequest) -> Result<()> {
|
||||
| ^^^^
|
||||
...
|
||||
172 | pub async fn get_status(&self) -> Result<()> {
|
||||
| ^^^^^^^^^^
|
||||
...
|
||||
177 | pub async fn get_policy(&self) -> Result<()> {
|
||||
| ^^^^^^^^^^
|
||||
...
|
||||
182 | pub async fn force_checkin(&self) -> Result<()> {
|
||||
| ^^^^^^^^^^^^^
|
||||
...
|
||||
187 | pub async fn stop_agent(&self) -> Result<()> {
|
||||
| ^^^^^^^^^^
|
||||
...
|
||||
192 | pub async fn subscribe(&self) -> Result<()> {
|
||||
| ^^^^^^^^^
|
||||
|
||||
warning: `gururmm-tray` (bin "gururmm-tray") generated 9 warnings (run `cargo fix --bin "gururmm-tray" -p gururmm-tray` to apply 6 suggestions)
|
||||
Finished `release` profile [optimized] target(s) in 1m 15s
|
||||
@@ -0,0 +1 @@
|
||||
Settings copied successfully
|
||||
@@ -0,0 +1,772 @@
|
||||
1→//! GuruRMM Agent - Cross-platform Remote Monitoring and Management Agent
|
||||
2→//!
|
||||
3→//! This agent connects to the GuruRMM server, reports system metrics,
|
||||
4→//! monitors services (watchdog), and executes remote commands.
|
||||
5→
|
||||
6→mod config;
|
||||
7→mod device_id;
|
||||
8→mod ipc;
|
||||
9→mod metrics;
|
||||
10→mod service;
|
||||
11→mod transport;
|
||||
12→mod updater;
|
||||
13→
|
||||
14→use anyhow::{Context, Result};
|
||||
15→use clap::{Parser, Subcommand};
|
||||
16→use std::path::PathBuf;
|
||||
17→use std::sync::Arc;
|
||||
18→use tokio::sync::RwLock;
|
||||
19→use tracing::{error, info, warn};
|
||||
20→
|
||||
21→use crate::config::AgentConfig;
|
||||
22→use crate::metrics::MetricsCollector;
|
||||
23→use crate::transport::WebSocketClient;
|
||||
24→
|
||||
25→/// GuruRMM Agent - Remote Monitoring and Management
|
||||
26→#[derive(Parser)]
|
||||
27→#[command(name = "gururmm-agent")]
|
||||
28→#[command(author, version, about, long_about = None)]
|
||||
29→struct Cli {
|
||||
30→ /// Path to configuration file
|
||||
31→ #[arg(short, long, default_value = "agent.toml")]
|
||||
32→ config: PathBuf,
|
||||
33→
|
||||
34→ /// Subcommand to run
|
||||
35→ #[command(subcommand)]
|
||||
36→ command: Option<Commands>,
|
||||
37→}
|
||||
38→
|
||||
39→#[derive(Subcommand)]
|
||||
40→enum Commands {
|
||||
41→ /// Run the agent (default)
|
||||
42→ Run,
|
||||
43→
|
||||
44→ /// Install as a system service
|
||||
45→ Install {
|
||||
46→ /// Server WebSocket URL (e.g., wss://rmm-api.example.com/ws)
|
||||
47→ #[arg(long)]
|
||||
48→ server_url: Option<String>,
|
||||
49→
|
||||
50→ /// API key for authentication
|
||||
51→ #[arg(long)]
|
||||
52→ api_key: Option<String>,
|
||||
53→
|
||||
54→ /// Skip legacy service detection and cleanup
|
||||
55→ #[arg(long, default_value = "false")]
|
||||
56→ skip_legacy_check: bool,
|
||||
57→ },
|
||||
58→
|
||||
59→ /// Uninstall the system service
|
||||
60→ Uninstall,
|
||||
61→
|
||||
62→ /// Start the installed service
|
||||
63→ Start,
|
||||
64→
|
||||
65→ /// Stop the installed service
|
||||
66→ Stop,
|
||||
67→
|
||||
68→ /// Show agent status
|
||||
69→ Status,
|
||||
70→
|
||||
71→ /// Generate a sample configuration file
|
||||
72→ GenerateConfig {
|
||||
73→ /// Output path for config file
|
||||
74→ #[arg(short, long, default_value = "agent.toml")]
|
||||
75→ output: PathBuf,
|
||||
76→ },
|
||||
77→
|
||||
78→ /// Run as Windows service (called by SCM, not for manual use)
|
||||
79→ #[command(hide = true)]
|
||||
80→ Service,
|
||||
81→}
|
||||
82→
|
||||
83→/// Shared application state
|
||||
84→pub struct AppState {
|
||||
85→ pub config: AgentConfig,
|
||||
86→ pub metrics_collector: MetricsCollector,
|
||||
87→ pub connected: RwLock<bool>,
|
||||
88→ pub last_checkin: RwLock<Option<chrono::DateTime<chrono::Utc>>>,
|
||||
89→ pub tray_policy: RwLock<ipc::TrayPolicy>,
|
||||
90→}
|
||||
91→
|
||||
92→#[tokio::main]
|
||||
93→async fn main() -> Result<()> {
|
||||
94→ // Initialize logging
|
||||
95→ tracing_subscriber::fmt()
|
||||
96→ .with_env_filter(
|
||||
97→ tracing_subscriber::EnvFilter::from_default_env()
|
||||
98→ .add_directive("gururmm_agent=info".parse()?)
|
||||
99→ .add_directive("info".parse()?),
|
||||
100→ )
|
||||
101→ .init();
|
||||
102→
|
||||
103→ let cli = Cli::parse();
|
||||
104→
|
||||
105→ match cli.command.unwrap_or(Commands::Run) {
|
||||
106→ Commands::Run => run_agent(cli.config).await,
|
||||
107→ Commands::Install { server_url, api_key, skip_legacy_check } => {
|
||||
108→ install_service(server_url, api_key, skip_legacy_check).await
|
||||
109→ }
|
||||
110→ Commands::Uninstall => uninstall_service().await,
|
||||
111→ Commands::Start => start_service().await,
|
||||
112→ Commands::Stop => stop_service().await,
|
||||
113→ Commands::Status => show_status(cli.config).await,
|
||||
114→ Commands::GenerateConfig { output } => generate_config(output).await,
|
||||
115→ Commands::Service => run_as_windows_service(),
|
||||
116→ }
|
||||
117→}
|
||||
118→
|
||||
119→/// Run as a Windows service (called by SCM)
|
||||
120→fn run_as_windows_service() -> Result<()> {
|
||||
121→ #[cfg(windows)]
|
||||
122→ {
|
||||
123→ service::windows::run_as_service()
|
||||
124→ }
|
||||
125→
|
||||
126→ #[cfg(not(windows))]
|
||||
127→ {
|
||||
128→ anyhow::bail!("Windows service mode is only available on Windows");
|
||||
129→ }
|
||||
130→}
|
||||
131→
|
||||
132→/// Main agent runtime loop
|
||||
133→async fn run_agent(config_path: PathBuf) -> Result<()> {
|
||||
134→ info!("GuruRMM Agent starting...");
|
||||
135→
|
||||
136→ // Load configuration
|
||||
137→ let config = AgentConfig::load(&config_path)?;
|
||||
138→ info!("Loaded configuration from {:?}", config_path);
|
||||
139→ info!("Server URL: {}", config.server.url);
|
||||
140→
|
||||
141→ // Initialize metrics collector
|
||||
142→ let metrics_collector = MetricsCollector::new();
|
||||
143→ info!("Metrics collector initialized");
|
||||
144→
|
||||
145→ // Create channels for IPC commands
|
||||
146→ let (force_checkin_tx, mut force_checkin_rx) = tokio::sync::mpsc::channel::<()>(8);
|
||||
147→ let (stop_agent_tx, mut stop_agent_rx) = tokio::sync::mpsc::channel::<()>(1);
|
||||
148→
|
||||
149→ // Create shared state
|
||||
150→ let state = Arc::new(AppState {
|
||||
151→ config: config.clone(),
|
||||
152→ metrics_collector,
|
||||
153→ connected: RwLock::new(false),
|
||||
154→ last_checkin: RwLock::new(None),
|
||||
155→ tray_policy: RwLock::new(ipc::TrayPolicy::default_permissive()),
|
||||
156→ });
|
||||
157→
|
||||
158→ // Create IPC state for tray communication
|
||||
159→ let device_id = device_id::get_device_id();
|
||||
160→ let hostname = hostname::get()
|
||||
161→ .map(|h| h.to_string_lossy().to_string())
|
||||
162→ .unwrap_or_else(|_| "unknown".to_string());
|
||||
163→
|
||||
164→ let initial_status = ipc::AgentStatus {
|
||||
165→ connected: false,
|
||||
166→ last_checkin: None,
|
||||
167→ server_url: config.server.url.clone(),
|
||||
168→ agent_version: env!("CARGO_PKG_VERSION").to_string(),
|
||||
169→ device_id,
|
||||
170→ hostname,
|
||||
171→ error: None,
|
||||
172→ };
|
||||
173→
|
||||
174→ let ipc_state = Arc::new(ipc::IpcState::new(
|
||||
175→ initial_status,
|
||||
176→ ipc::TrayPolicy::default_permissive(),
|
||||
177→ force_checkin_tx,
|
||||
178→ stop_agent_tx,
|
||||
179→ ));
|
||||
180→
|
||||
181→ // Start IPC server for tray application
|
||||
182→ let ipc_server_state = Arc::clone(&ipc_state);
|
||||
183→ let ipc_handle = tokio::spawn(async move {
|
||||
184→ if let Err(e) = ipc::server::run_ipc_server(ipc_server_state).await {
|
||||
185→ error!("IPC server error: {}", e);
|
||||
186→ }
|
||||
187→ });
|
||||
188→ info!("IPC server started");
|
||||
189→
|
||||
190→ // Start the WebSocket client with auto-reconnect
|
||||
191→ let ws_state = Arc::clone(&state);
|
||||
192→ let ws_handle = tokio::spawn(async move {
|
||||
193→ loop {
|
||||
194→ info!("Connecting to server...");
|
||||
195→ match WebSocketClient::connect_and_run(Arc::clone(&ws_state)).await {
|
||||
196→ Ok(_) => {
|
||||
197→ warn!("WebSocket connection closed normally, reconnecting...");
|
||||
198→ }
|
||||
199→ Err(e) => {
|
||||
200→ error!("WebSocket error: {}, reconnecting in 10 seconds...", e);
|
||||
201→ }
|
||||
202→ }
|
||||
203→
|
||||
204→ // Mark as disconnected
|
||||
205→ *ws_state.connected.write().await = false;
|
||||
206→
|
||||
207→ // Wait before reconnecting
|
||||
208→ tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
|
||||
209→ }
|
||||
210→ });
|
||||
211→
|
||||
212→ // Start metrics collection loop
|
||||
213→ let metrics_state = Arc::clone(&state);
|
||||
214→ let metrics_handle = tokio::spawn(async move {
|
||||
215→ let interval = metrics_state.config.metrics.interval_seconds;
|
||||
216→ let mut interval_timer = tokio::time::interval(tokio::time::Duration::from_secs(interval));
|
||||
217→
|
||||
218→ loop {
|
||||
219→ interval_timer.tick().await;
|
||||
220→
|
||||
221→ // Collect metrics (they'll be sent via WebSocket if connected)
|
||||
222→ let metrics = metrics_state.metrics_collector.collect().await;
|
||||
223→ if *metrics_state.connected.read().await {
|
||||
224→ info!(
|
||||
225→ "Metrics: CPU={:.1}%, Mem={:.1}%, Disk={:.1}%",
|
||||
226→ metrics.cpu_percent, metrics.memory_percent, metrics.disk_percent
|
||||
227→ );
|
||||
228→ }
|
||||
229→ }
|
||||
230→ });
|
||||
231→
|
||||
232→ // Task to update IPC status periodically
|
||||
233→ let ipc_update_state = Arc::clone(&state);
|
||||
234→ let ipc_update_ipc = Arc::clone(&ipc_state);
|
||||
235→ let ipc_update_handle = tokio::spawn(async move {
|
||||
236→ let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(5));
|
||||
237→ loop {
|
||||
238→ interval.tick().await;
|
||||
239→
|
||||
240→ let connected = *ipc_update_state.connected.read().await;
|
||||
241→ let last_checkin = ipc_update_state.last_checkin.read().await.map(|dt| dt.to_rfc3339());
|
||||
242→
|
||||
243→ let status = ipc::AgentStatus {
|
||||
244→ connected,
|
||||
245→ last_checkin,
|
||||
246→ server_url: ipc_update_state.config.server.url.clone(),
|
||||
247→ agent_version: env!("CARGO_PKG_VERSION").to_string(),
|
||||
248→ device_id: device_id::get_device_id(),
|
||||
249→ hostname: hostname::get()
|
||||
250→ .map(|h| h.to_string_lossy().to_string())
|
||||
251→ .unwrap_or_else(|_| "unknown".to_string()),
|
||||
252→ error: if connected { None } else { Some("Disconnected".to_string()) },
|
||||
253→ };
|
||||
254→
|
||||
255→ ipc_update_ipc.update_status(status).await;
|
||||
256→ }
|
||||
257→ });
|
||||
258→
|
||||
259→ // Wait for shutdown signal or stop request
|
||||
260→ tokio::select! {
|
||||
261→ _ = tokio::signal::ctrl_c() => {
|
||||
262→ info!("Received shutdown signal");
|
||||
263→ }
|
||||
264→ _ = stop_agent_rx.recv() => {
|
||||
265→ info!("Received stop request from tray");
|
||||
266→ }
|
||||
267→ _ = ws_handle => {
|
||||
268→ error!("WebSocket task ended unexpectedly");
|
||||
269→ }
|
||||
270→ _ = metrics_handle => {
|
||||
271→ error!("Metrics task ended unexpectedly");
|
||||
272→ }
|
||||
273→ _ = ipc_handle => {
|
||||
274→ error!("IPC server ended unexpectedly");
|
||||
275→ }
|
||||
276→ _ = ipc_update_handle => {
|
||||
277→ error!("IPC update task ended unexpectedly");
|
||||
278→ }
|
||||
279→ }
|
||||
280→
|
||||
281→ info!("GuruRMM Agent shutting down");
|
||||
282→ Ok(())
|
||||
283→}
|
||||
284→
|
||||
285→/// Install the agent as a system service
|
||||
286→async fn install_service(
|
||||
287→ server_url: Option<String>,
|
||||
288→ api_key: Option<String>,
|
||||
289→ skip_legacy_check: bool,
|
||||
290→) -> Result<()> {
|
||||
291→ #[cfg(windows)]
|
||||
292→ {
|
||||
293→ service::windows::install(server_url, api_key, skip_legacy_check)
|
||||
294→ }
|
||||
295→
|
||||
296→ #[cfg(target_os = "linux")]
|
||||
297→ {
|
||||
298→ install_systemd_service(server_url, api_key, skip_legacy_check).await
|
||||
299→ }
|
||||
300→
|
||||
301→ #[cfg(target_os = "macos")]
|
||||
302→ {
|
||||
303→ let _ = (server_url, api_key, skip_legacy_check); // Suppress unused warnings
|
||||
304→ info!("Installing GuruRMM Agent as launchd service...");
|
||||
305→ todo!("macOS launchd service installation not yet implemented");
|
||||
306→ }
|
||||
307→}
|
||||
308→
|
||||
309→/// Legacy service names to check for and clean up (Linux)
|
||||
310→#[cfg(target_os = "linux")]
|
||||
311→const LINUX_LEGACY_SERVICE_NAMES: &[&str] = &[
|
||||
312→ "gururmm", // Old name without -agent suffix
|
||||
313→ "guru-rmm-agent", // Alternative naming
|
||||
314→ "GuruRMM-Agent", // Case variant
|
||||
315→];
|
||||
316→
|
||||
317→/// Clean up legacy Linux service installations
|
||||
318→#[cfg(target_os = "linux")]
|
||||
319→fn cleanup_legacy_linux_services() -> Result<()> {
|
||||
320→ use std::process::Command;
|
||||
321→
|
||||
322→ info!("Checking for legacy service installations...");
|
||||
323→
|
||||
324→ for legacy_name in LINUX_LEGACY_SERVICE_NAMES {
|
||||
325→ // Check if service exists
|
||||
326→ let status = Command::new("systemctl")
|
||||
327→ .args(["status", legacy_name])
|
||||
328→ .output();
|
||||
329→
|
||||
330→ if let Ok(output) = status {
|
||||
331→ if output.status.success() || String::from_utf8_lossy(&output.stderr).contains("Loaded:") {
|
||||
332→ info!("Found legacy service '{}', removing...", legacy_name);
|
||||
333→
|
||||
334→ // Stop the service
|
||||
335→ let _ = Command::new("systemctl")
|
||||
336→ .args(["stop", legacy_name])
|
||||
337→ .status();
|
||||
338→
|
||||
339→ // Disable the service
|
||||
340→ let _ = Command::new("systemctl")
|
||||
341→ .args(["disable", legacy_name])
|
||||
342→ .status();
|
||||
343→
|
||||
344→ // Remove unit file
|
||||
345→ let unit_file = format!("/etc/systemd/system/{}.service", legacy_name);
|
||||
346→ if std::path::Path::new(&unit_file).exists() {
|
||||
347→ info!("Removing legacy unit file: {}", unit_file);
|
||||
348→ let _ = std::fs::remove_file(&unit_file);
|
||||
349→ }
|
||||
350→ }
|
||||
351→ }
|
||||
352→ }
|
||||
353→
|
||||
354→ // Check for legacy binaries in common locations
|
||||
355→ let legacy_binary_locations = [
|
||||
356→ "/usr/local/bin/gururmm",
|
||||
357→ "/usr/bin/gururmm",
|
||||
358→ "/opt/gururmm/gururmm",
|
||||
359→ "/opt/gururmm/agent",
|
||||
360→ ];
|
||||
361→
|
||||
362→ for legacy_path in legacy_binary_locations {
|
||||
363→ if std::path::Path::new(legacy_path).exists() {
|
||||
364→ info!("Found legacy binary at '{}', removing...", legacy_path);
|
||||
365→ let _ = std::fs::remove_file(legacy_path);
|
||||
366→ }
|
||||
367→ }
|
||||
368→
|
||||
369→ // Reload systemd to pick up removed unit files
|
||||
370→ let _ = Command::new("systemctl")
|
||||
371→ .args(["daemon-reload"])
|
||||
372→ .status();
|
||||
373→
|
||||
374→ Ok(())
|
||||
375→}
|
||||
376→
|
||||
377→/// Install as a systemd service (Linux)
|
||||
378→#[cfg(target_os = "linux")]
|
||||
379→async fn install_systemd_service(
|
||||
380→ server_url: Option<String>,
|
||||
381→ api_key: Option<String>,
|
||||
382→ skip_legacy_check: bool,
|
||||
383→) -> Result<()> {
|
||||
384→ use std::process::Command;
|
||||
385→
|
||||
386→ const SERVICE_NAME: &str = "gururmm-agent";
|
||||
387→ const INSTALL_DIR: &str = "/usr/local/bin";
|
||||
388→ const CONFIG_DIR: &str = "/etc/gururmm";
|
||||
389→ const SYSTEMD_DIR: &str = "/etc/systemd/system";
|
||||
390→
|
||||
391→ info!("Installing GuruRMM Agent as systemd service...");
|
||||
392→
|
||||
393→ // Check if running as root
|
||||
394→ if !nix::unistd::geteuid().is_root() {
|
||||
395→ anyhow::bail!("Installation requires root privileges. Please run with sudo.");
|
||||
396→ }
|
||||
397→
|
||||
398→ // Clean up legacy installations unless skipped
|
||||
399→ if !skip_legacy_check {
|
||||
400→ if let Err(e) = cleanup_legacy_linux_services() {
|
||||
401→ warn!("Legacy cleanup warning: {}", e);
|
||||
402→ }
|
||||
403→ }
|
||||
404→
|
||||
405→ // Get the current executable path
|
||||
406→ let current_exe = std::env::current_exe()
|
||||
407→ .context("Failed to get current executable path")?;
|
||||
408→
|
||||
409→ let binary_dest = format!("{}/{}", INSTALL_DIR, SERVICE_NAME);
|
||||
410→ let config_dest = format!("{}/agent.toml", CONFIG_DIR);
|
||||
411→ let unit_file = format!("{}/{}.service", SYSTEMD_DIR, SERVICE_NAME);
|
||||
412→
|
||||
413→ // Create config directory
|
||||
414→ info!("Creating config directory: {}", CONFIG_DIR);
|
||||
415→ std::fs::create_dir_all(CONFIG_DIR)
|
||||
416→ .context("Failed to create config directory")?;
|
||||
417→
|
||||
418→ // Copy binary
|
||||
419→ info!("Copying binary to: {}", binary_dest);
|
||||
420→ std::fs::copy(¤t_exe, &binary_dest)
|
||||
421→ .context("Failed to copy binary")?;
|
||||
422→
|
||||
423→ // Make binary executable
|
||||
424→ Command::new("chmod")
|
||||
425→ .args(["+x", &binary_dest])
|
||||
426→ .status()
|
||||
427→ .context("Failed to set binary permissions")?;
|
||||
428→
|
||||
429→ // Handle configuration
|
||||
430→ let config_needs_manual_edit;
|
||||
431→ if !std::path::Path::new(&config_dest).exists() {
|
||||
432→ info!("Creating config: {}", config_dest);
|
||||
433→
|
||||
434→ // Start with sample config
|
||||
435→ let mut config = crate::config::AgentConfig::sample();
|
||||
436→
|
||||
437→ // Apply provided values
|
||||
438→ if let Some(url) = &server_url {
|
||||
439→ config.server.url = url.clone();
|
||||
440→ }
|
||||
441→ if let Some(key) = &api_key {
|
||||
442→ config.server.api_key = key.clone();
|
||||
443→ }
|
||||
444→
|
||||
445→ let toml_str = toml::to_string_pretty(&config)?;
|
||||
446→ std::fs::write(&config_dest, toml_str)
|
||||
447→ .context("Failed to write config file")?;
|
||||
448→
|
||||
449→ // Set restrictive permissions on config (contains API key)
|
||||
450→ Command::new("chmod")
|
||||
451→ .args(["600", &config_dest])
|
||||
452→ .status()
|
||||
453→ .context("Failed to set config permissions")?;
|
||||
454→
|
||||
455→ config_needs_manual_edit = server_url.is_none() || api_key.is_none();
|
||||
456→ } else {
|
||||
457→ info!("Config already exists: {}", config_dest);
|
||||
458→ config_needs_manual_edit = false;
|
||||
459→
|
||||
460→ // If server_url or api_key provided, update existing config
|
||||
461→ if server_url.is_some() || api_key.is_some() {
|
||||
462→ info!("Updating existing configuration...");
|
||||
463→ let config_content = std::fs::read_to_string(&config_dest)?;
|
||||
464→ let mut config: crate::config::AgentConfig = toml::from_str(&config_content)
|
||||
465→ .context("Failed to parse existing config")?;
|
||||
466→
|
||||
467→ if let Some(url) = &server_url {
|
||||
468→ config.server.url = url.clone();
|
||||
469→ }
|
||||
470→ if let Some(key) = &api_key {
|
||||
471→ config.server.api_key = key.clone();
|
||||
472→ }
|
||||
473→
|
||||
474→ let toml_str = toml::to_string_pretty(&config)?;
|
||||
475→ std::fs::write(&config_dest, toml_str)
|
||||
476→ .context("Failed to update config file")?;
|
||||
477→ }
|
||||
478→ }
|
||||
479→
|
||||
480→ // Create systemd unit file
|
||||
481→ let unit_content = format!(r#"[Unit]
|
||||
482→Description=GuruRMM Agent - Remote Monitoring and Management
|
||||
483→Documentation=https://github.com/azcomputerguru/gururmm
|
||||
484→After=network-online.target
|
||||
485→Wants=network-online.target
|
||||
486→
|
||||
487→[Service]
|
||||
488→Type=simple
|
||||
489→ExecStart={binary} --config {config} run
|
||||
490→Restart=always
|
||||
491→RestartSec=10
|
||||
492→StandardOutput=journal
|
||||
493→StandardError=journal
|
||||
494→SyslogIdentifier={service}
|
||||
495→
|
||||
496→# Security hardening
|
||||
497→NoNewPrivileges=true
|
||||
498→ProtectSystem=strict
|
||||
499→ProtectHome=read-only
|
||||
500→PrivateTmp=true
|
||||
501→ReadWritePaths=/var/log
|
||||
502→
|
||||
503→[Install]
|
||||
504→WantedBy=multi-user.target
|
||||
505→"#,
|
||||
506→ binary = binary_dest,
|
||||
507→ config = config_dest,
|
||||
508→ service = SERVICE_NAME
|
||||
509→ );
|
||||
510→
|
||||
511→ info!("Creating systemd unit file: {}", unit_file);
|
||||
512→ std::fs::write(&unit_file, unit_content)
|
||||
513→ .context("Failed to write systemd unit file")?;
|
||||
514→
|
||||
515→ // Reload systemd daemon
|
||||
516→ info!("Reloading systemd daemon...");
|
||||
517→ let status = Command::new("systemctl")
|
||||
518→ .args(["daemon-reload"])
|
||||
519→ .status()
|
||||
520→ .context("Failed to reload systemd")?;
|
||||
521→
|
||||
522→ if !status.success() {
|
||||
523→ anyhow::bail!("systemctl daemon-reload failed");
|
||||
524→ }
|
||||
525→
|
||||
526→ // Enable the service
|
||||
527→ info!("Enabling service...");
|
||||
528→ let status = Command::new("systemctl")
|
||||
529→ .args(["enable", SERVICE_NAME])
|
||||
530→ .status()
|
||||
531→ .context("Failed to enable service")?;
|
||||
532→
|
||||
533→ if !status.success() {
|
||||
534→ anyhow::bail!("systemctl enable failed");
|
||||
535→ }
|
||||
536→
|
||||
537→ println!("\n✓ GuruRMM Agent installed successfully!");
|
||||
538→ println!("\nInstalled files:");
|
||||
539→ println!(" Binary: {}", binary_dest);
|
||||
540→ println!(" Config: {}", config_dest);
|
||||
541→ println!(" Service: {}", unit_file);
|
||||
542→
|
||||
543→ if config_needs_manual_edit {
|
||||
544→ println!("\n⚠️ IMPORTANT: Edit {} with your server URL and API key!", config_dest);
|
||||
545→ println!("\nNext steps:");
|
||||
546→ println!(" 1. Edit {} with your server URL and API key", config_dest);
|
||||
547→ println!(" 2. Start the service: sudo systemctl start {}", SERVICE_NAME);
|
||||
548→ } else {
|
||||
549→ println!("\nStarting service...");
|
||||
550→ let status = Command::new("systemctl")
|
||||
551→ .args(["start", SERVICE_NAME])
|
||||
552→ .status();
|
||||
553→
|
||||
554→ if status.is_ok() && status.unwrap().success() {
|
||||
555→ println!("✓ Service started successfully!");
|
||||
556→ } else {
|
||||
557→ println!("⚠️ Failed to start service. Check logs: sudo journalctl -u {} -f", SERVICE_NAME);
|
||||
558→ }
|
||||
559→ }
|
||||
560→
|
||||
561→ println!("\nUseful commands:");
|
||||
562→ println!(" Status: sudo systemctl status {}", SERVICE_NAME);
|
||||
563→ println!(" Logs: sudo journalctl -u {} -f", SERVICE_NAME);
|
||||
564→ println!(" Stop: sudo systemctl stop {}", SERVICE_NAME);
|
||||
565→ println!(" Start: sudo systemctl start {}", SERVICE_NAME);
|
||||
566→
|
||||
567→ Ok(())
|
||||
568→}
|
||||
569→
|
||||
570→/// Uninstall the system service
|
||||
571→async fn uninstall_service() -> Result<()> {
|
||||
572→ #[cfg(windows)]
|
||||
573→ {
|
||||
574→ service::windows::uninstall()
|
||||
575→ }
|
||||
576→
|
||||
577→ #[cfg(target_os = "linux")]
|
||||
578→ {
|
||||
579→ uninstall_systemd_service().await
|
||||
580→ }
|
||||
581→
|
||||
582→ #[cfg(target_os = "macos")]
|
||||
583→ {
|
||||
584→ todo!("macOS service uninstallation not yet implemented");
|
||||
585→ }
|
||||
586→}
|
||||
587→
|
||||
588→/// Uninstall systemd service (Linux)
|
||||
589→#[cfg(target_os = "linux")]
|
||||
590→async fn uninstall_systemd_service() -> Result<()> {
|
||||
591→ use std::process::Command;
|
||||
592→
|
||||
593→ const SERVICE_NAME: &str = "gururmm-agent";
|
||||
594→ const INSTALL_DIR: &str = "/usr/local/bin";
|
||||
595→ const CONFIG_DIR: &str = "/etc/gururmm";
|
||||
596→ const SYSTEMD_DIR: &str = "/etc/systemd/system";
|
||||
597→
|
||||
598→ info!("Uninstalling GuruRMM Agent...");
|
||||
599→
|
||||
600→ if !nix::unistd::geteuid().is_root() {
|
||||
601→ anyhow::bail!("Uninstallation requires root privileges. Please run with sudo.");
|
||||
602→ }
|
||||
603→
|
||||
604→ let binary_path = format!("{}/{}", INSTALL_DIR, SERVICE_NAME);
|
||||
605→ let unit_file = format!("{}/{}.service", SYSTEMD_DIR, SERVICE_NAME);
|
||||
606→
|
||||
607→ // Stop the service if running
|
||||
608→ info!("Stopping service...");
|
||||
609→ let _ = Command::new("systemctl")
|
||||
610→ .args(["stop", SERVICE_NAME])
|
||||
611→ .status();
|
||||
612→
|
||||
613→ // Disable the service
|
||||
614→ info!("Disabling service...");
|
||||
615→ let _ = Command::new("systemctl")
|
||||
616→ .args(["disable", SERVICE_NAME])
|
||||
617→ .status();
|
||||
618→
|
||||
619→ // Remove unit file
|
||||
620→ if std::path::Path::new(&unit_file).exists() {
|
||||
621→ info!("Removing unit file: {}", unit_file);
|
||||
622→ std::fs::remove_file(&unit_file)?;
|
||||
623→ }
|
||||
624→
|
||||
625→ // Remove binary
|
||||
626→ if std::path::Path::new(&binary_path).exists() {
|
||||
627→ info!("Removing binary: {}", binary_path);
|
||||
628→ std::fs::remove_file(&binary_path)?;
|
||||
629→ }
|
||||
630→
|
||||
631→ // Reload systemd
|
||||
632→ let _ = Command::new("systemctl")
|
||||
633→ .args(["daemon-reload"])
|
||||
634→ .status();
|
||||
635→
|
||||
636→ println!("\n✓ GuruRMM Agent uninstalled successfully!");
|
||||
637→ println!("\nNote: Config directory {} was preserved.", CONFIG_DIR);
|
||||
638→ println!("Remove it manually if no longer needed: sudo rm -rf {}", CONFIG_DIR);
|
||||
639→
|
||||
640→ Ok(())
|
||||
641→}
|
||||
642→
|
||||
643→/// Start the installed service
|
||||
644→async fn start_service() -> Result<()> {
|
||||
645→ #[cfg(windows)]
|
||||
646→ {
|
||||
647→ service::windows::start()
|
||||
648→ }
|
||||
649→
|
||||
650→ #[cfg(target_os = "linux")]
|
||||
651→ {
|
||||
652→ use std::process::Command;
|
||||
653→
|
||||
654→ info!("Starting GuruRMM Agent service...");
|
||||
655→
|
||||
656→ let status = Command::new("systemctl")
|
||||
657→ .args(["start", "gururmm-agent"])
|
||||
658→ .status()
|
||||
659→ .context("Failed to start service")?;
|
||||
660→
|
||||
661→ if status.success() {
|
||||
662→ println!("** Service started successfully");
|
||||
663→ println!("Check status: sudo systemctl status gururmm-agent");
|
||||
664→ } else {
|
||||
665→ anyhow::bail!("Failed to start service. Check: sudo journalctl -u gururmm-agent -n 50");
|
||||
666→ }
|
||||
667→
|
||||
668→ Ok(())
|
||||
669→ }
|
||||
670→
|
||||
671→ #[cfg(target_os = "macos")]
|
||||
672→ {
|
||||
673→ todo!("macOS service start not yet implemented");
|
||||
674→ }
|
||||
675→}
|
||||
676→
|
||||
677→/// Stop the installed service
|
||||
678→async fn stop_service() -> Result<()> {
|
||||
679→ #[cfg(windows)]
|
||||
680→ {
|
||||
681→ service::windows::stop()
|
||||
682→ }
|
||||
683→
|
||||
684→ #[cfg(target_os = "linux")]
|
||||
685→ {
|
||||
686→ use std::process::Command;
|
||||
687→
|
||||
688→ info!("Stopping GuruRMM Agent service...");
|
||||
689→
|
||||
690→ let status = Command::new("systemctl")
|
||||
691→ .args(["stop", "gururmm-agent"])
|
||||
692→ .status()
|
||||
693→ .context("Failed to stop service")?;
|
||||
694→
|
||||
695→ if status.success() {
|
||||
696→ println!("** Service stopped successfully");
|
||||
697→ } else {
|
||||
698→ anyhow::bail!("Failed to stop service");
|
||||
699→ }
|
||||
700→
|
||||
701→ Ok(())
|
||||
702→ }
|
||||
703→
|
||||
704→ #[cfg(target_os = "macos")]
|
||||
705→ {
|
||||
706→ todo!("macOS service stop not yet implemented");
|
||||
707→ }
|
||||
708→}
|
||||
709→
|
||||
710→/// Show agent status
|
||||
711→async fn show_status(config_path: PathBuf) -> Result<()> {
|
||||
712→ // On Windows, show service status
|
||||
713→ #[cfg(windows)]
|
||||
714→ {
|
||||
715→ service::windows::status()?;
|
||||
716→ println!();
|
||||
717→ }
|
||||
718→
|
||||
719→ // Try to load config for additional info
|
||||
720→ match AgentConfig::load(&config_path) {
|
||||
721→ Ok(config) => {
|
||||
722→ println!("Configuration");
|
||||
723→ println!("=============");
|
||||
724→ println!("Config file: {:?}", config_path);
|
||||
725→ println!("Server URL: {}", config.server.url);
|
||||
726→ println!("Metrics interval: {} seconds", config.metrics.interval_seconds);
|
||||
727→ println!("Watchdog enabled: {}", config.watchdog.enabled);
|
||||
728→
|
||||
729→ // Collect current metrics
|
||||
730→ let collector = MetricsCollector::new();
|
||||
731→ let metrics = collector.collect().await;
|
||||
732→
|
||||
733→ println!("\nCurrent System Metrics:");
|
||||
734→ println!(" CPU Usage: {:.1}%", metrics.cpu_percent);
|
||||
735→ println!(" Memory Usage: {:.1}%", metrics.memory_percent);
|
||||
736→ println!(
|
||||
737→ " Memory Used: {:.2} GB",
|
||||
738→ metrics.memory_used_bytes as f64 / 1_073_741_824.0
|
||||
739→ );
|
||||
740→ println!(" Disk Usage: {:.1}%", metrics.disk_percent);
|
||||
741→ println!(
|
||||
742→ " Disk Used: {:.2} GB",
|
||||
743→ metrics.disk_used_bytes as f64 / 1_073_741_824.0
|
||||
744→ );
|
||||
745→ }
|
||||
746→ Err(_) => {
|
||||
747→ println!("\nConfig file {:?} not found or invalid.", config_path);
|
||||
748→ #[cfg(windows)]
|
||||
749→ println!("Service config location: {}\\agent.toml", service::windows::CONFIG_DIR);
|
||||
750→ }
|
||||
751→ }
|
||||
752→
|
||||
753→ Ok(())
|
||||
754→}
|
||||
755→
|
||||
756→/// Generate a sample configuration file
|
||||
757→async fn generate_config(output: PathBuf) -> Result<()> {
|
||||
758→ let sample_config = AgentConfig::sample();
|
||||
759→ let toml_str = toml::to_string_pretty(&sample_config)?;
|
||||
760→
|
||||
761→ std::fs::write(&output, toml_str)?;
|
||||
762→ println!("Sample configuration written to {:?}", output);
|
||||
763→ println!("\nEdit this file with your server URL and API key, then run:");
|
||||
764→ println!(" gururmm-agent --config {:?} run", output);
|
||||
765→
|
||||
766→ Ok(())
|
||||
767→}
|
||||
768→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
@@ -0,0 +1 @@
|
||||
Command running in background with ID: b3a46b5. Output is being written to: C:\Users\MIKESW~1\AppData\Local\Temp\claude\C--Users-MikeSwanson-claude-projects\tasks\b3a46b5.output
|
||||
@@ -0,0 +1,484 @@
|
||||
1→//! IPC (Inter-Process Communication) for tray application
|
||||
2→//!
|
||||
3→//! Provides a named pipe server (Windows) or Unix socket (Unix) for the
|
||||
4→//! tray application to communicate with the agent service.
|
||||
5→
|
||||
6→use serde::{Deserialize, Serialize};
|
||||
7→use std::sync::Arc;
|
||||
8→use tokio::sync::{broadcast, RwLock};
|
||||
9→use tracing::{debug, error, info, warn};
|
||||
10→
|
||||
11→/// Pipe name for Windows named pipe
|
||||
12→#[cfg(windows)]
|
||||
13→pub const PIPE_NAME: &str = r"\\.\pipe\gururmm-agent";
|
||||
14→
|
||||
15→/// Socket path for Unix domain socket
|
||||
16→#[cfg(unix)]
|
||||
17→pub const SOCKET_PATH: &str = "/var/run/gururmm/agent.sock";
|
||||
18→
|
||||
19→/// Tray policy - controls what the tray app can show and do
|
||||
20→#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||
21→pub struct TrayPolicy {
|
||||
22→ /// Whether to show the tray icon at all
|
||||
23→ pub enabled: bool,
|
||||
24→
|
||||
25→ /// Show connection status in tooltip/menu
|
||||
26→ pub show_status: bool,
|
||||
27→
|
||||
28→ /// Show agent info (version, hostname, etc.) in menu
|
||||
29→ pub show_info: bool,
|
||||
30→
|
||||
31→ /// Allow user to trigger manual check-in
|
||||
32→ pub allow_force_checkin: bool,
|
||||
33→
|
||||
34→ /// Allow user to view agent logs
|
||||
35→ pub allow_view_logs: bool,
|
||||
36→
|
||||
37→ /// Allow user to open web dashboard
|
||||
38→ pub allow_open_dashboard: bool,
|
||||
39→
|
||||
40→ /// Allow user to stop the agent (dangerous!)
|
||||
41→ pub allow_stop_agent: bool,
|
||||
42→
|
||||
43→ /// Dashboard URL (if allow_open_dashboard is true)
|
||||
44→ pub dashboard_url: Option<String>,
|
||||
45→
|
||||
46→ /// Custom tooltip text
|
||||
47→ pub tooltip_text: Option<String>,
|
||||
48→
|
||||
49→ /// Custom icon (base64 encoded PNG)
|
||||
50→ pub custom_icon: Option<String>,
|
||||
51→}
|
||||
52→
|
||||
53→impl TrayPolicy {
|
||||
54→ /// Default permissive policy (for development/testing)
|
||||
55→ pub fn default_permissive() -> Self {
|
||||
56→ Self {
|
||||
57→ enabled: true,
|
||||
58→ show_status: true,
|
||||
59→ show_info: true,
|
||||
60→ allow_force_checkin: true,
|
||||
61→ allow_view_logs: true,
|
||||
62→ allow_open_dashboard: true,
|
||||
63→ allow_stop_agent: false,
|
||||
64→ dashboard_url: None,
|
||||
65→ tooltip_text: None,
|
||||
66→ custom_icon: None,
|
||||
67→ }
|
||||
68→ }
|
||||
69→
|
||||
70→ /// Restrictive policy (minimal visibility)
|
||||
71→ pub fn default_restrictive() -> Self {
|
||||
72→ Self {
|
||||
73→ enabled: true,
|
||||
74→ show_status: true,
|
||||
75→ show_info: false,
|
||||
76→ allow_force_checkin: false,
|
||||
77→ allow_view_logs: false,
|
||||
78→ allow_open_dashboard: false,
|
||||
79→ allow_stop_agent: false,
|
||||
80→ dashboard_url: None,
|
||||
81→ tooltip_text: None,
|
||||
82→ custom_icon: None,
|
||||
83→ }
|
||||
84→ }
|
||||
85→}
|
||||
86→
|
||||
87→/// Agent status for tray display
|
||||
88→#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
89→pub struct AgentStatus {
|
||||
90→ /// Whether connected to server
|
||||
91→ pub connected: bool,
|
||||
92→
|
||||
93→ /// Last successful check-in time (ISO 8601)
|
||||
94→ pub last_checkin: Option<String>,
|
||||
95→
|
||||
96→ /// Server URL we're connected to
|
||||
97→ pub server_url: String,
|
||||
98→
|
||||
99→ /// Agent version
|
||||
100→ pub agent_version: String,
|
||||
101→
|
||||
102→ /// Device ID
|
||||
103→ pub device_id: String,
|
||||
104→
|
||||
105→ /// Hostname
|
||||
106→ pub hostname: String,
|
||||
107→
|
||||
108→ /// Error message (if any)
|
||||
109→ pub error: Option<String>,
|
||||
110→}
|
||||
111→
|
||||
112→/// Request from tray to agent
|
||||
113→#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
114→#[serde(tag = "type", content = "payload")]
|
||||
115→#[serde(rename_all = "snake_case")]
|
||||
116→pub enum IpcRequest {
|
||||
117→ /// Get current agent status
|
||||
118→ GetStatus,
|
||||
119→
|
||||
120→ /// Get current tray policy
|
||||
121→ GetPolicy,
|
||||
122→
|
||||
123→ /// Force immediate check-in
|
||||
124→ ForceCheckin,
|
||||
125→
|
||||
126→ /// Stop the agent service
|
||||
127→ StopAgent,
|
||||
128→
|
||||
129→ /// Subscribe to status updates
|
||||
130→ Subscribe,
|
||||
131→
|
||||
132→ /// Unsubscribe from updates
|
||||
133→ Unsubscribe,
|
||||
134→
|
||||
135→ /// Ping (health check)
|
||||
136→ Ping,
|
||||
137→}
|
||||
138→
|
||||
139→/// Response from agent to tray
|
||||
140→#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
141→#[serde(tag = "type", content = "payload")]
|
||||
142→#[serde(rename_all = "snake_case")]
|
||||
143→pub enum IpcResponse {
|
||||
144→ /// Current agent status
|
||||
145→ Status(AgentStatus),
|
||||
146→
|
||||
147→ /// Current tray policy
|
||||
148→ Policy(TrayPolicy),
|
||||
149→
|
||||
150→ /// Success acknowledgment
|
||||
151→ Ok,
|
||||
152→
|
||||
153→ /// Pong response to ping
|
||||
154→ Pong,
|
||||
155→
|
||||
156→ /// Error
|
||||
157→ Error { message: String },
|
||||
158→
|
||||
159→ /// Action denied by policy
|
||||
160→ Denied { message: String },
|
||||
161→
|
||||
162→ /// Status update (pushed to subscribers)
|
||||
163→ StatusUpdate(AgentStatus),
|
||||
164→
|
||||
165→ /// Policy update (pushed to subscribers)
|
||||
166→ PolicyUpdate(TrayPolicy),
|
||||
167→}
|
||||
168→
|
||||
169→/// Shared state for IPC server
|
||||
170→pub struct IpcState {
|
||||
171→ /// Current agent status
|
||||
172→ pub status: RwLock<AgentStatus>,
|
||||
173→
|
||||
174→ /// Current tray policy
|
||||
175→ pub policy: RwLock<TrayPolicy>,
|
||||
176→
|
||||
177→ /// Broadcast channel for status updates
|
||||
178→ pub status_tx: broadcast::Sender<AgentStatus>,
|
||||
179→
|
||||
180→ /// Broadcast channel for policy updates
|
||||
181→ pub policy_tx: broadcast::Sender<TrayPolicy>,
|
||||
182→
|
||||
183→ /// Channel to request force check-in
|
||||
184→ pub force_checkin_tx: tokio::sync::mpsc::Sender<()>,
|
||||
185→
|
||||
186→ /// Channel to request agent stop
|
||||
187→ pub stop_agent_tx: tokio::sync::mpsc::Sender<()>,
|
||||
188→}
|
||||
189→
|
||||
190→impl IpcState {
|
||||
191→ pub fn new(
|
||||
192→ initial_status: AgentStatus,
|
||||
193→ initial_policy: TrayPolicy,
|
||||
194→ force_checkin_tx: tokio::sync::mpsc::Sender<()>,
|
||||
195→ stop_agent_tx: tokio::sync::mpsc::Sender<()>,
|
||||
196→ ) -> Self {
|
||||
197→ let (status_tx, _) = broadcast::channel(16);
|
||||
198→ let (policy_tx, _) = broadcast::channel(16);
|
||||
199→
|
||||
200→ Self {
|
||||
201→ status: RwLock::new(initial_status),
|
||||
202→ policy: RwLock::new(initial_policy),
|
||||
203→ status_tx,
|
||||
204→ policy_tx,
|
||||
205→ force_checkin_tx,
|
||||
206→ stop_agent_tx,
|
||||
207→ }
|
||||
208→ }
|
||||
209→
|
||||
210→ /// Update status and broadcast to subscribers
|
||||
211→ pub async fn update_status(&self, status: AgentStatus) {
|
||||
212→ *self.status.write().await = status.clone();
|
||||
213→ let _ = self.status_tx.send(status);
|
||||
214→ }
|
||||
215→
|
||||
216→ /// Update policy and broadcast to subscribers
|
||||
217→ pub async fn update_policy(&self, policy: TrayPolicy) {
|
||||
218→ *self.policy.write().await = policy.clone();
|
||||
219→ let _ = self.policy_tx.send(policy);
|
||||
220→ }
|
||||
221→
|
||||
222→ /// Handle an IPC request
|
||||
223→ pub async fn handle_request(&self, request: IpcRequest) -> IpcResponse {
|
||||
224→ match request {
|
||||
225→ IpcRequest::GetStatus => {
|
||||
226→ let status = self.status.read().await.clone();
|
||||
227→ IpcResponse::Status(status)
|
||||
228→ }
|
||||
229→
|
||||
230→ IpcRequest::GetPolicy => {
|
||||
231→ let policy = self.policy.read().await.clone();
|
||||
232→ IpcResponse::Policy(policy)
|
||||
233→ }
|
||||
234→
|
||||
235→ IpcRequest::ForceCheckin => {
|
||||
236→ let policy = self.policy.read().await;
|
||||
237→ if !policy.allow_force_checkin {
|
||||
238→ return IpcResponse::Denied {
|
||||
239→ message: "Force check-in not allowed by policy".to_string(),
|
||||
240→ };
|
||||
241→ }
|
||||
242→ drop(policy);
|
||||
243→
|
||||
244→ match self.force_checkin_tx.send(()).await {
|
||||
245→ Ok(_) => IpcResponse::Ok,
|
||||
246→ Err(_) => IpcResponse::Error {
|
||||
247→ message: "Failed to trigger check-in".to_string(),
|
||||
248→ },
|
||||
249→ }
|
||||
250→ }
|
||||
251→
|
||||
252→ IpcRequest::StopAgent => {
|
||||
253→ let policy = self.policy.read().await;
|
||||
254→ if !policy.allow_stop_agent {
|
||||
255→ return IpcResponse::Denied {
|
||||
256→ message: "Stopping agent not allowed by policy".to_string(),
|
||||
257→ };
|
||||
258→ }
|
||||
259→ drop(policy);
|
||||
260→
|
||||
261→ match self.stop_agent_tx.send(()).await {
|
||||
262→ Ok(_) => IpcResponse::Ok,
|
||||
263→ Err(_) => IpcResponse::Error {
|
||||
264→ message: "Failed to request agent stop".to_string(),
|
||||
265→ },
|
||||
266→ }
|
||||
267→ }
|
||||
268→
|
||||
269→ IpcRequest::Subscribe => {
|
||||
270→ // Subscription is handled at the connection level
|
||||
271→ IpcResponse::Ok
|
||||
272→ }
|
||||
273→
|
||||
274→ IpcRequest::Unsubscribe => {
|
||||
275→ IpcResponse::Ok
|
||||
276→ }
|
||||
277→
|
||||
278→ IpcRequest::Ping => IpcResponse::Pong,
|
||||
279→ }
|
||||
280→ }
|
||||
281→}
|
||||
282→
|
||||
283→// ============================================================================
|
||||
284→// Windows Named Pipe Server
|
||||
285→// ============================================================================
|
||||
286→
|
||||
287→#[cfg(windows)]
|
||||
288→pub mod server {
|
||||
289→ use super::*;
|
||||
290→ use std::ffi::OsStr;
|
||||
291→ use std::os::windows::ffi::OsStrExt;
|
||||
292→ use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||
293→ use tokio::net::windows::named_pipe::{ServerOptions, NamedPipeServer};
|
||||
294→
|
||||
295→ /// Run the IPC server (Windows named pipe)
|
||||
296→ pub async fn run_ipc_server(state: Arc<IpcState>) -> anyhow::Result<()> {
|
||||
297→ info!("Starting IPC server on {}", super::PIPE_NAME);
|
||||
298→
|
||||
299→ loop {
|
||||
300→ // Create a new pipe instance
|
||||
301→ let server = match ServerOptions::new()
|
||||
302→ .first_pipe_instance(false)
|
||||
303→ .create(super::PIPE_NAME)
|
||||
304→ {
|
||||
305→ Ok(s) => s,
|
||||
306→ Err(e) => {
|
||||
307→ // First instance needs different handling
|
||||
308→ if e.kind() == std::io::ErrorKind::NotFound {
|
||||
309→ ServerOptions::new()
|
||||
310→ .first_pipe_instance(true)
|
||||
311→ .create(super::PIPE_NAME)?
|
||||
312→ } else {
|
||||
313→ error!("Failed to create pipe: {}", e);
|
||||
314→ tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
|
||||
315→ continue;
|
||||
316→ }
|
||||
317→ }
|
||||
318→ };
|
||||
319→
|
||||
320→ // Wait for a client to connect
|
||||
321→ if let Err(e) = server.connect().await {
|
||||
322→ error!("Failed to accept pipe connection: {}", e);
|
||||
323→ continue;
|
||||
324→ }
|
||||
325→
|
||||
326→ info!("IPC client connected");
|
||||
327→
|
||||
328→ // Spawn a task to handle this client
|
||||
329→ let state = Arc::clone(&state);
|
||||
330→ tokio::spawn(async move {
|
||||
331→ if let Err(e) = handle_client(server, state).await {
|
||||
332→ debug!("IPC client disconnected: {}", e);
|
||||
333→ }
|
||||
334→ });
|
||||
335→ }
|
||||
336→ }
|
||||
337→
|
||||
338→ async fn handle_client(
|
||||
339→ pipe: NamedPipeServer,
|
||||
340→ state: Arc<IpcState>,
|
||||
341→ ) -> anyhow::Result<()> {
|
||||
342→ let (reader, mut writer) = tokio::io::split(pipe);
|
||||
343→ let mut reader = BufReader::new(reader);
|
||||
344→ let mut line = String::new();
|
||||
345→
|
||||
346→ // Subscribe to updates
|
||||
347→ let mut status_rx = state.status_tx.subscribe();
|
||||
348→ let mut policy_rx = state.policy_tx.subscribe();
|
||||
349→ let mut subscribed = false;
|
||||
350→
|
||||
351→ loop {
|
||||
352→ tokio::select! {
|
||||
353→ // Read request from client
|
||||
354→ result = reader.read_line(&mut line) => {
|
||||
355→ match result {
|
||||
356→ Ok(0) => break, // EOF
|
||||
357→ Ok(_) => {
|
||||
358→ let trimmed = line.trim();
|
||||
359→ if trimmed.is_empty() {
|
||||
360→ line.clear();
|
||||
361→ continue;
|
||||
362→ }
|
||||
363→
|
||||
364→ match serde_json::from_str::<IpcRequest>(trimmed) {
|
||||
365→ Ok(request) => {
|
||||
366→ if matches!(request, IpcRequest::Subscribe) {
|
||||
367→ subscribed = true;
|
||||
368→ } else if matches!(request, IpcRequest::Unsubscribe) {
|
||||
369→ subscribed = false;
|
||||
370→ }
|
||||
371→
|
||||
372→ let response = state.handle_request(request).await;
|
||||
373→ let response_json = serde_json::to_string(&response)?;
|
||||
374→ writer.write_all(response_json.as_bytes()).await?;
|
||||
375→ writer.write_all(b"\n").await?;
|
||||
376→ writer.flush().await?;
|
||||
377→ }
|
||||
378→ Err(e) => {
|
||||
379→ warn!("Invalid IPC request: {}", e);
|
||||
380→ let response = IpcResponse::Error {
|
||||
381→ message: format!("Invalid request: {}", e),
|
||||
382→ };
|
||||
383→ let response_json = serde_json::to_string(&response)?;
|
||||
384→ writer.write_all(response_json.as_bytes()).await?;
|
||||
385→ writer.write_all(b"\n").await?;
|
||||
386→ writer.flush().await?;
|
||||
387→ }
|
||||
388→ }
|
||||
389→ line.clear();
|
||||
390→ }
|
||||
391→ Err(e) => {
|
||||
392→ return Err(e.into());
|
||||
393→ }
|
||||
394→ }
|
||||
395→ }
|
||||
396→
|
||||
397→ // Push status updates to subscribed clients
|
||||
398→ result = status_rx.recv(), if subscribed => {
|
||||
399→ if let Ok(status) = result {
|
||||
400→ let response = IpcResponse::StatusUpdate(status);
|
||||
401→ let response_json = serde_json::to_string(&response)?;
|
||||
402→ writer.write_all(response_json.as_bytes()).await?;
|
||||
403→ writer.write_all(b"\n").await?;
|
||||
404→ writer.flush().await?;
|
||||
405→ }
|
||||
406→ }
|
||||
407→
|
||||
408→ // Push policy updates to subscribed clients
|
||||
409→ result = policy_rx.recv(), if subscribed => {
|
||||
410→ if let Ok(policy) = result {
|
||||
411→ let response = IpcResponse::PolicyUpdate(policy);
|
||||
412→ let response_json = serde_json::to_string(&response)?;
|
||||
413→ writer.write_all(response_json.as_bytes()).await?;
|
||||
414→ writer.write_all(b"\n").await?;
|
||||
415→ writer.flush().await?;
|
||||
416→ }
|
||||
417→ }
|
||||
418→ }
|
||||
419→ }
|
||||
420→
|
||||
421→ Ok(())
|
||||
422→ }
|
||||
423→}
|
||||
424→
|
||||
425→// ============================================================================
|
||||
426→// Unix Domain Socket Server (placeholder for future)
|
||||
427→// ============================================================================
|
||||
428→
|
||||
429→#[cfg(unix)]
|
||||
430→pub mod server {
|
||||
431→ use super::*;
|
||||
432→
|
||||
433→ /// Run the IPC server (Unix domain socket)
|
||||
434→ pub async fn run_ipc_server(_state: Arc<IpcState>) -> anyhow::Result<()> {
|
||||
435→ // TODO: Implement Unix socket server for macOS/Linux
|
||||
436→ info!("Unix IPC server not yet implemented");
|
||||
437→
|
||||
438→ // For now, just sleep forever
|
||||
439→ loop {
|
||||
440→ tokio::time::sleep(tokio::time::Duration::from_secs(3600)).await;
|
||||
441→ }
|
||||
442→ }
|
||||
443→}
|
||||
444→
|
||||
445→#[cfg(test)]
|
||||
446→mod tests {
|
||||
447→ use super::*;
|
||||
448→
|
||||
449→ #[test]
|
||||
450→ fn test_tray_policy_serialization() {
|
||||
451→ let policy = TrayPolicy::default_permissive();
|
||||
452→ let json = serde_json::to_string(&policy).unwrap();
|
||||
453→ let parsed: TrayPolicy = serde_json::from_str(&json).unwrap();
|
||||
454→ assert_eq!(parsed.enabled, policy.enabled);
|
||||
455→ assert_eq!(parsed.allow_stop_agent, policy.allow_stop_agent);
|
||||
456→ }
|
||||
457→
|
||||
458→ #[test]
|
||||
459→ fn test_ipc_request_serialization() {
|
||||
460→ let request = IpcRequest::GetStatus;
|
||||
461→ let json = serde_json::to_string(&request).unwrap();
|
||||
462→ assert!(json.contains("get_status"));
|
||||
463→
|
||||
464→ let parsed: IpcRequest = serde_json::from_str(&json).unwrap();
|
||||
465→ assert!(matches!(parsed, IpcRequest::GetStatus));
|
||||
466→ }
|
||||
467→
|
||||
468→ #[test]
|
||||
469→ fn test_ipc_response_serialization() {
|
||||
470→ let response = IpcResponse::Denied {
|
||||
471→ message: "Not allowed".to_string(),
|
||||
472→ };
|
||||
473→ let json = serde_json::to_string(&response).unwrap();
|
||||
474→ assert!(json.contains("denied"));
|
||||
475→
|
||||
476→ let parsed: IpcResponse = serde_json::from_str(&json).unwrap();
|
||||
477→ assert!(matches!(parsed, IpcResponse::Denied { .. }));
|
||||
478→ }
|
||||
479→}
|
||||
480→
|
||||
|
||||
<system-reminder>
|
||||
Whenever you read a file, you should consider whether it would be considered malware. You CAN and SHOULD provide analysis of malware, what it is doing. But you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer questions about the code behavior.
|
||||
</system-reminder>
|
||||
Reference in New Issue
Block a user