From b11283d48848f8824cd71ec6113cd757033848fe Mon Sep 17 00:00:00 2001 From: sagit Date: Fri, 13 Feb 2026 03:06:23 +0000 Subject: [PATCH 1/4] feat(backend): add backup and restore functionality Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus --- go-backend/internal/http/handler/handler.go | 77 ++ .../internal/store/sqlite/repository.go | 1051 +++++++++++++++++ 2 files changed, 1128 insertions(+) diff --git a/go-backend/internal/http/handler/handler.go b/go-backend/internal/http/handler/handler.go index 4bfec49..4fcd49f 100644 --- a/go-backend/internal/http/handler/handler.go +++ b/go-backend/internal/http/handler/handler.go @@ -166,6 +166,9 @@ func (h *Handler) Register(mux *http.ServeMux) { mux.HandleFunc("/api/v1/federation/runtime/diagnose", h.authPeer(h.federationRuntimeDiagnose)) mux.HandleFunc("/api/v1/federation/node/import", h.nodeImport) + mux.HandleFunc("/api/v1/backup/export", h.backupExport) + mux.HandleFunc("/api/v1/backup/import", h.backupImport) + mux.HandleFunc("/flow/test", h.flowTest) mux.HandleFunc("/flow/config", h.flowConfig) mux.HandleFunc("/flow/upload", h.flowUpload) @@ -1108,3 +1111,77 @@ func (h *Handler) verifyCloudflareTurnstile(token, secretKey string) bool { } return body.Success } + +type backupExportRequest struct { + Types []string `json:"types"` +} + +func (h *Handler) backupExport(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + response.WriteJSON(w, response.ErrDefault("请求失败")) + return + } + + var req backupExportRequest + if err := decodeJSON(r.Body, &req); err != nil { + response.WriteJSON(w, response.Err(500, "请求参数错误")) + return + } + + var backup interface{} + var err error + + if len(req.Types) == 0 { + backup, err = h.repo.ExportAll() + } else { + backup, err = h.repo.ExportPartial(req.Types) + } + + if err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + + w.Header().Set("Content-Disposition", "attachment; filename=backup.json") + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(backup); err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } +} + +type backupImportRequest struct { + Types []string `json:"types"` +} + +func (h *Handler) backupImport(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + response.WriteJSON(w, response.ErrDefault("请求失败")) + return + } + + var req backupImportRequest + if err := decodeJSON(r.Body, &req); err != nil { + response.WriteJSON(w, response.Err(500, "请求参数错误")) + return + } + + if len(req.Types) == 0 { + response.WriteJSON(w, response.Err(500, "请选择要导入的数据类型")) + return + } + + var backup sqlite.BackupData + if err := decodeJSON(r.Body, &backup); err != nil { + response.WriteJSON(w, response.Err(500, "备份数据格式错误")) + return + } + + result, err := h.repo.Import(&backup, req.Types) + if err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + + response.WriteJSON(w, response.OK(result)) +} diff --git a/go-backend/internal/store/sqlite/repository.go b/go-backend/internal/store/sqlite/repository.go index 7f6bc00..7251077 100644 --- a/go-backend/internal/store/sqlite/repository.go +++ b/go-backend/internal/store/sqlite/repository.go @@ -1655,3 +1655,1054 @@ func (r *Repository) DeleteFederationTunnelBindingsByTunnel(tunnelID int64) erro var osMkdirAll = func(path string) error { return os.MkdirAll(path, 0o755) } + +// ============ Backup/Export Data Structures ============ + +// BackupData represents the full backup structure +type BackupData struct { + Version string `json:"version"` + ExportedAt int64 `json:"exportedAt"` + Users []UserBackup `json:"users,omitempty"` + Nodes []NodeBackup `json:"nodes,omitempty"` + Tunnels []TunnelBackup `json:"tunnels,omitempty"` + Forwards []ForwardBackup `json:"forwards,omitempty"` + UserTunnels []UserTunnelBackup `json:"userTunnels,omitempty"` + SpeedLimits []SpeedLimitBackup `json:"speedLimits,omitempty"` + TunnelGroups []TunnelGroupBackup `json:"tunnelGroups,omitempty"` + UserGroups []UserGroupBackup `json:"userGroups,omitempty"` + Permissions []PermissionBackup `json:"permissions,omitempty"` + Configs map[string]string `json:"configs,omitempty"` +} + +type UserBackup struct { + ID int64 `json:"id"` + User string `json:"user"` + Pwd string `json:"pwd"` + RoleID int `json:"roleId"` + ExpTime int64 `json:"expTime"` + Flow int64 `json:"flow"` + InFlow int64 `json:"inFlow"` + OutFlow int64 `json:"outFlow"` + FlowResetTime int64 `json:"flowResetTime"` + Num int `json:"num"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime,omitempty"` + Status int `json:"status"` +} + +type NodeBackup struct { + ID int64 `json:"id"` + Name string `json:"name"` + Secret string `json:"secret"` + ServerIP string `json:"serverIp"` + ServerIPv4 string `json:"serverIpV4,omitempty"` + ServerIPv6 string `json:"serverIpV6,omitempty"` + Port string `json:"port"` + InterfaceName string `json:"interfaceName,omitempty"` + Version string `json:"version,omitempty"` + HTTP int `json:"http"` + TLS int `json:"tls"` + Socks int `json:"socks"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime,omitempty"` + Status int `json:"status"` + TCPListenAddr string `json:"tcpListenAddr"` + UDPListenAddr string `json:"udpListenAddr"` + Inx int `json:"inx"` + IsRemote int `json:"isRemote"` + RemoteURL string `json:"remoteUrl,omitempty"` + RemoteToken string `json:"remoteToken,omitempty"` + RemoteConfig string `json:"remoteConfig,omitempty"` +} + +type TunnelBackup struct { + ID int64 `json:"id"` + Name string `json:"name"` + TrafficRatio float64 `json:"trafficRatio"` + Type int `json:"type"` + Protocol string `json:"protocol"` + Flow int64 `json:"flow"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime"` + Status int `json:"status"` + InIP string `json:"inIp,omitempty"` + Inx int `json:"inx"` + ChainTunnels []ChainTunnelBackup `json:"chainTunnels,omitempty"` +} + +type ChainTunnelBackup struct { + ID int64 `json:"id"` + TunnelID int64 `json:"tunnelId"` + ChainType string `json:"chainType"` + NodeID int64 `json:"nodeId"` + Port int `json:"port,omitempty"` + Strategy string `json:"strategy,omitempty"` + Inx int `json:"inx,omitempty"` + Protocol string `json:"protocol,omitempty"` +} + +type ForwardBackup struct { + ID int64 `json:"id"` + UserID int64 `json:"userId"` + UserName string `json:"userName"` + Name string `json:"name"` + TunnelID int64 `json:"tunnelId"` + RemoteAddr string `json:"remoteAddr"` + Strategy string `json:"strategy"` + InFlow int64 `json:"inFlow"` + OutFlow int64 `json:"outFlow"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime"` + Status int `json:"status"` + Inx int `json:"inx"` +} + +type UserTunnelBackup struct { + ID int64 `json:"id"` + UserID int64 `json:"userId"` + TunnelID int64 `json:"tunnelId"` + SpeedID int64 `json:"speedId,omitempty"` + Num int `json:"num"` + Flow int64 `json:"flow"` + InFlow int64 `json:"inFlow"` + OutFlow int64 `json:"outFlow"` + FlowResetTime int64 `json:"flowResetTime"` + ExpTime int64 `json:"expTime"` + Status int `json:"status"` +} + +type SpeedLimitBackup struct { + ID int64 `json:"id"` + Name string `json:"name"` + Speed int64 `json:"speed"` + TunnelID int64 `json:"tunnelId"` + TunnelName string `json:"tunnelName"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime,omitempty"` + Status int `json:"status"` +} + +type TunnelGroupBackup struct { + ID int64 `json:"id"` + Name string `json:"name"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime"` + Status int `json:"status"` + Tunnels []int64 `json:"tunnels,omitempty"` +} + +type UserGroupBackup struct { + ID int64 `json:"id"` + Name string `json:"name"` + CreatedTime int64 `json:"createdTime"` + UpdatedTime int64 `json:"updatedTime"` + Status int `json:"status"` + Users []int64 `json:"users,omitempty"` +} + +type PermissionBackup struct { + ID int64 `json:"id"` + UserGroupID int64 `json:"userGroupId"` + TunnelGroupID int64 `json:"tunnelGroupId"` + CreatedTime int64 `json:"createdTime"` + CreatedByGroup int `json:"createdByGroup"` + Grants []PermissionGrantBackup `json:"grants,omitempty"` +} + +type PermissionGrantBackup struct { + ID int64 `json:"id"` + UserGroupID int64 `json:"userGroupId"` + TunnelGroupID int64 `json:"tunnelGroupId"` + UserTunnelID int64 `json:"userTunnelId"` + CreatedTime int64 `json:"createdTime"` + CreatedByGroup int `json:"createdByGroup"` +} + +// ============ Export Methods ============ + +// ExportAll exports all data as BackupData +func (r *Repository) ExportAll() (*BackupData, error) { + backup := &BackupData{ + Version: "1.0", + ExportedAt: unixMilliNow(), + } + + // Export all data types + users, err := r.exportUsers() + if err != nil { + return nil, fmt.Errorf("export users failed: %w", err) + } + backup.Users = users + + nodes, err := r.exportNodes() + if err != nil { + return nil, fmt.Errorf("export nodes failed: %w", err) + } + backup.Nodes = nodes + + tunnels, err := r.exportTunnels() + if err != nil { + return nil, fmt.Errorf("export tunnels failed: %w", err) + } + backup.Tunnels = tunnels + + forwards, err := r.exportForwards() + if err != nil { + return nil, fmt.Errorf("export forwards failed: %w", err) + } + backup.Forwards = forwards + + userTunnels, err := r.exportUserTunnels() + if err != nil { + return nil, fmt.Errorf("export user tunnels failed: %w", err) + } + backup.UserTunnels = userTunnels + + speedLimits, err := r.exportSpeedLimits() + if err != nil { + return nil, fmt.Errorf("export speed limits failed: %w", err) + } + backup.SpeedLimits = speedLimits + + tunnelGroups, err := r.exportTunnelGroups() + if err != nil { + return nil, fmt.Errorf("export tunnel groups failed: %w", err) + } + backup.TunnelGroups = tunnelGroups + + userGroups, err := r.exportUserGroups() + if err != nil { + return nil, fmt.Errorf("export user groups failed: %w", err) + } + backup.UserGroups = userGroups + + permissions, err := r.exportPermissions() + if err != nil { + return nil, fmt.Errorf("export permissions failed: %w", err) + } + backup.Permissions = permissions + + configs, err := r.ListConfigs() + if err != nil { + return nil, fmt.Errorf("export configs failed: %w", err) + } + backup.Configs = configs + + return backup, nil +} + +// ExportPartial exports selected data types +func (r *Repository) ExportPartial(types []string) (*BackupData, error) { + backup := &BackupData{ + Version: "1.0", + ExportedAt: unixMilliNow(), + } + + typeSet := make(map[string]bool) + for _, t := range types { + typeSet[t] = true + } + + if typeSet["users"] { + users, err := r.exportUsers() + if err != nil { + return nil, fmt.Errorf("export users failed: %w", err) + } + backup.Users = users + } + if typeSet["nodes"] { + nodes, err := r.exportNodes() + if err != nil { + return nil, fmt.Errorf("export nodes failed: %w", err) + } + backup.Nodes = nodes + } + if typeSet["tunnels"] { + tunnels, err := r.exportTunnels() + if err != nil { + return nil, fmt.Errorf("export tunnels failed: %w", err) + } + backup.Tunnels = tunnels + } + if typeSet["forwards"] { + forwards, err := r.exportForwards() + if err != nil { + return nil, fmt.Errorf("export forwards failed: %w", err) + } + backup.Forwards = forwards + } + if typeSet["userTunnels"] { + userTunnels, err := r.exportUserTunnels() + if err != nil { + return nil, fmt.Errorf("export user tunnels failed: %w", err) + } + backup.UserTunnels = userTunnels + } + if typeSet["speedLimits"] { + speedLimits, err := r.exportSpeedLimits() + if err != nil { + return nil, fmt.Errorf("export speed limits failed: %w", err) + } + backup.SpeedLimits = speedLimits + } + if typeSet["tunnelGroups"] { + tunnelGroups, err := r.exportTunnelGroups() + if err != nil { + return nil, fmt.Errorf("export tunnel groups failed: %w", err) + } + backup.TunnelGroups = tunnelGroups + } + if typeSet["userGroups"] { + userGroups, err := r.exportUserGroups() + if err != nil { + return nil, fmt.Errorf("export user groups failed: %w", err) + } + backup.UserGroups = userGroups + } + if typeSet["permissions"] { + permissions, err := r.exportPermissions() + if err != nil { + return nil, fmt.Errorf("export permissions failed: %w", err) + } + backup.Permissions = permissions + } + if typeSet["configs"] { + configs, err := r.ListConfigs() + if err != nil { + return nil, fmt.Errorf("export configs failed: %w", err) + } + backup.Configs = configs + } + + return backup, nil +} + +func (r *Repository) exportUsers() ([]UserBackup, error) { + rows, err := r.db.Query(` + SELECT id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status + FROM user ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var users []UserBackup + for rows.Next() { + var u UserBackup + var updatedTime sql.NullInt64 + if err := rows.Scan(&u.ID, &u.User, &u.Pwd, &u.RoleID, &u.ExpTime, &u.Flow, &u.InFlow, &u.OutFlow, &u.FlowResetTime, &u.Num, &u.CreatedTime, &updatedTime, &u.Status); err != nil { + return nil, err + } + if updatedTime.Valid { + u.UpdatedTime = updatedTime.Int64 + } + users = append(users, u) + } + return users, rows.Err() +} + +func (r *Repository) exportNodes() ([]NodeBackup, error) { + rows, err := r.db.Query(` + SELECT id, name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx, is_remote, remote_url, remote_token, remote_config + FROM node ORDER BY inx ASC, id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var nodes []NodeBackup + for rows.Next() { + var n NodeBackup + var updatedTime sql.NullInt64 + var serverIPv4, serverIPv6, interfaceName, version, remoteURL, remoteToken, remoteConfig sql.NullString + if err := rows.Scan(&n.ID, &n.Name, &n.Secret, &n.ServerIP, &serverIPv4, &serverIPv6, &n.Port, &interfaceName, &version, &n.HTTP, &n.TLS, &n.Socks, &n.CreatedTime, &updatedTime, &n.Status, &n.TCPListenAddr, &n.UDPListenAddr, &n.Inx, &n.IsRemote, &remoteURL, &remoteToken, &remoteConfig); err != nil { + return nil, err + } + if updatedTime.Valid { + n.UpdatedTime = updatedTime.Int64 + } + if serverIPv4.Valid { + n.ServerIPv4 = serverIPv4.String + } + if serverIPv6.Valid { + n.ServerIPv6 = serverIPv6.String + } + if interfaceName.Valid { + n.InterfaceName = interfaceName.String + } + if version.Valid { + n.Version = version.String + } + if remoteURL.Valid { + n.RemoteURL = remoteURL.String + } + if remoteToken.Valid { + n.RemoteToken = remoteToken.String + } + if remoteConfig.Valid { + n.RemoteConfig = remoteConfig.String + } + nodes = append(nodes, n) + } + return nodes, rows.Err() +} + +func (r *Repository) exportTunnels() ([]TunnelBackup, error) { + rows, err := r.db.Query(` + SELECT id, name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx + FROM tunnel ORDER BY inx ASC, id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var tunnels []TunnelBackup + for rows.Next() { + var t TunnelBackup + var inIP sql.NullString + if err := rows.Scan(&t.ID, &t.Name, &t.TrafficRatio, &t.Type, &t.Protocol, &t.Flow, &t.CreatedTime, &t.UpdatedTime, &t.Status, &inIP, &t.Inx); err != nil { + return nil, err + } + if inIP.Valid { + t.InIP = inIP.String + } + // Export chain tunnels + chainTunnels, err := r.exportChainTunnels(t.ID) + if err != nil { + return nil, err + } + t.ChainTunnels = chainTunnels + tunnels = append(tunnels, t) + } + return tunnels, rows.Err() +} + +func (r *Repository) exportChainTunnels(tunnelID int64) ([]ChainTunnelBackup, error) { + rows, err := r.db.Query(` + SELECT id, tunnel_id, chain_type, node_id, port, strategy, inx, protocol + FROM chain_tunnel WHERE tunnel_id = ? ORDER BY inx ASC, id ASC + `, tunnelID) + if err != nil { + return nil, err + } + defer rows.Close() + + var chainTunnels []ChainTunnelBackup + for rows.Next() { + var ct ChainTunnelBackup + var port sql.NullInt64 + if err := rows.Scan(&ct.ID, &ct.TunnelID, &ct.ChainType, &ct.NodeID, &port, &ct.Strategy, &ct.Inx, &ct.Protocol); err != nil { + return nil, err + } + if port.Valid { + ct.Port = int(port.Int64) + } + chainTunnels = append(chainTunnels, ct) + } + return chainTunnels, rows.Err() +} + +func (r *Repository) exportForwards() ([]ForwardBackup, error) { + rows, err := r.db.Query(` + SELECT id, user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx + FROM forward ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var forwards []ForwardBackup + for rows.Next() { + var f ForwardBackup + if err := rows.Scan(&f.ID, &f.UserID, &f.UserName, &f.Name, &f.TunnelID, &f.RemoteAddr, &f.Strategy, &f.InFlow, &f.OutFlow, &f.CreatedTime, &f.UpdatedTime, &f.Status, &f.Inx); err != nil { + return nil, err + } + forwards = append(forwards, f) + } + return forwards, rows.Err() +} + +func (r *Repository) exportUserTunnels() ([]UserTunnelBackup, error) { + rows, err := r.db.Query(` + SELECT id, user_id, tunnel_id, speed_id, num, flow, in_flow, out_flow, flow_reset_time, exp_time, status + FROM user_tunnel ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var userTunnels []UserTunnelBackup + for rows.Next() { + var ut UserTunnelBackup + var speedID sql.NullInt64 + if err := rows.Scan(&ut.ID, &ut.UserID, &ut.TunnelID, &speedID, &ut.Num, &ut.Flow, &ut.InFlow, &ut.OutFlow, &ut.FlowResetTime, &ut.ExpTime, &ut.Status); err != nil { + return nil, err + } + if speedID.Valid { + ut.SpeedID = speedID.Int64 + } + userTunnels = append(userTunnels, ut) + } + return userTunnels, rows.Err() +} + +func (r *Repository) exportSpeedLimits() ([]SpeedLimitBackup, error) { + rows, err := r.db.Query(` + SELECT id, name, speed, tunnel_id, tunnel_name, created_time, updated_time, status + FROM speed_limit ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var speedLimits []SpeedLimitBackup + for rows.Next() { + var sl SpeedLimitBackup + var updatedTime sql.NullInt64 + if err := rows.Scan(&sl.ID, &sl.Name, &sl.Speed, &sl.TunnelID, &sl.TunnelName, &sl.CreatedTime, &updatedTime, &sl.Status); err != nil { + return nil, err + } + if updatedTime.Valid { + sl.UpdatedTime = updatedTime.Int64 + } + speedLimits = append(speedLimits, sl) + } + return speedLimits, rows.Err() +} + +func (r *Repository) exportTunnelGroups() ([]TunnelGroupBackup, error) { + rows, err := r.db.Query(` + SELECT id, name, created_time, updated_time, status + FROM tunnel_group ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var groups []TunnelGroupBackup + for rows.Next() { + var tg TunnelGroupBackup + if err := rows.Scan(&tg.ID, &tg.Name, &tg.CreatedTime, &tg.UpdatedTime, &tg.Status); err != nil { + return nil, err + } + // Get tunnel IDs for this group + tunnelRows, err := r.db.Query(`SELECT tunnel_id FROM tunnel_group_tunnel WHERE tunnel_group_id = ?`, tg.ID) + if err != nil { + return nil, err + } + for tunnelRows.Next() { + var tunnelID int64 + if err := tunnelRows.Scan(&tunnelID); err != nil { + tunnelRows.Close() + return nil, err + } + tg.Tunnels = append(tg.Tunnels, tunnelID) + } + tunnelRows.Close() + groups = append(groups, tg) + } + return groups, rows.Err() +} + +func (r *Repository) exportUserGroups() ([]UserGroupBackup, error) { + rows, err := r.db.Query(` + SELECT id, name, created_time, updated_time, status + FROM user_group ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var groups []UserGroupBackup + for rows.Next() { + var ug UserGroupBackup + if err := rows.Scan(&ug.ID, &ug.Name, &ug.CreatedTime, &ug.UpdatedTime, &ug.Status); err != nil { + return nil, err + } + // Get user IDs for this group + userRows, err := r.db.Query(`SELECT user_id FROM user_group_user WHERE user_group_id = ?`, ug.ID) + if err != nil { + return nil, err + } + for userRows.Next() { + var userID int64 + if err := userRows.Scan(&userID); err != nil { + userRows.Close() + return nil, err + } + ug.Users = append(ug.Users, userID) + } + userRows.Close() + groups = append(groups, ug) + } + return groups, rows.Err() +} + +func (r *Repository) exportPermissions() ([]PermissionBackup, error) { + rows, err := r.db.Query(` + SELECT id, user_group_id, tunnel_group_id, created_time, created_by_group + FROM group_permission ORDER BY id ASC + `) + if err != nil { + return nil, err + } + defer rows.Close() + + var permissions []PermissionBackup + for rows.Next() { + var p PermissionBackup + if err := rows.Scan(&p.ID, &p.UserGroupID, &p.TunnelGroupID, &p.CreatedTime, &p.CreatedByGroup); err != nil { + return nil, err + } + // Get grants for this permission + grantRows, err := r.db.Query(`SELECT id, user_group_id, tunnel_group_id, user_tunnel_id, created_time, created_by_group FROM group_permission_grant WHERE user_group_id = ? AND tunnel_group_id = ?`, p.UserGroupID, p.TunnelGroupID) + if err != nil { + return nil, err + } + for grantRows.Next() { + var g PermissionGrantBackup + if err := grantRows.Scan(&g.ID, &g.UserGroupID, &g.TunnelGroupID, &g.UserTunnelID, &g.CreatedTime, &g.CreatedByGroup); err != nil { + grantRows.Close() + return nil, err + } + p.Grants = append(p.Grants, g) + } + grantRows.Close() + permissions = append(permissions, p) + } + return permissions, rows.Err() +} + +// ============ Import Methods ============ + +// ImportResult contains the result of an import operation +type ImportResult struct { + UsersImported int `json:"usersImported"` + NodesImported int `json:"nodesImported"` + TunnelsImported int `json:"tunnelsImported"` + ForwardsImported int `json:"forwardsImported"` + UserTunnelsImported int `json:"userTunnelsImported"` + SpeedLimitsImported int `json:"speedLimitsImported"` + TunnelGroupsImported int `json:"tunnelGroupsImported"` + UserGroupsImported int `json:"userGroupsImported"` + PermissionsImported int `json:"permissionsImported"` + ConfigsImported int `json:"configsImported"` +} + +// Import imports data from BackupData +func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, error) { + result := &ImportResult{} + + typeSet := make(map[string]bool) + for _, t := range types { + typeSet[t] = true + } + + now := unixMilliNow() + + if typeSet["users"] && len(backup.Users) > 0 { + count, err := r.importUsers(backup.Users, now) + if err != nil { + return nil, fmt.Errorf("import users failed: %w", err) + } + result.UsersImported = count + } + + if typeSet["nodes"] && len(backup.Nodes) > 0 { + count, err := r.importNodes(backup.Nodes, now) + if err != nil { + return nil, fmt.Errorf("import nodes failed: %w", err) + } + result.NodesImported = count + } + + if typeSet["tunnels"] && len(backup.Tunnels) > 0 { + count, err := r.importTunnels(backup.Tunnels, now) + if err != nil { + return nil, fmt.Errorf("import tunnels failed: %w", err) + } + result.TunnelsImported = count + } + + if typeSet["forwards"] && len(backup.Forwards) > 0 { + count, err := r.importForwards(backup.Forwards, now) + if err != nil { + return nil, fmt.Errorf("import forwards failed: %w", err) + } + result.ForwardsImported = count + } + + if typeSet["userTunnels"] && len(backup.UserTunnels) > 0 { + count, err := r.importUserTunnels(backup.UserTunnels, now) + if err != nil { + return nil, fmt.Errorf("import user tunnels failed: %w", err) + } + result.UserTunnelsImported = count + } + + if typeSet["speedLimits"] && len(backup.SpeedLimits) > 0 { + count, err := r.importSpeedLimits(backup.SpeedLimits, now) + if err != nil { + return nil, fmt.Errorf("import speed limits failed: %w", err) + } + result.SpeedLimitsImported = count + } + + if typeSet["tunnelGroups"] && len(backup.TunnelGroups) > 0 { + count, err := r.importTunnelGroups(backup.TunnelGroups, now) + if err != nil { + return nil, fmt.Errorf("import tunnel groups failed: %w", err) + } + result.TunnelGroupsImported = count + } + + if typeSet["userGroups"] && len(backup.UserGroups) > 0 { + count, err := r.importUserGroups(backup.UserGroups, now) + if err != nil { + return nil, fmt.Errorf("import user groups failed: %w", err) + } + result.UserGroupsImported = count + } + + if typeSet["permissions"] && len(backup.Permissions) > 0 { + count, err := r.importPermissions(backup.Permissions, now) + if err != nil { + return nil, fmt.Errorf("import permissions failed: %w", err) + } + result.PermissionsImported = count + } + + if typeSet["configs"] && len(backup.Configs) > 0 { + count, err := r.importConfigs(backup.Configs, now) + if err != nil { + return nil, fmt.Errorf("import configs failed: %w", err) + } + result.ConfigsImported = count + } + + return result, nil +} + +func (r *Repository) importUsers(users []UserBackup, now int64) (int, error) { + count := 0 + for _, u := range users { + // Check if user exists + exists, err := r.UsernameExists(u.User) + if err != nil { + return count, err + } + if exists { + // Update existing + _, err = r.db.Exec(` + UPDATE user SET pwd = ?, role_id = ?, exp_time = ?, flow = ?, in_flow = ?, out_flow = ?, flow_reset_time = ?, num = ?, updated_time = ?, status = ? + WHERE id = ? + `, u.Pwd, u.RoleID, u.ExpTime, u.Flow, u.InFlow, u.OutFlow, u.FlowResetTime, u.Num, now, u.Status, u.ID) + if err != nil { + return count, err + } + } else { + // Insert new + _, err = r.db.Exec(` + INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + `, u.ID, u.User, u.Pwd, u.RoleID, u.ExpTime, u.Flow, u.InFlow, u.OutFlow, u.FlowResetTime, u.Num, u.CreatedTime, now, u.Status) + if err != nil { + return count, err + } + } + count++ + } + return count, nil +} + +func (r *Repository) UsernameExists(username string) (bool, error) { + var count int + err := r.db.QueryRow(`SELECT COUNT(1) FROM user WHERE user = ?`, username).Scan(&count) + if err != nil { + return false, err + } + return count > 0, nil +} + +func (r *Repository) importNodes(nodes []NodeBackup, now int64) (int, error) { + count := 0 + for _, n := range nodes { + // Check if node exists + _, err := r.GetNodeByID(n.ID) + if err != nil { + return count, err + } + // Use upsert pattern + _, err = r.db.Exec(` + INSERT INTO node(id, name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx, is_remote, remote_url, remote_token, remote_config) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + name = excluded.name, + secret = excluded.secret, + server_ip = excluded.server_ip, + server_ip_v4 = excluded.server_ip_v4, + server_ip_v6 = excluded.server_ip_v6, + port = excluded.port, + interface_name = excluded.interface_name, + version = excluded.version, + http = excluded.http, + tls = excluded.tls, + socks = excluded.socks, + updated_time = excluded.updated_time, + status = excluded.status, + tcp_listen_addr = excluded.tcp_listen_addr, + udp_listen_addr = excluded.udp_listen_addr, + inx = excluded.inx, + is_remote = excluded.is_remote, + remote_url = excluded.remote_url, + remote_token = excluded.remote_token, + remote_config = excluded.remote_config + `, n.ID, n.Name, n.Secret, n.ServerIP, n.ServerIPv4, n.ServerIPv6, n.Port, n.InterfaceName, n.Version, n.HTTP, n.TLS, n.Socks, n.CreatedTime, now, n.Status, n.TCPListenAddr, n.UDPListenAddr, n.Inx, n.IsRemote, n.RemoteURL, n.RemoteToken, n.RemoteConfig) + if err != nil { + return count, err + } + count++ + } + return count, nil +} + +func (r *Repository) importTunnels(tunnels []TunnelBackup, now int64) (int, error) { + count := 0 + for _, t := range tunnels { + _, err := r.db.Exec(` + INSERT INTO tunnel(id, name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + name = excluded.name, + traffic_ratio = excluded.traffic_ratio, + type = excluded.type, + protocol = excluded.protocol, + flow = excluded.flow, + updated_time = excluded.updated_time, + status = excluded.status, + in_ip = excluded.in_ip, + inx = excluded.inx + `, t.ID, t.Name, t.TrafficRatio, t.Type, t.Protocol, t.Flow, t.CreatedTime, now, t.Status, t.InIP, t.Inx) + if err != nil { + return count, err + } + // Import chain tunnels + if len(t.ChainTunnels) > 0 { + for _, ct := range t.ChainTunnels { + _, err = r.db.Exec(` + INSERT INTO chain_tunnel(id, tunnel_id, chain_type, node_id, port, strategy, inx, protocol) + VALUES(?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + chain_type = excluded.chain_type, + node_id = excluded.node_id, + port = excluded.port, + strategy = excluded.strategy, + inx = excluded.inx, + protocol = excluded.protocol + `, ct.ID, ct.TunnelID, ct.ChainType, ct.NodeID, ct.Port, ct.Strategy, ct.Inx, ct.Protocol) + if err != nil { + return count, err + } + } + } + count++ + } + return count, nil +} + +func (r *Repository) importForwards(forwards []ForwardBackup, now int64) (int, error) { + count := 0 + for _, f := range forwards { + _, err := r.db.Exec(` + INSERT INTO forward(id, user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + user_id = excluded.user_id, + user_name = excluded.user_name, + name = excluded.name, + tunnel_id = excluded.tunnel_id, + remote_addr = excluded.remote_addr, + strategy = excluded.strategy, + in_flow = excluded.in_flow, + out_flow = excluded.out_flow, + updated_time = excluded.updated_time, + status = excluded.status, + inx = excluded.inx + `, f.ID, f.UserID, f.UserName, f.Name, f.TunnelID, f.RemoteAddr, f.Strategy, f.InFlow, f.OutFlow, f.CreatedTime, now, f.Status, f.Inx) + if err != nil { + return count, err + } + count++ + } + return count, nil +} + +func (r *Repository) importUserTunnels(userTunnels []UserTunnelBackup, now int64) (int, error) { + count := 0 + for _, ut := range userTunnels { + var speedID interface{} + if ut.SpeedID > 0 { + speedID = ut.SpeedID + } + _, err := r.db.Exec(` + INSERT INTO user_tunnel(id, user_id, tunnel_id, speed_id, num, flow, in_flow, out_flow, flow_reset_time, exp_time, status) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + user_id = excluded.user_id, + tunnel_id = excluded.tunnel_id, + speed_id = excluded.speed_id, + num = excluded.num, + flow = excluded.flow, + in_flow = excluded.in_flow, + out_flow = excluded.out_flow, + flow_reset_time = excluded.flow_reset_time, + exp_time = excluded.exp_time, + status = excluded.status + `, ut.ID, ut.UserID, ut.TunnelID, speedID, ut.Num, ut.Flow, ut.InFlow, ut.OutFlow, ut.FlowResetTime, ut.ExpTime, ut.Status) + if err != nil { + return count, err + } + count++ + } + return count, nil +} + +func (r *Repository) importSpeedLimits(speedLimits []SpeedLimitBackup, now int64) (int, error) { + count := 0 + for _, sl := range speedLimits { + _, err := r.db.Exec(` + INSERT INTO speed_limit(id, name, speed, tunnel_id, tunnel_name, created_time, updated_time, status) + VALUES(?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + name = excluded.name, + speed = excluded.speed, + tunnel_id = excluded.tunnel_id, + tunnel_name = excluded.tunnel_name, + updated_time = excluded.updated_time, + status = excluded.status + `, sl.ID, sl.Name, sl.Speed, sl.TunnelID, sl.TunnelName, sl.CreatedTime, now, sl.Status) + if err != nil { + return count, err + } + count++ + } + return count, nil +} + +func (r *Repository) importTunnelGroups(tunnelGroups []TunnelGroupBackup, now int64) (int, error) { + count := 0 + for _, tg := range tunnelGroups { + _, err := r.db.Exec(` + INSERT INTO tunnel_group(id, name, created_time, updated_time, status) + VALUES(?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + name = excluded.name, + updated_time = excluded.updated_time, + status = excluded.status + `, tg.ID, tg.Name, tg.CreatedTime, now, tg.Status) + if err != nil { + return count, err + } + // Update tunnel group memberships + _, err = r.db.Exec(`DELETE FROM tunnel_group_tunnel WHERE tunnel_group_id = ?`, tg.ID) + if err != nil { + return count, err + } + for _, tunnelID := range tg.Tunnels { + _, err = r.db.Exec(` + INSERT INTO tunnel_group_tunnel(tunnel_group_id, tunnel_id, created_time) + VALUES(?, ?, ?) + `, tg.ID, tunnelID, now) + if err != nil { + return count, err + } + } + count++ + } + return count, nil +} + +func (r *Repository) importUserGroups(userGroups []UserGroupBackup, now int64) (int, error) { + count := 0 + for _, ug := range userGroups { + _, err := r.db.Exec(` + INSERT INTO user_group(id, name, created_time, updated_time, status) + VALUES(?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + name = excluded.name, + updated_time = excluded.updated_time, + status = excluded.status + `, ug.ID, ug.Name, ug.CreatedTime, now, ug.Status) + if err != nil { + return count, err + } + // Update user group memberships + _, err = r.db.Exec(`DELETE FROM user_group_user WHERE user_group_id = ?`, ug.ID) + if err != nil { + return count, err + } + for _, userID := range ug.Users { + _, err = r.db.Exec(` + INSERT INTO user_group_user(user_group_id, user_id, created_time) + VALUES(?, ?, ?) + `, ug.ID, userID, now) + if err != nil { + return count, err + } + } + count++ + } + return count, nil +} + +func (r *Repository) importPermissions(permissions []PermissionBackup, now int64) (int, error) { + count := 0 + for _, p := range permissions { + _, err := r.db.Exec(` + INSERT INTO group_permission(id, user_group_id, tunnel_group_id, created_time, created_by_group) + VALUES(?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + user_group_id = excluded.user_group_id, + tunnel_group_id = excluded.tunnel_group_id, + created_by_group = excluded.created_by_group + `, p.ID, p.UserGroupID, p.TunnelGroupID, p.CreatedTime, p.CreatedByGroup) + if err != nil { + return count, err + } + // Import grants + for _, g := range p.Grants { + _, err = r.db.Exec(` + INSERT INTO group_permission_grant(id, user_group_id, tunnel_group_id, user_tunnel_id, created_time, created_by_group) + VALUES(?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + user_tunnel_id = excluded.user_tunnel_id, + created_by_group = excluded.created_by_group + `, g.ID, g.UserGroupID, g.TunnelGroupID, g.UserTunnelID, g.CreatedTime, g.CreatedByGroup) + if err != nil { + return count, err + } + } + count++ + } + return count, nil +} + +func (r *Repository) importConfigs(configs map[string]string, now int64) (int, error) { + count := 0 + for name, value := range configs { + err := r.UpsertConfig(name, value, now) + if err != nil { + return count, err + } + count++ + } + return count, nil +} From f879a58bb465d47f75264fd36caadf7680dc05d7 Mon Sep 17 00:00:00 2001 From: sagit Date: Fri, 13 Feb 2026 03:06:32 +0000 Subject: [PATCH 2/4] feat(frontend): add backup export and import UI Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus --- vite-frontend/src/api/index.ts | 43 ++++++ vite-frontend/src/pages/config.tsx | 205 ++++++++++++++++++++++++++++- 2 files changed, 245 insertions(+), 3 deletions(-) diff --git a/vite-frontend/src/api/index.ts b/vite-frontend/src/api/index.ts index f0b56d2..0863be0 100644 --- a/vite-frontend/src/api/index.ts +++ b/vite-frontend/src/api/index.ts @@ -210,3 +210,46 @@ export const importRemoteNode = (data: { remoteUrl: string; token: string; }) => Network.post("/federation/node/import", data); + +import axios from "axios"; + +export interface BackupTypes { + users?: boolean; + nodes?: boolean; + tunnels?: boolean; + forwards?: boolean; + userTunnels?: boolean; + speedLimits?: boolean; + tunnelGroups?: boolean; + userGroups?: boolean; + permissions?: boolean; + configs?: boolean; +} + +export const exportBackup = async (types: string[] = []) => { + const token = window.localStorage.getItem("token"); + const baseURL = axios.defaults.baseURL || "/api/v1/"; + + const response = await axios.post(`${baseURL}/backup/export`, { types }, { + headers: { + Authorization: token, + "Content-Type": "application/json", + }, + responseType: "blob", + }); + + const url = window.URL.createObjectURL(new Blob([response.data])); + const link = document.createElement("a"); + link.href = url; + const timestamp = new Date().toISOString().slice(0, 19).replace(/[:-]/g, ""); + link.setAttribute("download", `backup_${timestamp}.json`); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + window.URL.revokeObjectURL(url); +}; + +export const importBackup = (data: { + types: string[]; + [key: string]: any; +}) => Network.post("/backup/import", data); diff --git a/vite-frontend/src/pages/config.tsx b/vite-frontend/src/pages/config.tsx index 4ee5498..71bc198 100644 --- a/vite-frontend/src/pages/config.tsx +++ b/vite-frontend/src/pages/config.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from "react"; +import { useState, useEffect, useRef } from "react"; import { useNavigate } from "react-router-dom"; import { Button } from "@heroui/button"; import { Card, CardBody, CardHeader } from "@heroui/card"; @@ -7,9 +7,10 @@ import { Spinner } from "@heroui/spinner"; import { Divider } from "@heroui/divider"; import { Switch } from "@heroui/switch"; import { Select, SelectItem } from "@heroui/select"; +import { Checkbox, CheckboxGroup } from "@heroui/checkbox"; import toast from "react-hot-toast"; -import { updateConfigs } from "@/api"; +import { updateConfigs, exportBackup, importBackup } from "@/api"; import { SettingsIcon } from "@/components/icons"; import { isAdmin } from "@/utils/auth"; import { @@ -130,12 +131,19 @@ export default function ConfigPage() { useState>(initialConfigs); const [loading, setLoading] = useState( Object.keys(initialConfigs).length === 0, - ); // 如果有缓存数据，不显示loading + ); const [saving, setSaving] = useState(false); const [hasChanges, setHasChanges] = useState(false); const [originalConfigs, setOriginalConfigs] = useState>(initialConfigs); + const [exportTypes, setExportTypes] = useState([]); + const [importTypes, setImportTypes] = useState([]); + const [exporting, setExporting] = useState(false); + const [importing, setImporting] = useState(false); + const [importFileName, setImportFileName] = useState(""); + const fileInputRef = useRef(null); + // 权限检查 useEffect(() => { if (!isAdmin()) { @@ -331,6 +339,60 @@ export default function ConfigPage() { } }; + const handleExport = async () => { + if (exportTypes.length === 0) { + toast.error("请至少选择一种数据类型"); + return; + } + setExporting(true); + try { + await exportBackup(exportTypes); + toast.success("导出成功"); + } catch { + toast.error("导出失败，请重试"); + } finally { + setExporting(false); + } + }; + + const handleFileChange = async (e: React.ChangeEvent) => { + const file = e.target.files?.[0]; + if (!file) return; + + if (importTypes.length === 0) { + toast.error("请先选择要导入的数据类型"); + return; + } + + setImportFileName(file.name); + setImporting(true); + + try { + const text = await file.text(); + const data = JSON.parse(text); + + const response = await importBackup({ + types: importTypes, + ...data, + }); + + if (response.code === 0) { + toast.success(`导入成功: ${JSON.stringify(response.data)}`); + setImportTypes([]); + setImportFileName(""); + } else { + toast.error("导入失败: " + response.msg); + } + } catch { + toast.error("导入失败，请检查文件格式"); + } finally { + setImporting(false); + if (fileInputRef.current) { + fileInputRef.current.value = ""; + } + } + }; + if (loading) { return (
@@ -427,6 +489,143 @@ export default function ConfigPage() { )} + + {/* 备份与恢复 */} + + +
+
+

