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>
103 lines
2.9 KiB
Rust
103 lines
2.9 KiB
Rust
//! WebSocket transport for viewer-server communication
|
|
|
|
use crate::proto;
|
|
use anyhow::{anyhow, Result};
|
|
use bytes::Bytes;
|
|
use futures_util::{SinkExt, StreamExt};
|
|
use prost::Message as ProstMessage;
|
|
use std::sync::Arc;
|
|
use tokio::sync::Mutex;
|
|
use tokio_tungstenite::{
|
|
connect_async,
|
|
tungstenite::protocol::Message as WsMessage,
|
|
MaybeTlsStream, WebSocketStream,
|
|
};
|
|
use tokio::net::TcpStream;
|
|
use tracing::{debug, error, trace};
|
|
|
|
pub type WsSender = futures_util::stream::SplitSink<
|
|
WebSocketStream<MaybeTlsStream<TcpStream>>,
|
|
WsMessage,
|
|
>;
|
|
|
|
pub type WsReceiver = futures_util::stream::SplitStream<
|
|
WebSocketStream<MaybeTlsStream<TcpStream>>,
|
|
>;
|
|
|
|
/// Receiver wrapper that parses protobuf messages
|
|
pub struct MessageReceiver {
|
|
inner: WsReceiver,
|
|
}
|
|
|
|
impl MessageReceiver {
|
|
pub async fn recv(&mut self) -> Option<proto::Message> {
|
|
loop {
|
|
match self.inner.next().await {
|
|
Some(Ok(WsMessage::Binary(data))) => {
|
|
match proto::Message::decode(Bytes::from(data)) {
|
|
Ok(msg) => return Some(msg),
|
|
Err(e) => {
|
|
error!("Failed to decode message: {}", e);
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
Some(Ok(WsMessage::Close(_))) => {
|
|
debug!("WebSocket closed");
|
|
return None;
|
|
}
|
|
Some(Ok(WsMessage::Ping(_))) => {
|
|
trace!("Received ping");
|
|
continue;
|
|
}
|
|
Some(Ok(WsMessage::Pong(_))) => {
|
|
trace!("Received pong");
|
|
continue;
|
|
}
|
|
Some(Ok(_)) => continue,
|
|
Some(Err(e)) => {
|
|
error!("WebSocket error: {}", e);
|
|
return None;
|
|
}
|
|
None => return None,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Connect to the GuruConnect server
|
|
pub async fn connect(url: &str, token: &str) -> Result<(WsSender, MessageReceiver)> {
|
|
// Add auth token to URL
|
|
let full_url = if token.is_empty() {
|
|
url.to_string()
|
|
} else if url.contains('?') {
|
|
format!("{}&token={}", url, urlencoding::encode(token))
|
|
} else {
|
|
format!("{}?token={}", url, urlencoding::encode(token))
|
|
};
|
|
|
|
debug!("Connecting to {}", full_url);
|
|
|
|
let (ws_stream, _) = connect_async(&full_url)
|
|
.await
|
|
.map_err(|e| anyhow!("Failed to connect: {}", e))?;
|
|
|
|
let (sender, receiver) = ws_stream.split();
|
|
|
|
Ok((sender, MessageReceiver { inner: receiver }))
|
|
}
|
|
|
|
/// Send a protobuf message over the WebSocket
|
|
pub async fn send_message(
|
|
sender: &Arc<Mutex<WsSender>>,
|
|
msg: &proto::Message,
|
|
) -> Result<()> {
|
|
let mut buf = Vec::with_capacity(msg.encoded_len());
|
|
msg.encode(&mut buf)?;
|
|
|
|
let mut sender = sender.lock().await;
|
|
sender.send(WsMessage::Binary(buf)).await?;
|
|
|
|
Ok(())
|
|
}
|