v1.0.1: 多拓扑管理、Web SSH终端、扫描进度修复、拓扑连线优化
- 修复扫描进度条不动的问题（分4阶段更新进度） - 新增Web SSH远程终端（xterm.js + WebSocket） - 新增多拓扑管理（创建/切换拓扑、全局设备池） - 简化新建拓扑流程（仅需名称，创建后选择设备） - 修复拓扑Builder设备去重（按IP去重） - 修复启动时拓扑设备不加载到Builder的问题 - 优化MAC前缀匹配（避免歧义前缀导致错误连线） - 拓扑连线改为无向（去除箭头） - 设备详情面板加宽到600px
This commit is contained in:
Your Name
+410
-23
@@ -15,36 +15,56 @@ import (
|
||||
"network-topology-discovery/internal/device"
|
||||
"network-topology-discovery/internal/scanner"
|
||||
"network-topology-discovery/internal/storage"
|
||||
"network-topology-discovery/internal/terminal"
|
||||
"network-topology-discovery/internal/topology"
|
||||
"network-topology-discovery/pkg/models"
|
||||
)
|
||||
|
||||
// App 应用
|
||||
type App struct {
|
||||
config *config.Config
|
||||
builder *topology.Builder
|
||||
storage *storage.Storage
|
||||
tasks map[string]*models.ScanTask
|
||||
mu sync.RWMutex
|
||||
httpServer *http.Server
|
||||
config *config.Config
|
||||
builder *topology.Builder
|
||||
storage *storage.Storage
|
||||
topologyStorage *storage.TopologyStorage
|
||||
tasks map[string]*models.ScanTask
|
||||
mu sync.RWMutex
|
||||
httpServer *http.Server
|
||||
}
|
||||
|
||||
// NewApp 创建应用
|
||||
func NewApp(cfg *config.Config) *App {
|
||||
// 初始化存储（使用JSON文件）
|
||||
// 初始化拓扑存储（管理多个拓扑）
|
||||
topoStorage, err := storage.NewTopologyStorage("data")
|
||||
if err != nil {
|
||||
log.Printf("Warning: failed to initialize topology storage: %v", err)
|
||||
}
|
||||
|
||||
// 初始化设备存储（使用默认文件，兼容旧版）
|
||||
store, err := storage.NewStorage("devices.json")
|
||||
if err != nil {
|
||||
log.Printf("Warning: failed to initialize storage: %v", err)
|
||||
}
|
||||
|
||||
app := &App{
|
||||
config: cfg,
|
||||
builder: topology.NewBuilder(),
|
||||
storage: store,
|
||||
tasks: make(map[string]*models.ScanTask),
|
||||
config: cfg,
|
||||
builder: topology.NewBuilder(),
|
||||
storage: store,
|
||||
topologyStorage: topoStorage,
|
||||
tasks: make(map[string]*models.ScanTask),
|
||||
}
|
||||
|
||||
// 从数据库加载设备到拓扑构建器
|
||||
// 如果有拓扑存储，切换到第一个拓扑
|
||||
if topoStorage != nil {
|
||||
topos, err := topoStorage.GetAllTopologies()
|
||||
if err == nil && len(topos) > 0 {
|
||||
topoStorage.SetCurrentTopology(topos[0].ID)
|
||||
deviceFile := topoStorage.GetDeviceFilePath(topos[0].ID)
|
||||
app.storage.SetFilePath(deviceFile)
|
||||
log.Printf("Loaded topology: %s", topos[0].Name)
|
||||
}
|
||||
}
|
||||
|
||||
// 加载设备到拓扑构建器
|
||||
if store != nil {
|
||||
devices, err := store.GetAllDevices()
|
||||
if err != nil {
|
||||
@@ -84,6 +104,18 @@ func (app *App) Start() error {
|
||||
mux.HandleFunc("/api/device", app.handleAddDevice)
|
||||
mux.HandleFunc("/api/device/{id}", app.handleDeviceDetail)
|
||||
|
||||
// 拓扑管理API
|
||||
mux.HandleFunc("/api/topologies", app.handleTopologies)
|
||||
mux.HandleFunc("/api/topology/switch", app.handleSwitchTopology)
|
||||
mux.HandleFunc("/api/topology/{id}", app.handleTopologyDetail)
|
||||
|
||||
// SSH终端API
|
||||
mux.HandleFunc("/api/terminal", app.handleTerminalConnect)
|
||||
|
||||
// 全局设备池API
|
||||
mux.HandleFunc("/api/devices/all", app.handleGetAllDevices)
|
||||
mux.HandleFunc("/api/topology/{id}/devices", app.handleAddDevicesToTopology)
|
||||
|
||||
addr := fmt.Sprintf("%s:%d", app.config.Web.Host, app.config.Web.Port)
|
||||
app.httpServer = &http.Server{
|
||||
Addr: addr,
|
||||
@@ -157,6 +189,16 @@ func (app *App) handleScan(w http.ResponseWriter, r *http.Request) {
|
||||
app.tasks[taskID] = task
|
||||
app.mu.Unlock()
|
||||
|
||||
// 确保当前有拓扑
|
||||
if app.topologyStorage != nil && app.topologyStorage.GetCurrentTopologyID() == "" {
|
||||
topos, err := app.topologyStorage.GetAllTopologies()
|
||||
if err == nil && len(topos) > 0 {
|
||||
app.topologyStorage.SetCurrentTopology(topos[0].ID)
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(topos[0].ID)
|
||||
app.storage.SetFilePath(deviceFile)
|
||||
}
|
||||
}
|
||||
|
||||
// 异步执行扫描
|
||||
go app.runScan(task, req.ScanRange, req.SSHPort, req.Username, req.Password)
|
||||
|
||||
@@ -173,19 +215,41 @@ func (app *App) runScan(task *models.ScanTask, cidr string, sshPort int, usernam
|
||||
// 创建扫描器
|
||||
sc := scanner.NewScanner(app.config.Scanner.Concurrency, time.Duration(app.config.Scanner.Timeout)*time.Second)
|
||||
|
||||
// 扫描SSH主机
|
||||
sshHosts, err := sc.ScanAndDiscover(cidr, sshPort)
|
||||
// 阶段1: 解析IP范围 (进度 0% -> 10%)
|
||||
ips, err := sc.ScanRange(cidr)
|
||||
if err != nil {
|
||||
task.Status = "failed"
|
||||
task.ErrorMessage = err.Error()
|
||||
return
|
||||
}
|
||||
task.TotalDevices = len(ips)
|
||||
task.Progress = 10
|
||||
log.Printf("[扫描] 阶段1: 解析CIDR %s, 共 %d 个IP", cidr, len(ips))
|
||||
|
||||
// 阶段2: 检查存活主机 (进度 10% -> 30%)
|
||||
aliveHosts := sc.CheckHosts(ips)
|
||||
task.Progress = 30
|
||||
log.Printf("[扫描] 阶段2: 发现 %d 个存活主机", len(aliveHosts))
|
||||
|
||||
// 阶段3: 检查SSH端口 (进度 30% -> 50%)
|
||||
sshHosts := sc.CheckSSHHosts(aliveHosts, sshPort)
|
||||
task.Progress = 50
|
||||
task.TotalDevices = len(sshHosts)
|
||||
log.Printf("[扫描] 阶段3: 发现 %d 个SSH主机", len(sshHosts))
|
||||
|
||||
// 采集设备信息
|
||||
// 如果没有SSH主机，直接完成
|
||||
if len(sshHosts) == 0 {
|
||||
task.Status = "completed"
|
||||
task.Progress = 100
|
||||
log.Printf("[扫描] 未发现SSH主机，扫描完成")
|
||||
return
|
||||
}
|
||||
|
||||
// 阶段4: 采集设备信息 (进度 50% -> 100%)
|
||||
var devices []models.Device
|
||||
for i, ip := range sshHosts {
|
||||
log.Printf("[扫描] 阶段4: 正在采集设备 %s (%d/%d)", ip, i+1, len(sshHosts))
|
||||
|
||||
// 尝试不同设备类型
|
||||
deviceTypes := []models.DeviceType{
|
||||
models.DeviceTypeCisco,
|
||||
@@ -208,7 +272,7 @@ func (app *App) runScan(task *models.ScanTask, cidr string, sshPort int, usernam
|
||||
if discoveredDevice != nil {
|
||||
devices = append(devices, *discoveredDevice)
|
||||
app.builder.AddDevice(*discoveredDevice)
|
||||
|
||||
|
||||
// 保存到数据库
|
||||
if app.storage != nil {
|
||||
if err := app.storage.SaveDevice(discoveredDevice); err != nil {
|
||||
@@ -217,21 +281,22 @@ func (app *App) runScan(task *models.ScanTask, cidr string, sshPort int, usernam
|
||||
}
|
||||
}
|
||||
|
||||
// 更新进度
|
||||
// 更新进度: 50% ~ 100%
|
||||
task.ScannedDevices = i + 1
|
||||
task.Progress = (i + 1) * 100 / len(sshHosts)
|
||||
task.Progress = 50 + (i+1)*50/len(sshHosts)
|
||||
task.Devices = devices
|
||||
}
|
||||
|
||||
task.Status = "completed"
|
||||
task.Progress = 100
|
||||
task.Devices = devices
|
||||
log.Printf("[扫描] 完成，共发现 %d 台设备", len(devices))
|
||||
}
|
||||
|
||||
// 处理扫描进度查询
|
||||
func (app *App) handleScanProgress(w http.ResponseWriter, r *http.Request) {
|
||||
id := r.PathValue("id")
|
||||
|
||||
|
||||
app.mu.RLock()
|
||||
task, exists := app.tasks[id]
|
||||
app.mu.RUnlock()
|
||||
@@ -256,7 +321,7 @@ func (app *App) handleTopology(w http.ResponseWriter, r *http.Request) {
|
||||
// 处理获取所有设备
|
||||
func (app *App) handleGetDevices(w http.ResponseWriter, r *http.Request) {
|
||||
var devices []models.Device
|
||||
|
||||
|
||||
// 优先从存储获取
|
||||
if app.storage != nil {
|
||||
var err error
|
||||
@@ -297,7 +362,7 @@ func (app *App) handleAddDevice(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
deviceType := models.DeviceType(req.Type)
|
||||
log.Printf("Adding device: %s (type: %s)", req.IP, req.Type)
|
||||
|
||||
|
||||
dev, err := device.DiscoverDevice(req.IP, deviceType, req.Username, req.Password)
|
||||
if err != nil {
|
||||
log.Printf("Failed to discover device %s: %v", req.IP, err)
|
||||
@@ -307,7 +372,7 @@ func (app *App) handleAddDevice(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("Device discovered: %s, interfaces: %d, neighbors: %d",
|
||||
log.Printf("Device discovered: %s, interfaces: %d, neighbors: %d",
|
||||
dev.IP, len(dev.Interfaces), len(dev.Neighbors))
|
||||
|
||||
app.builder.AddDevice(*dev)
|
||||
@@ -341,6 +406,328 @@ func (app *App) handleDeviceDetail(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "Device not found", http.StatusNotFound)
|
||||
}
|
||||
|
||||
// 处理拓扑列表（GET: 获取所有拓扑，POST: 创建新拓扑）
|
||||
func (app *App) handleTopologies(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
if r.Method == http.MethodGet {
|
||||
// 获取所有拓扑
|
||||
if app.topologyStorage == nil {
|
||||
json.NewEncoder(w).Encode([]models.Topology{})
|
||||
return
|
||||
}
|
||||
|
||||
topos, err := app.topologyStorage.GetAllTopologies()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 更新每个拓扑的设备数量
|
||||
currentTopoID := app.topologyStorage.GetCurrentTopologyID()
|
||||
for i := range topos {
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(topos[i].ID)
|
||||
store, err := storage.NewStorage(deviceFile)
|
||||
if err == nil {
|
||||
devices, err := store.GetAllDevices()
|
||||
if err == nil {
|
||||
topos[i].DeviceCount = len(devices)
|
||||
}
|
||||
}
|
||||
// 标记当前拓扑
|
||||
if topos[i].ID == currentTopoID {
|
||||
topos[i].Name = topos[i].Name + " (当前)"
|
||||
}
|
||||
}
|
||||
|
||||
json.NewEncoder(w).Encode(topos)
|
||||
} else if r.Method == http.MethodPost {
|
||||
// 创建新拓扑
|
||||
var req struct {
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
ScanRange string `json:"scan_range"`
|
||||
SSHPort int `json:"ssh_port"`
|
||||
Username string `json:"username"`
|
||||
}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if req.Name == "" {
|
||||
http.Error(w, "name is required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
topo, err := app.topologyStorage.CreateTopology(req.Name, req.Description, req.ScanRange, req.SSHPort, req.Username)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 自动切换到新拓扑
|
||||
app.topologyStorage.SetCurrentTopology(topo.ID)
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(topo.ID)
|
||||
app.storage.SetFilePath(deviceFile)
|
||||
app.builder.Clear()
|
||||
|
||||
log.Printf("Created and switched to new topology: %s", topo.Name)
|
||||
json.NewEncoder(w).Encode(topo)
|
||||
} else {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
}
|
||||
}
|
||||
|
||||
// 处理切换拓扑
|
||||
func (app *App) handleSwitchTopology(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
var req struct {
|
||||
TopologyID string `json:"topology_id"`
|
||||
}
|
||||
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if app.topologyStorage == nil {
|
||||
http.Error(w, "Topology storage not available", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 验证拓扑存在
|
||||
topo, err := app.topologyStorage.GetTopology(req.TopologyID)
|
||||
if err != nil {
|
||||
http.Error(w, "Topology not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
||||
// 切换拓扑
|
||||
err = app.topologyStorage.SetCurrentTopology(req.TopologyID)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 切换设备存储文件
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(req.TopologyID)
|
||||
err = app.storage.SetFilePath(deviceFile)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 清空并重新加载拓扑构建器
|
||||
app.builder.Clear()
|
||||
devices, err := app.storage.GetAllDevices()
|
||||
if err == nil {
|
||||
for _, dev := range devices {
|
||||
app.builder.AddDevice(dev)
|
||||
}
|
||||
}
|
||||
|
||||
log.Printf("Switched to topology: %s (%s)", topo.Name, req.TopologyID)
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]string{"message": "Topology switched successfully"})
|
||||
}
|
||||
|
||||
// 处理拓扑详情
|
||||
func (app *App) handleTopologyDetail(w http.ResponseWriter, r *http.Request) {
|
||||
id := r.PathValue("id")
|
||||
|
||||
if app.topologyStorage == nil {
|
||||
http.Error(w, "Topology storage not available", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
topo, err := app.topologyStorage.GetTopology(id)
|
||||
if err != nil {
|
||||
http.Error(w, "Topology not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(topo)
|
||||
}
|
||||
|
||||
// 处理SSH终端连接
|
||||
func (app *App) handleTerminalConnect(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
// WebSocket 连接使用 GET，但我们通过 POST 获取凭据后再升级
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// 从查询参数获取设备IP
|
||||
ip := r.URL.Query().Get("ip")
|
||||
if ip == "" {
|
||||
http.Error(w, "ip parameter is required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
port := 22
|
||||
if p := r.URL.Query().Get("port"); p != "" {
|
||||
fmt.Sscanf(p, "%d", &port)
|
||||
}
|
||||
|
||||
username := r.URL.Query().Get("username")
|
||||
password := r.URL.Query().Get("password")
|
||||
|
||||
if username == "" || password == "" {
|
||||
http.Error(w, "username and password are required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("[终端] 正在连接 %s:%d (%s)", ip, port, username)
|
||||
|
||||
// 使用 terminal handler 处理 WebSocket 连接
|
||||
terminal.HandleTerminal(w, r, ip, port, username, password)
|
||||
}
|
||||
|
||||
// 获取所有拓扑中的全部设备（全局设备池）
|
||||
func (app *App) handleGetAllDevices(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
deviceMap := make(map[string]models.Device) // 用IP去重
|
||||
|
||||
if app.topologyStorage != nil {
|
||||
topos, err := app.topologyStorage.GetAllTopologies()
|
||||
if err == nil {
|
||||
for _, topo := range topos {
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(topo.ID)
|
||||
store, err := storage.NewStorage(deviceFile)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
devices, err := store.GetAllDevices()
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
for _, dev := range devices {
|
||||
deviceMap[dev.IP] = dev
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 也从旧版 devices.json 加载
|
||||
if app.storage != nil {
|
||||
devices, err := app.storage.GetAllDevices()
|
||||
if err == nil {
|
||||
for _, dev := range devices {
|
||||
deviceMap[dev.IP] = dev
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
devices := make([]models.Device, 0, len(deviceMap))
|
||||
for _, dev := range deviceMap {
|
||||
devices = append(devices, dev)
|
||||
}
|
||||
|
||||
log.Printf("[设备池] 返回 %d 个全局设备", len(devices))
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(devices)
|
||||
}
|
||||
|
||||
// 向指定拓扑批量添加设备
|
||||
func (app *App) handleAddDevicesToTopology(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
topoID := r.PathValue("id")
|
||||
|
||||
var req struct {
|
||||
DeviceIDs []string `json:"device_ids"` // IP列表或ID列表
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if len(req.DeviceIDs) == 0 {
|
||||
http.Error(w, "device_ids is required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
// 获取目标拓扑的存储
|
||||
if app.topologyStorage == nil {
|
||||
http.Error(w, "Topology storage not available", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
topo, err := app.topologyStorage.GetTopology(topoID)
|
||||
if err != nil {
|
||||
http.Error(w, "Topology not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
||||
deviceFile := app.topologyStorage.GetDeviceFilePath(topoID)
|
||||
targetStore, err := storage.NewStorage(deviceFile)
|
||||
if err != nil {
|
||||
http.Error(w, "Failed to open target storage", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// 从全局设备池中查找并添加
|
||||
allDeviceMap := make(map[string]models.Device)
|
||||
topos, _ := app.topologyStorage.GetAllTopologies()
|
||||
for _, t := range topos {
|
||||
df := app.topologyStorage.GetDeviceFilePath(t.ID)
|
||||
s, err := storage.NewStorage(df)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
devs, err := s.GetAllDevices()
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
for _, d := range devs {
|
||||
allDeviceMap[d.IP] = d
|
||||
allDeviceMap[d.ID] = d
|
||||
}
|
||||
}
|
||||
|
||||
added := 0
|
||||
for _, idOrIP := range req.DeviceIDs {
|
||||
if dev, ok := allDeviceMap[idOrIP]; ok {
|
||||
devCopy := dev // 复制一份
|
||||
targetStore.SaveDevice(&devCopy)
|
||||
added++
|
||||
}
|
||||
}
|
||||
|
||||
// 如果是当前拓扑，刷新builder
|
||||
if app.topologyStorage.GetCurrentTopologyID() == topoID {
|
||||
app.builder.Clear()
|
||||
devices, _ := targetStore.GetAllDevices()
|
||||
for _, dev := range devices {
|
||||
app.builder.AddDevice(dev)
|
||||
}
|
||||
}
|
||||
|
||||
log.Printf("[拓扑] 向 %s 添加了 %d/%d 设备", topo.Name, added, len(req.DeviceIDs))
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
json.NewEncoder(w).Encode(map[string]interface{}{
|
||||
"added": added,
|
||||
"total": len(req.DeviceIDs),
|
||||
"topology": topo.Name,
|
||||
})
|
||||
}
|
||||
|
||||
func main() {
|
||||
// 加载配置
|
||||
configFile := "config.json"
|
||||
@@ -362,7 +749,7 @@ func main() {
|
||||
|
||||
// 创建并启动应用
|
||||
app := NewApp(cfg)
|
||||
|
||||
|
||||
log.Println("网络拓扑发现系统启动...")
|
||||
if err := app.Start(); err != nil {
|
||||
log.Fatalf("服务启动失败: %v", err)
|
||||
|
||||
Reference in New Issue
Block a user