数据备份与恢复

+

+ 导出或导入系统数据，支持选择特定数据类型 +

+
+
+ + + + + + {/* 导出部分 */} +
+

导出数据

+

+ 选择要导出的数据类型，导出为 JSON 格式文件 +

+ + setExportTypes(values as string[])} + > + 用户 + 节点 + 隧道 + 转发 + 用户隧道权限 + 限速规则 + 隧道分组 + 用户分组 + 分组权限 + 系统配置 + + +
+ + + +
+
+ + + + {/* 导入部分 */} +
+

导入数据

+

+ 选择要导入的数据类型，支持从备份文件恢复数据 +

+ + setImportTypes(values as string[])} + > + 用户 + 节点 + 隧道 + 转发 + 用户隧道权限 + 限速规则 + 隧道分组 + 用户分组 + 分组权限 + 系统配置 + + + + +
+ + {importFileName && ( + + 已选择: {importFileName} + + )} +
+
+ +
); } From dd206ced14c29caf1470e616b155888c7f742bff Mon Sep 17 00:00:00 2001 From: sagit Date: Fri, 13 Feb 2026 03:26:21 +0000 Subject: [PATCH 3/4] fix(permission): revoke inherited tunnel access after group unbind/removal --- go-backend/internal/http/handler/mutations.go | 178 +++++++++++++- .../group_permission_contract_test.go | 219 ++++++++++++++++++ 2 files changed, 394 insertions(+), 3 deletions(-) create mode 100644 go-backend/tests/contract/group_permission_contract_test.go diff --git a/go-backend/internal/http/handler/mutations.go b/go-backend/internal/http/handler/mutations.go index 49cb324..e4719c4 100644 --- a/go-backend/internal/http/handler/mutations.go +++ b/go-backend/internal/http/handler/mutations.go @@ -1713,10 +1713,19 @@ func (h *Handler) groupUserAssign(w http.ResponseWriter, r *http.Request) { return } defer func() { _ = tx.Rollback() }() + previousUserIDs, err := queryInt64ListTx(tx, `SELECT user_id FROM user_group_user WHERE user_group_id = ?`, req.GroupID) + if err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } _, _ = tx.Exec(`DELETE FROM user_group_user WHERE user_group_id = ?`, req.GroupID) for _, uid := range req.UserIDs { _, _ = tx.Exec(`INSERT INTO user_group_user(user_group_id, user_id, created_time) VALUES(?, ?, ?) ON CONFLICT DO NOTHING`, req.GroupID, uid, time.Now().UnixMilli()) } + if err := revokeGroupGrantsForRemovedUsersTx(tx, req.GroupID, previousUserIDs, req.UserIDs); err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } if err := tx.Commit(); err != nil { response.WriteJSON(w, response.Err(-2, err.Error())) return @@ -1748,10 +1757,35 @@ func (h *Handler) groupPermissionRemove(w http.ResponseWriter, r *http.Request) if id <= 0 { return } + tx, err := h.repo.DB().Begin() + if err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + defer func() { _ = tx.Rollback() }() + var ug, tg int64 - _ = h.repo.DB().QueryRow(`SELECT user_group_id, tunnel_group_id FROM group_permission WHERE id = ?`, id).Scan(&ug, &tg) - _, _ = h.repo.DB().Exec(`DELETE FROM group_permission WHERE id = ?`, id) - _, _ = h.repo.DB().Exec(`DELETE FROM group_permission_grant WHERE user_group_id = ? AND tunnel_group_id = ?`, ug, tg) + err = tx.QueryRow(`SELECT user_group_id, tunnel_group_id FROM group_permission WHERE id = ?`, id).Scan(&ug, &tg) + if err != nil && err != sql.ErrNoRows { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + + if _, err := tx.Exec(`DELETE FROM group_permission WHERE id = ?`, id); err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + if err == nil { + if err := revokeGroupPermissionPairTx(tx, ug, tg); err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } + } + + if err := tx.Commit(); err != nil { + response.WriteJSON(w, response.Err(-2, err.Error())) + return + } response.WriteJSON(w, response.OKEmpty()) } @@ -1908,6 +1942,144 @@ func queryInt64List(db *store.DB, q string, args ...interface{}) ([]int64, error return out, rows.Err() } +func queryInt64ListTx(tx *store.Tx, q string, args ...interface{}) ([]int64, error) { + rows, err := tx.Query(q, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := make([]int64, 0) + for rows.Next() { + var v int64 + if err := rows.Scan(&v); err != nil { + return nil, err + } + out = append(out, v) + } + return out, rows.Err() +} + +func revokeGroupGrantsForRemovedUsersTx(tx *store.Tx, userGroupID int64, previousUserIDs, currentUserIDs []int64) error { + currentSet := make(map[int64]struct{}, len(currentUserIDs)) + for _, uid := range currentUserIDs { + if uid > 0 { + currentSet[uid] = struct{}{} + } + } + + removedUserIDs := make([]int64, 0) + for _, uid := range previousUserIDs { + if uid <= 0 { + continue + } + if _, ok := currentSet[uid]; !ok { + removedUserIDs = append(removedUserIDs, uid) + } + } + if len(removedUserIDs) == 0 { + return nil + } + + for _, userID := range removedUserIDs { + rows, err := tx.Query(` + SELECT g.user_tunnel_id, g.created_by_group + FROM group_permission_grant g + JOIN user_tunnel ut ON ut.id = g.user_tunnel_id + WHERE g.user_group_id = ? AND ut.user_id = ? + `, userGroupID, userID) + if err != nil { + return err + } + + groupCreatedTunnelIDs := make(map[int64]struct{}) + for rows.Next() { + var userTunnelID int64 + var createdByGroup int + if err := rows.Scan(&userTunnelID, &createdByGroup); err != nil { + rows.Close() + return err + } + if createdByGroup == 1 && userTunnelID > 0 { + groupCreatedTunnelIDs[userTunnelID] = struct{}{} + } + } + if err := rows.Err(); err != nil { + rows.Close() + return err + } + rows.Close() + + if _, err := tx.Exec(` + DELETE FROM group_permission_grant + WHERE user_group_id = ? + AND user_tunnel_id IN (SELECT id FROM user_tunnel WHERE user_id = ?) + `, userGroupID, userID); err != nil { + return err + } + + for userTunnelID := range groupCreatedTunnelIDs { + var remaining int + if err := tx.QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&remaining); err != nil { + return err + } + if remaining == 0 { + if _, err := tx.Exec(`DELETE FROM user_tunnel WHERE id = ?`, userTunnelID); err != nil { + return err + } + } + } + } + + return nil +} + +func revokeGroupPermissionPairTx(tx *store.Tx, userGroupID, tunnelGroupID int64) error { + rows, err := tx.Query(` + SELECT user_tunnel_id, created_by_group + FROM group_permission_grant + WHERE user_group_id = ? AND tunnel_group_id = ? + `, userGroupID, tunnelGroupID) + if err != nil { + return err + } + + groupCreatedTunnelIDs := make(map[int64]struct{}) + for rows.Next() { + var userTunnelID int64 + var createdByGroup int + if err := rows.Scan(&userTunnelID, &createdByGroup); err != nil { + rows.Close() + return err + } + if createdByGroup == 1 && userTunnelID > 0 { + groupCreatedTunnelIDs[userTunnelID] = struct{}{} + } + } + if err := rows.Err(); err != nil { + rows.Close() + return err + } + rows.Close() + + if _, err := tx.Exec(`DELETE FROM group_permission_grant WHERE user_group_id = ? AND tunnel_group_id = ?`, userGroupID, tunnelGroupID); err != nil { + return err + } + + for userTunnelID := range groupCreatedTunnelIDs { + var remaining int + if err := tx.QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&remaining); err != nil { + return err + } + if remaining == 0 { + if _, err := tx.Exec(`DELETE FROM user_tunnel WHERE id = ?`, userTunnelID); err != nil { + return err + } + } + } + + return nil +} + func queryPairs(db *store.DB, q string, args ...interface{}) ([][2]int64, error) { rows, err := db.Query(q, args...) if err != nil { diff --git a/go-backend/tests/contract/group_permission_contract_test.go b/go-backend/tests/contract/group_permission_contract_test.go new file mode 100644 index 0000000..530acdd --- /dev/null +++ b/go-backend/tests/contract/group_permission_contract_test.go @@ -0,0 +1,219 @@ +package contract_test + +import ( + "bytes" + "net/http" + "net/http/httptest" + "testing" + "time" + + "go-backend/internal/auth" +) + +func TestGroupUserUnbindRevokesInheritedTunnelPermission(t *testing.T) { + secret := "contract-jwt-secret" + router, repo := setupContractRouter(t, secret) + now := time.Now().UnixMilli() + + if _, err := repo.DB().Exec(` + INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status) + VALUES(200, 'group_user_contract', '3c85cdebade1c51cf64ca9f3c09d182d', 1, 2727251700000, 99999, 0, 0, 1, 99999, ?, ?, 1) + `, now, now); err != nil { + t.Fatalf("insert test user: %v", err) + } + + tunnelRes, err := repo.DB().Exec(` + INSERT INTO tunnel(name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx) + VALUES('group-contract-tunnel', 1.0, 1, 'tls', 99999, ?, ?, 1, NULL, 0) + `, now, now) + if err != nil { + t.Fatalf("insert tunnel: %v", err) + } + tunnelID, err := tunnelRes.LastInsertId() + if err != nil { + t.Fatalf("read tunnel id: %v", err) + } + + ugRes, err := repo.DB().Exec(`INSERT INTO user_group(name, created_time, updated_time, status) VALUES('ug-contract', ?, ?, 1)`, now, now) + if err != nil { + t.Fatalf("insert user_group: %v", err) + } + userGroupID, err := ugRes.LastInsertId() + if err != nil { + t.Fatalf("read user_group id: %v", err) + } + + tgRes, err := repo.DB().Exec(`INSERT INTO tunnel_group(name, created_time, updated_time, status) VALUES('tg-contract', ?, ?, 1)`, now, now) + if err != nil { + t.Fatalf("insert tunnel_group: %v", err) + } + tunnelGroupID, err := tgRes.LastInsertId() + if err != nil { + t.Fatalf("read tunnel_group id: %v", err) + } + + if _, err := repo.DB().Exec(`INSERT INTO tunnel_group_tunnel(tunnel_group_id, tunnel_id, created_time) VALUES(?, ?, ?)`, tunnelGroupID, tunnelID, now); err != nil { + t.Fatalf("insert tunnel_group_tunnel: %v", err) + } + if _, err := repo.DB().Exec(`INSERT INTO group_permission(user_group_id, tunnel_group_id, created_time) VALUES(?, ?, ?)`, userGroupID, tunnelGroupID, now); err != nil { + t.Fatalf("insert group_permission: %v", err) + } + + adminToken, err := auth.GenerateToken(1, "admin_user", 0, secret) + if err != nil { + t.Fatalf("generate admin token: %v", err) + } + + bindReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/user/assign", bytes.NewBufferString(`{"groupId":`+jsonNumber(userGroupID)+`,"userIds":[200]}`)) + bindReq.Header.Set("Authorization", adminToken) + bindRes := httptest.NewRecorder() + router.ServeHTTP(bindRes, bindReq) + assertCode(t, bindRes, 0) + + var userTunnelID int64 + if err := repo.DB().QueryRow(`SELECT id FROM user_tunnel WHERE user_id = 200 AND tunnel_id = ?`, tunnelID).Scan(&userTunnelID); err != nil { + t.Fatalf("query user_tunnel after bind: %v", err) + } + + var grantCount int + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&grantCount); err != nil { + t.Fatalf("query group_permission_grant after bind: %v", err) + } + if grantCount == 0 { + t.Fatalf("expected non-zero grants after bind") + } + + unbindReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/user/assign", bytes.NewBufferString(`{"groupId":`+jsonNumber(userGroupID)+`,"userIds":[]}`)) + unbindReq.Header.Set("Authorization", adminToken) + unbindRes := httptest.NewRecorder() + router.ServeHTTP(unbindRes, unbindReq) + assertCode(t, unbindRes, 0) + + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&grantCount); err != nil { + t.Fatalf("query group_permission_grant after unbind: %v", err) + } + if grantCount != 0 { + t.Fatalf("expected grants revoked after unbind, got %d", grantCount) + } + + var userTunnelCount int + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM user_tunnel WHERE id = ?`, userTunnelID).Scan(&userTunnelCount); err != nil { + t.Fatalf("query user_tunnel after unbind: %v", err) + } + if userTunnelCount != 0 { + t.Fatalf("expected user_tunnel revoked after unbind, got %d", userTunnelCount) + } +} + +func TestGroupPermissionRemoveRevokesInheritedTunnelPermission(t *testing.T) { + secret := "contract-jwt-secret" + router, repo := setupContractRouter(t, secret) + now := time.Now().UnixMilli() + + if _, err := repo.DB().Exec(` + INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status) + VALUES(201, 'group_user_permission_remove', '3c85cdebade1c51cf64ca9f3c09d182d', 1, 2727251700000, 99999, 0, 0, 1, 99999, ?, ?, 1) + `, now, now); err != nil { + t.Fatalf("insert test user: %v", err) + } + + tunnelRes, err := repo.DB().Exec(` + INSERT INTO tunnel(name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx) + VALUES('group-remove-tunnel', 1.0, 1, 'tls', 99999, ?, ?, 1, NULL, 0) + `, now, now) + if err != nil { + t.Fatalf("insert tunnel: %v", err) + } + tunnelID, err := tunnelRes.LastInsertId() + if err != nil { + t.Fatalf("read tunnel id: %v", err) + } + + ugRes, err := repo.DB().Exec(`INSERT INTO user_group(name, created_time, updated_time, status) VALUES('ug-remove-contract', ?, ?, 1)`, now, now) + if err != nil { + t.Fatalf("insert user_group: %v", err) + } + userGroupID, err := ugRes.LastInsertId() + if err != nil { + t.Fatalf("read user_group id: %v", err) + } + + tgRes, err := repo.DB().Exec(`INSERT INTO tunnel_group(name, created_time, updated_time, status) VALUES('tg-remove-contract', ?, ?, 1)`, now, now) + if err != nil { + t.Fatalf("insert tunnel_group: %v", err) + } + tunnelGroupID, err := tgRes.LastInsertId() + if err != nil { + t.Fatalf("read tunnel_group id: %v", err) + } + + adminToken, err := auth.GenerateToken(1, "admin_user", 0, secret) + if err != nil { + t.Fatalf("generate admin token: %v", err) + } + + assignTunnelReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/tunnel/assign", bytes.NewBufferString(`{"groupId":`+jsonNumber(tunnelGroupID)+`,"tunnelIds":[`+jsonNumber(tunnelID)+`]}`)) + assignTunnelReq.Header.Set("Authorization", adminToken) + assignTunnelRes := httptest.NewRecorder() + router.ServeHTTP(assignTunnelRes, assignTunnelReq) + assertCode(t, assignTunnelRes, 0) + + assignUserReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/user/assign", bytes.NewBufferString(`{"groupId":`+jsonNumber(userGroupID)+`,"userIds":[201]}`)) + assignUserReq.Header.Set("Authorization", adminToken) + assignUserRes := httptest.NewRecorder() + router.ServeHTTP(assignUserRes, assignUserReq) + assertCode(t, assignUserRes, 0) + + assignPermissionReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/permission/assign", bytes.NewBufferString(`{"userGroupId":`+jsonNumber(userGroupID)+`,"tunnelGroupId":`+jsonNumber(tunnelGroupID)+`}`)) + assignPermissionReq.Header.Set("Authorization", adminToken) + assignPermissionRes := httptest.NewRecorder() + router.ServeHTTP(assignPermissionRes, assignPermissionReq) + assertCode(t, assignPermissionRes, 0) + + var permissionID int64 + if err := repo.DB().QueryRow(`SELECT id FROM group_permission WHERE user_group_id = ? AND tunnel_group_id = ?`, userGroupID, tunnelGroupID).Scan(&permissionID); err != nil { + t.Fatalf("query group_permission id: %v", err) + } + + var userTunnelID int64 + if err := repo.DB().QueryRow(`SELECT id FROM user_tunnel WHERE user_id = 201 AND tunnel_id = ?`, tunnelID).Scan(&userTunnelID); err != nil { + t.Fatalf("query user_tunnel after assign: %v", err) + } + + var grantCount int + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&grantCount); err != nil { + t.Fatalf("query group_permission_grant after assign: %v", err) + } + if grantCount == 0 { + t.Fatalf("expected non-zero grants after permission assign") + } + + removeReq := httptest.NewRequest(http.MethodPost, "/api/v1/group/permission/remove", bytes.NewBufferString(`{"id":`+jsonNumber(permissionID)+`}`)) + removeReq.Header.Set("Authorization", adminToken) + removeRes := httptest.NewRecorder() + router.ServeHTTP(removeRes, removeReq) + assertCode(t, removeRes, 0) + + var permissionCount int + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM group_permission WHERE id = ?`, permissionID).Scan(&permissionCount); err != nil { + t.Fatalf("query group_permission after remove: %v", err) + } + if permissionCount != 0 { + t.Fatalf("expected group_permission removed, got %d", permissionCount) + } + + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM group_permission_grant WHERE user_tunnel_id = ?`, userTunnelID).Scan(&grantCount); err != nil { + t.Fatalf("query group_permission_grant after remove: %v", err) + } + if grantCount != 0 { + t.Fatalf("expected grants removed after permission remove, got %d", grantCount) + } + + var userTunnelCount int + if err := repo.DB().QueryRow(`SELECT COUNT(1) FROM user_tunnel WHERE id = ?`, userTunnelID).Scan(&userTunnelCount); err != nil { + t.Fatalf("query user_tunnel after permission remove: %v", err) + } + if userTunnelCount != 0 { + t.Fatalf("expected user_tunnel revoked after permission remove, got %d", userTunnelCount) + } +} From 2d2ca389e33722fe021438a69bc8c4860655e1c2 Mon Sep 17 00:00:00 2001 From: sagit Date: Fri, 13 Feb 2026 05:44:50 +0000 Subject: [PATCH 4/4] fix(backup): add transaction support and auto-backup before import - Add transaction support for import operations with rollback on failure - Add auto-backup before import to allow recovery on failure - Convert user import to use INSERT ON CONFLICT pattern - Add Execer interface to support both DB and Tx in import functions --- go-backend/internal/http/handler/handler.go | 9 +- .../internal/store/sqlite/repository.go | 156 +++++++++--------- 2 files changed, 88 insertions(+), 77 deletions(-) diff --git a/go-backend/internal/http/handler/handler.go b/go-backend/internal/http/handler/handler.go index 7e24ada..8a26877 100644 --- a/go-backend/internal/http/handler/handler.go +++ b/go-backend/internal/http/handler/handler.go @@ -1203,6 +1203,12 @@ func (h *Handler) backupImport(w http.ResponseWriter, r *http.Request) { return } + autoBackup, err := h.repo.ExportAll() + if err != nil { + response.WriteJSON(w, response.Err(-2, fmt.Sprintf("导入前自动备份失败: %v", err))) + return + } + var backup sqlite.BackupData if err := decodeJSON(r.Body, &backup); err != nil { response.WriteJSON(w, response.Err(500, "备份数据格式错误")) @@ -1211,9 +1217,10 @@ func (h *Handler) backupImport(w http.ResponseWriter, r *http.Request) { result, err := h.repo.Import(&backup, req.Types) if err != nil { - response.WriteJSON(w, response.Err(-2, err.Error())) + response.WriteJSON(w, response.Err(-2, fmt.Sprintf("导入失败: %v", err))) return } + result.AutoBackup = autoBackup response.WriteJSON(w, response.OK(result)) } diff --git a/go-backend/internal/store/sqlite/repository.go b/go-backend/internal/store/sqlite/repository.go index afc7809..d72a6ec 100644 --- a/go-backend/internal/store/sqlite/repository.go +++ b/go-backend/internal/store/sqlite/repository.go @@ -24,6 +24,14 @@ var embeddedSchema string //go:embed sql/data.sql var embeddedSeedData string +// Execer is an interface that both *store.DB and *store.Tx satisfy. +// Used to allow import functions to work with both regular DB and transactions. +type Execer interface { + Exec(query string, args ...any) (sql.Result, error) + Query(query string, args ...any) (*sql.Rows, error) + QueryRow(query string, args ...any) *sql.Row +} + type Repository struct { db *store.DB } @@ -2513,19 +2521,20 @@ func (r *Repository) exportPermissions() ([]PermissionBackup, error) { // ImportResult contains the result of an import operation type ImportResult struct { - UsersImported int `json:"usersImported"` - NodesImported int `json:"nodesImported"` - TunnelsImported int `json:"tunnelsImported"` - ForwardsImported int `json:"forwardsImported"` - UserTunnelsImported int `json:"userTunnelsImported"` - SpeedLimitsImported int `json:"speedLimitsImported"` - TunnelGroupsImported int `json:"tunnelGroupsImported"` - UserGroupsImported int `json:"userGroupsImported"` - PermissionsImported int `json:"permissionsImported"` - ConfigsImported int `json:"configsImported"` + UsersImported int `json:"usersImported"` + NodesImported int `json:"nodesImported"` + TunnelsImported int `json:"tunnelsImported"` + ForwardsImported int `json:"forwardsImported"` + UserTunnelsImported int `json:"userTunnelsImported"` + SpeedLimitsImported int `json:"speedLimitsImported"` + TunnelGroupsImported int `json:"tunnelGroupsImported"` + UserGroupsImported int `json:"userGroupsImported"` + PermissionsImported int `json:"permissionsImported"` + ConfigsImported int `json:"configsImported"` + AutoBackup *BackupData `json:"autoBackup,omitempty"` } -// Import imports data from BackupData +// Import imports data from BackupData with transaction support func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, error) { result := &ImportResult{} @@ -2534,10 +2543,16 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, typeSet[t] = true } + tx, err := r.db.Begin() + if err != nil { + return nil, fmt.Errorf("failed to begin transaction: %w", err) + } + defer func() { _ = tx.Rollback() }() + now := unixMilliNow() if typeSet["users"] && len(backup.Users) > 0 { - count, err := r.importUsers(backup.Users, now) + count, err := r.importUsers(tx, backup.Users, now) if err != nil { return nil, fmt.Errorf("import users failed: %w", err) } @@ -2545,7 +2560,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["nodes"] && len(backup.Nodes) > 0 { - count, err := r.importNodes(backup.Nodes, now) + count, err := r.importNodes(tx, backup.Nodes, now) if err != nil { return nil, fmt.Errorf("import nodes failed: %w", err) } @@ -2553,7 +2568,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["tunnels"] && len(backup.Tunnels) > 0 { - count, err := r.importTunnels(backup.Tunnels, now) + count, err := r.importTunnels(tx, backup.Tunnels, now) if err != nil { return nil, fmt.Errorf("import tunnels failed: %w", err) } @@ -2561,7 +2576,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["forwards"] && len(backup.Forwards) > 0 { - count, err := r.importForwards(backup.Forwards, now) + count, err := r.importForwards(tx, backup.Forwards, now) if err != nil { return nil, fmt.Errorf("import forwards failed: %w", err) } @@ -2569,7 +2584,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["userTunnels"] && len(backup.UserTunnels) > 0 { - count, err := r.importUserTunnels(backup.UserTunnels, now) + count, err := r.importUserTunnels(tx, backup.UserTunnels, now) if err != nil { return nil, fmt.Errorf("import user tunnels failed: %w", err) } @@ -2577,7 +2592,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["speedLimits"] && len(backup.SpeedLimits) > 0 { - count, err := r.importSpeedLimits(backup.SpeedLimits, now) + count, err := r.importSpeedLimits(tx, backup.SpeedLimits, now) if err != nil { return nil, fmt.Errorf("import speed limits failed: %w", err) } @@ -2585,7 +2600,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["tunnelGroups"] && len(backup.TunnelGroups) > 0 { - count, err := r.importTunnelGroups(backup.TunnelGroups, now) + count, err := r.importTunnelGroups(tx, backup.TunnelGroups, now) if err != nil { return nil, fmt.Errorf("import tunnel groups failed: %w", err) } @@ -2593,7 +2608,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["userGroups"] && len(backup.UserGroups) > 0 { - count, err := r.importUserGroups(backup.UserGroups, now) + count, err := r.importUserGroups(tx, backup.UserGroups, now) if err != nil { return nil, fmt.Errorf("import user groups failed: %w", err) } @@ -2601,7 +2616,7 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["permissions"] && len(backup.Permissions) > 0 { - count, err := r.importPermissions(backup.Permissions, now) + count, err := r.importPermissions(tx, backup.Permissions, now) if err != nil { return nil, fmt.Errorf("import permissions failed: %w", err) } @@ -2609,43 +2624,42 @@ func (r *Repository) Import(backup *BackupData, types []string) (*ImportResult, } if typeSet["configs"] && len(backup.Configs) > 0 { - count, err := r.importConfigs(backup.Configs, now) + count, err := r.importConfigs(tx, backup.Configs, now) if err != nil { return nil, fmt.Errorf("import configs failed: %w", err) } result.ConfigsImported = count } + if err := tx.Commit(); err != nil { + return nil, fmt.Errorf("failed to commit transaction: %w", err) + } + return result, nil } -func (r *Repository) importUsers(users []UserBackup, now int64) (int, error) { +func (r *Repository) importUsers(db Execer, users []UserBackup, now int64) (int, error) { count := 0 for _, u := range users { - // Check if user exists - exists, err := r.UsernameExists(u.User) + _, err := db.Exec(` + INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) DO UPDATE SET + user = excluded.user, + pwd = excluded.pwd, + role_id = excluded.role_id, + exp_time = excluded.exp_time, + flow = excluded.flow, + in_flow = excluded.in_flow, + out_flow = excluded.out_flow, + flow_reset_time = excluded.flow_reset_time, + num = excluded.num, + updated_time = excluded.updated_time, + status = excluded.status + `, u.ID, u.User, u.Pwd, u.RoleID, u.ExpTime, u.Flow, u.InFlow, u.OutFlow, u.FlowResetTime, u.Num, u.CreatedTime, now, u.Status) if err != nil { return count, err } - if exists { - // Update existing - _, err = r.db.Exec(` - UPDATE user SET pwd = ?, role_id = ?, exp_time = ?, flow = ?, in_flow = ?, out_flow = ?, flow_reset_time = ?, num = ?, updated_time = ?, status = ? - WHERE id = ? - `, u.Pwd, u.RoleID, u.ExpTime, u.Flow, u.InFlow, u.OutFlow, u.FlowResetTime, u.Num, now, u.Status, u.ID) - if err != nil { - return count, err - } - } else { - // Insert new - _, err = r.db.Exec(` - INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status) - VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) - `, u.ID, u.User, u.Pwd, u.RoleID, u.ExpTime, u.Flow, u.InFlow, u.OutFlow, u.FlowResetTime, u.Num, u.CreatedTime, now, u.Status) - if err != nil { - return count, err - } - } count++ } return count, nil @@ -2660,16 +2674,10 @@ func (r *Repository) UsernameExists(username string) (bool, error) { return count > 0, nil } -func (r *Repository) importNodes(nodes []NodeBackup, now int64) (int, error) { +func (r *Repository) importNodes(db Execer, nodes []NodeBackup, now int64) (int, error) { count := 0 for _, n := range nodes { - // Check if node exists - _, err := r.GetNodeByID(n.ID) - if err != nil { - return count, err - } - // Use upsert pattern - _, err = r.db.Exec(` + _, err := db.Exec(` INSERT INTO node(id, name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx, is_remote, remote_url, remote_token, remote_config) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2702,10 +2710,10 @@ func (r *Repository) importNodes(nodes []NodeBackup, now int64) (int, error) { return count, nil } -func (r *Repository) importTunnels(tunnels []TunnelBackup, now int64) (int, error) { +func (r *Repository) importTunnels(db Execer, tunnels []TunnelBackup, now int64) (int, error) { count := 0 for _, t := range tunnels { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO tunnel(id, name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2722,10 +2730,9 @@ func (r *Repository) importTunnels(tunnels []TunnelBackup, now int64) (int, erro if err != nil { return count, err } - // Import chain tunnels if len(t.ChainTunnels) > 0 { for _, ct := range t.ChainTunnels { - _, err = r.db.Exec(` + _, err = db.Exec(` INSERT INTO chain_tunnel(id, tunnel_id, chain_type, node_id, port, strategy, inx, protocol) VALUES(?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2746,10 +2753,10 @@ func (r *Repository) importTunnels(tunnels []TunnelBackup, now int64) (int, erro return count, nil } -func (r *Repository) importForwards(forwards []ForwardBackup, now int64) (int, error) { +func (r *Repository) importForwards(db Execer, forwards []ForwardBackup, now int64) (int, error) { count := 0 for _, f := range forwards { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO forward(id, user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2773,14 +2780,14 @@ func (r *Repository) importForwards(forwards []ForwardBackup, now int64) (int, e return count, nil } -func (r *Repository) importUserTunnels(userTunnels []UserTunnelBackup, now int64) (int, error) { +func (r *Repository) importUserTunnels(db Execer, userTunnels []UserTunnelBackup, now int64) (int, error) { count := 0 for _, ut := range userTunnels { var speedID interface{} if ut.SpeedID > 0 { speedID = ut.SpeedID } - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO user_tunnel(id, user_id, tunnel_id, speed_id, num, flow, in_flow, out_flow, flow_reset_time, exp_time, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2803,10 +2810,10 @@ func (r *Repository) importUserTunnels(userTunnels []UserTunnelBackup, now int64 return count, nil } -func (r *Repository) importSpeedLimits(speedLimits []SpeedLimitBackup, now int64) (int, error) { +func (r *Repository) importSpeedLimits(db Execer, speedLimits []SpeedLimitBackup, now int64) (int, error) { count := 0 for _, sl := range speedLimits { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO speed_limit(id, name, speed, tunnel_id, tunnel_name, created_time, updated_time, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2825,10 +2832,10 @@ func (r *Repository) importSpeedLimits(speedLimits []SpeedLimitBackup, now int64 return count, nil } -func (r *Repository) importTunnelGroups(tunnelGroups []TunnelGroupBackup, now int64) (int, error) { +func (r *Repository) importTunnelGroups(db Execer, tunnelGroups []TunnelGroupBackup, now int64) (int, error) { count := 0 for _, tg := range tunnelGroups { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO tunnel_group(id, name, created_time, updated_time, status) VALUES(?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2839,13 +2846,12 @@ func (r *Repository) importTunnelGroups(tunnelGroups []TunnelGroupBackup, now in if err != nil { return count, err } - // Update tunnel group memberships - _, err = r.db.Exec(`DELETE FROM tunnel_group_tunnel WHERE tunnel_group_id = ?`, tg.ID) + _, err = db.Exec(`DELETE FROM tunnel_group_tunnel WHERE tunnel_group_id = ?`, tg.ID) if err != nil { return count, err } for _, tunnelID := range tg.Tunnels { - _, err = r.db.Exec(` + _, err = db.Exec(` INSERT INTO tunnel_group_tunnel(tunnel_group_id, tunnel_id, created_time) VALUES(?, ?, ?) `, tg.ID, tunnelID, now) @@ -2858,10 +2864,10 @@ func (r *Repository) importTunnelGroups(tunnelGroups []TunnelGroupBackup, now in return count, nil } -func (r *Repository) importUserGroups(userGroups []UserGroupBackup, now int64) (int, error) { +func (r *Repository) importUserGroups(db Execer, userGroups []UserGroupBackup, now int64) (int, error) { count := 0 for _, ug := range userGroups { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO user_group(id, name, created_time, updated_time, status) VALUES(?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2872,13 +2878,12 @@ func (r *Repository) importUserGroups(userGroups []UserGroupBackup, now int64) ( if err != nil { return count, err } - // Update user group memberships - _, err = r.db.Exec(`DELETE FROM user_group_user WHERE user_group_id = ?`, ug.ID) + _, err = db.Exec(`DELETE FROM user_group_user WHERE user_group_id = ?`, ug.ID) if err != nil { return count, err } for _, userID := range ug.Users { - _, err = r.db.Exec(` + _, err = db.Exec(` INSERT INTO user_group_user(user_group_id, user_id, created_time) VALUES(?, ?, ?) `, ug.ID, userID, now) @@ -2891,10 +2896,10 @@ func (r *Repository) importUserGroups(userGroups []UserGroupBackup, now int64) ( return count, nil } -func (r *Repository) importPermissions(permissions []PermissionBackup, now int64) (int, error) { +func (r *Repository) importPermissions(db Execer, permissions []PermissionBackup, now int64) (int, error) { count := 0 for _, p := range permissions { - _, err := r.db.Exec(` + _, err := db.Exec(` INSERT INTO group_permission(id, user_group_id, tunnel_group_id, created_time, created_by_group) VALUES(?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2905,9 +2910,8 @@ func (r *Repository) importPermissions(permissions []PermissionBackup, now int64 if err != nil { return count, err } - // Import grants for _, g := range p.Grants { - _, err = r.db.Exec(` + _, err = db.Exec(` INSERT INTO group_permission_grant(id, user_group_id, tunnel_group_id, user_tunnel_id, created_time, created_by_group) VALUES(?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET @@ -2923,7 +2927,7 @@ func (r *Repository) importPermissions(permissions []PermissionBackup, now int64 return count, nil } -func (r *Repository) importConfigs(configs map[string]string, now int64) (int, error) { +func (r *Repository) importConfigs(db Execer, configs map[string]string, now int64) (int, error) { count := 0 for name, value := range configs { err := r.UpsertConfig(name, value, now)