Add VPN configuration tools and agent documentation
Created comprehensive VPN setup tooling for Peaceful Spirit L2TP/IPsec connection and enhanced agent documentation framework. VPN Configuration (PST-NW-VPN): - Setup-PST-L2TP-VPN.ps1: Automated L2TP/IPsec setup with split-tunnel and DNS - Connect-PST-VPN.ps1: Connection helper with PPP adapter detection, DNS (192.168.0.2), and route config (192.168.0.0/24) - Connect-PST-VPN-Standalone.ps1: Self-contained connection script for remote deployment - Fix-PST-VPN-Auth.ps1: Authentication troubleshooting for CHAP/MSChapv2 - Diagnose-VPN-Interface.ps1: Comprehensive VPN interface and routing diagnostic - Quick-Test-VPN.ps1: Fast connectivity verification (DNS/router/routes) - Add-PST-VPN-Route-Manual.ps1: Manual route configuration helper - vpn-connect.bat, vpn-disconnect.bat: Simple batch file shortcuts - OpenVPN config files (Windows-compatible, abandoned for L2TP) Key VPN Implementation Details: - L2TP creates PPP adapter with connection name as interface description - UniFi auto-configures DNS (192.168.0.2) but requires manual route to 192.168.0.0/24 - Split-tunnel enabled (only remote traffic through VPN) - All-user connection for pre-login auto-connect via scheduled task - Authentication: CHAP + MSChapv2 for UniFi compatibility Agent Documentation: - AGENT_QUICK_REFERENCE.md: Quick reference for all specialized agents - documentation-squire.md: Documentation and task management specialist agent - Updated all agent markdown files with standardized formatting Project Organization: - Moved conversation logs to dedicated directories (guru-connect-conversation-logs, guru-rmm-conversation-logs) - Cleaned up old session JSONL files from projects/msp-tools/ - Added guru-connect infrastructure (agent, dashboard, proto, scripts, .gitea workflows) - Added guru-rmm server components and deployment configs Technical Notes: - VPN IP pool: 192.168.4.x (client gets 192.168.4.6) - Remote network: 192.168.0.0/24 (router at 192.168.0.10) - PSK: rrClvnmUeXEFo90Ol+z7tfsAZHeSK6w7 - Credentials: pst-admin / 24Hearts$ Files: 15 VPN scripts, 2 agent docs, conversation log reorganization, guru-connect/guru-rmm infrastructure additions Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
//! WebSocket transport for agent-server communication
|
||||
|
||||
mod websocket;
|
||||
|
||||
pub use websocket::WebSocketTransport;
|
||||
206
projects/msp-tools/guru-connect/agent/src/transport/websocket.rs
Normal file
206
projects/msp-tools/guru-connect/agent/src/transport/websocket.rs
Normal file
@@ -0,0 +1,206 @@
|
||||
//! WebSocket client transport
|
||||
//!
|
||||
//! Handles WebSocket connection to the GuruConnect server with:
|
||||
//! - TLS encryption
|
||||
//! - Automatic reconnection
|
||||
//! - Protobuf message serialization
|
||||
|
||||
use crate::proto::Message;
|
||||
use anyhow::{Context, Result};
|
||||
use bytes::Bytes;
|
||||
use futures_util::{SinkExt, StreamExt};
|
||||
use prost::Message as ProstMessage;
|
||||
use std::collections::VecDeque;
|
||||
use std::sync::Arc;
|
||||
use tokio::net::TcpStream;
|
||||
use tokio::sync::Mutex;
|
||||
use tokio_tungstenite::{
|
||||
connect_async, tungstenite::protocol::Message as WsMessage, MaybeTlsStream, WebSocketStream,
|
||||
};
|
||||
|
||||
type WsStream = WebSocketStream<MaybeTlsStream<TcpStream>>;
|
||||
|
||||
/// WebSocket transport for server communication
|
||||
pub struct WebSocketTransport {
|
||||
stream: Arc<Mutex<WsStream>>,
|
||||
incoming: VecDeque<Message>,
|
||||
connected: bool,
|
||||
}
|
||||
|
||||
impl WebSocketTransport {
|
||||
/// Connect to the server
|
||||
pub async fn connect(
|
||||
url: &str,
|
||||
agent_id: &str,
|
||||
api_key: &str,
|
||||
hostname: Option<&str>,
|
||||
support_code: Option<&str>,
|
||||
) -> Result<Self> {
|
||||
// Build query parameters
|
||||
let mut params = format!("agent_id={}&api_key={}", agent_id, api_key);
|
||||
|
||||
if let Some(hostname) = hostname {
|
||||
params.push_str(&format!("&hostname={}", urlencoding::encode(hostname)));
|
||||
}
|
||||
|
||||
if let Some(code) = support_code {
|
||||
params.push_str(&format!("&support_code={}", code));
|
||||
}
|
||||
|
||||
// Append parameters to URL
|
||||
let url_with_params = if url.contains('?') {
|
||||
format!("{}&{}", url, params)
|
||||
} else {
|
||||
format!("{}?{}", url, params)
|
||||
};
|
||||
|
||||
tracing::info!("Connecting to {} as agent {}", url, agent_id);
|
||||
if let Some(code) = support_code {
|
||||
tracing::info!("Using support code: {}", code);
|
||||
}
|
||||
|
||||
let (ws_stream, response) = connect_async(&url_with_params)
|
||||
.await
|
||||
.context("Failed to connect to WebSocket server")?;
|
||||
|
||||
tracing::info!("Connected, status: {}", response.status());
|
||||
|
||||
Ok(Self {
|
||||
stream: Arc::new(Mutex::new(ws_stream)),
|
||||
incoming: VecDeque::new(),
|
||||
connected: true,
|
||||
})
|
||||
}
|
||||
|
||||
/// Send a protobuf message
|
||||
pub async fn send(&mut self, msg: Message) -> Result<()> {
|
||||
let mut stream = self.stream.lock().await;
|
||||
|
||||
// Serialize to protobuf binary
|
||||
let mut buf = Vec::with_capacity(msg.encoded_len());
|
||||
msg.encode(&mut buf)?;
|
||||
|
||||
// Send as binary WebSocket message
|
||||
stream
|
||||
.send(WsMessage::Binary(buf.into()))
|
||||
.await
|
||||
.context("Failed to send message")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Try to receive a message (non-blocking)
|
||||
pub fn try_recv(&mut self) -> Result<Option<Message>> {
|
||||
// Return buffered message if available
|
||||
if let Some(msg) = self.incoming.pop_front() {
|
||||
return Ok(Some(msg));
|
||||
}
|
||||
|
||||
// Try to receive more messages
|
||||
let stream = self.stream.clone();
|
||||
let result = tokio::task::block_in_place(|| {
|
||||
tokio::runtime::Handle::current().block_on(async {
|
||||
let mut stream = stream.lock().await;
|
||||
|
||||
// Use try_next for non-blocking receive
|
||||
match tokio::time::timeout(
|
||||
std::time::Duration::from_millis(1),
|
||||
stream.next(),
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(Some(Ok(ws_msg))) => Ok(Some(ws_msg)),
|
||||
Ok(Some(Err(e))) => Err(anyhow::anyhow!("WebSocket error: {}", e)),
|
||||
Ok(None) => {
|
||||
// Connection closed
|
||||
Ok(None)
|
||||
}
|
||||
Err(_) => {
|
||||
// Timeout - no message available
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
match result? {
|
||||
Some(ws_msg) => {
|
||||
if let Some(msg) = self.parse_message(ws_msg)? {
|
||||
Ok(Some(msg))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
None => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// Receive a message (blocking)
|
||||
pub async fn recv(&mut self) -> Result<Option<Message>> {
|
||||
// Return buffered message if available
|
||||
if let Some(msg) = self.incoming.pop_front() {
|
||||
return Ok(Some(msg));
|
||||
}
|
||||
|
||||
let result = {
|
||||
let mut stream = self.stream.lock().await;
|
||||
stream.next().await
|
||||
};
|
||||
|
||||
match result {
|
||||
Some(Ok(ws_msg)) => self.parse_message(ws_msg),
|
||||
Some(Err(e)) => {
|
||||
self.connected = false;
|
||||
Err(anyhow::anyhow!("WebSocket error: {}", e))
|
||||
}
|
||||
None => {
|
||||
self.connected = false;
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse a WebSocket message into a protobuf message
|
||||
fn parse_message(&mut self, ws_msg: WsMessage) -> Result<Option<Message>> {
|
||||
match ws_msg {
|
||||
WsMessage::Binary(data) => {
|
||||
let msg = Message::decode(Bytes::from(data))
|
||||
.context("Failed to decode protobuf message")?;
|
||||
Ok(Some(msg))
|
||||
}
|
||||
WsMessage::Ping(data) => {
|
||||
// Pong is sent automatically by tungstenite
|
||||
tracing::trace!("Received ping");
|
||||
Ok(None)
|
||||
}
|
||||
WsMessage::Pong(_) => {
|
||||
tracing::trace!("Received pong");
|
||||
Ok(None)
|
||||
}
|
||||
WsMessage::Close(frame) => {
|
||||
tracing::info!("Connection closed: {:?}", frame);
|
||||
self.connected = false;
|
||||
Ok(None)
|
||||
}
|
||||
WsMessage::Text(text) => {
|
||||
// We expect binary protobuf, but log text messages
|
||||
tracing::warn!("Received unexpected text message: {}", text);
|
||||
Ok(None)
|
||||
}
|
||||
_ => Ok(None),
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if connected
|
||||
pub fn is_connected(&self) -> bool {
|
||||
self.connected
|
||||
}
|
||||
|
||||
/// Close the connection
|
||||
pub async fn close(&mut self) -> Result<()> {
|
||||
let mut stream = self.stream.lock().await;
|
||||
stream.close(None).await?;
|
||||
self.connected = false;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user