diff --git a/database/model/model.go b/database/model/model.go index e87e8b6b..d0b8bcfc 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -74,5 +74,4 @@ type Client struct { Email string `json:"email"` TotalGB int64 `json:"totalGB" form:"totalGB"` ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` - SubID string `json:"subId" from:"subId"` } diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 6e552d15..79186e32 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1431,14 +1431,13 @@ Inbound.VmessSettings = class extends Inbound.Settings { } }; Inbound.VmessSettings.Vmess = class extends XrayCommonClass { - , subId='') { + constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(), totalGB=0, expiryTime='') { super(); this.id = id; this.alterId = alterId; this.email = email; this.totalGB = totalGB; this.expiryTime = expiryTime; - this.subId = subId; } static fromJson(json={}) { @@ -1448,7 +1447,7 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass { json.email, json.totalGB, json.expiryTime, - json.subId, + ); } get _expiryTime() { @@ -1515,14 +1514,14 @@ Inbound.VLESSSettings = class extends Inbound.Settings { }; Inbound.VLESSSettings.VLESS = class extends XrayCommonClass { - , subId='') { + constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomText(), totalGB=0, expiryTime='') { super(); this.id = id; this.flow = flow; this.email = email; this.totalGB = totalGB; this.expiryTime = expiryTime; - this.subId = subId; + } static fromJson(json={}) { @@ -1532,7 +1531,6 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass { json.email, json.totalGB, json.expiryTime, - json.subId, ); } @@ -1629,14 +1627,13 @@ Inbound.TrojanSettings = class extends Inbound.Settings { } }; Inbound.TrojanSettings.Trojan = class extends XrayCommonClass { - , subId='') { + constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomText(), totalGB=0, expiryTime='') { super(); this.password = password; this.flow = flow; this.email = email; this.totalGB = totalGB; this.expiryTime = expiryTime; - this.subId = subId; } toJson() { @@ -1646,7 +1643,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass { email: this.email, totalGB: this.totalGB, expiryTime: this.expiryTime, - subId: this.subId, }; } @@ -1657,7 +1653,7 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass { json.email, json.totalGB, json.expiryTime, - json.subId, + ); } diff --git a/web/controller/sub.go b/web/controller/sub.go deleted file mode 100644 index 38340f9b..00000000 --- a/web/controller/sub.go +++ /dev/null @@ -1,41 +0,0 @@ -package controller - -import ( - "encoding/base64" - "x-ui/web/service" - - "github.com/gin-gonic/gin" -) - -type SUBController struct { - BaseController - - subService service.SubService -} - -func NewSUBController(g *gin.RouterGroup) *SUBController { - a := &SUBController{} - a.initRouter(g) - return a -} - -func (a *SUBController) initRouter(g *gin.RouterGroup) { - g = g.Group("/sub") - - g.GET("/:subid", a.subs) -} - -func (a *SUBController) subs(c *gin.Context) { - subId := c.Param("subid") - host := c.Request.Host - subs, err := a.subService.GetSubs(subId, host) - result := "" - for _, sub := range subs { - result += sub + "\n" - } - if err != nil { - c.String(400, "Error!") - } else { - c.String(200, base64.StdEncoding.EncodeToString([]byte(result))) - } -} diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index fe87734a..3d92c54e 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -24,9 +24,6 @@ - - - {{ i18n "none" }} diff --git a/web/service/sub.go b/web/service/sub.go deleted file mode 100644 index 875a5b53..00000000 --- a/web/service/sub.go +++ /dev/null @@ -1,505 +0,0 @@ -package service - -import ( - "encoding/base64" - "fmt" - "net/url" - "strings" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - - "github.com/goccy/go-json" - "gorm.io/gorm" -) - -type SubService struct { - address string - inboundService InboundService -} - -func (s *SubService) GetSubs(subId string, host string) ([]string, error) { - s.address = host - var result []string - inbounds, err := s.getInboundsBySubId(subId) - if err != nil { - return nil, err - } - for _, inbound := range inbounds { - clients, err := s.inboundService.getClients(inbound) - if err != nil { - logger.Error("SubService - GetSub: Unable to get clients from inbound") - } - if clients == nil { - continue - } - for _, client := range clients { - if client.SubID == subId { - link := s.getLink(inbound, client.Email) - result = append(result, link) - } - } - } - return result, nil -} - -func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) { - db := database.GetDB() - var inbounds []*model.Inbound - err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"subId": "%s"%%`, subId)).Find(&inbounds).Error - if err != nil && err != gorm.ErrRecordNotFound { - return nil, err - } - return inbounds, nil -} - -func (s *SubService) getLink(inbound *model.Inbound, email string) string { - switch inbound.Protocol { - case "vmess": - return s.genVmessLink(inbound, email) - case "vless": - return s.genVlessLink(inbound, email) - case "trojan": - return s.genTrojanLink(inbound, email) - } - return "" -} - -func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { - address := s.address - if inbound.Protocol != model.VMess { - return "" - } - var stream map[string]interface{} - json.Unmarshal([]byte(inbound.StreamSettings), &stream) - network, _ := stream["network"].(string) - typeStr := "none" - host := "" - path := "" - sni := "" - fp := "" - var alpn []string - allowInsecure := false - switch network { - case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) - typeStr, _ = header["type"].(string) - if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) - path = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) - host = searchHost(headers) - } - case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) - typeStr, _ = header["type"].(string) - path, _ = kcp["seed"].(string) - case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) - path = ws["path"].(string) - headers, _ := ws["headers"].(map[string]interface{}) - host = searchHost(headers) - case "http": - network = "h2" - http, _ := stream["httpSettings"].(map[string]interface{}) - path, _ = http["path"].(string) - host = searchHost(http) - case "quic": - quic, _ := stream["quicSettings"].(map[string]interface{}) - header := quic["header"].(map[string]interface{}) - typeStr, _ = header["type"].(string) - host, _ = quic["security"].(string) - path, _ = quic["key"].(string) - case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) - path = grpc["serviceName"].(string) - } - - security, _ := stream["security"].(string) - if security == "tls" { - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) - for _, a := range alpns { - alpn = append(alpn, a.(string)) - } - tlsSettings, _ := searchKey(tlsSetting, "settings") - if tlsSetting != nil { - if sniValue, ok := searchKey(tlsSettings, "serverName"); ok { - sni, _ = sniValue.(string) - } - if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok { - fp, _ = fpValue.(string) - } - if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok { - allowInsecure, _ = insecure.(bool) - } - } - serverName, _ := tlsSetting["serverName"].(string) - if serverName != "" { - address = serverName - } - } - - clients, _ := s.inboundService.getClients(inbound) - clientIndex := -1 - for i, client := range clients { - if client.Email == email { - clientIndex = i - break - } - } - - obj := map[string]interface{}{ - "v": "2", - "ps": email, - "add": address, - "port": inbound.Port, - "id": clients[clientIndex].ID, - "aid": clients[clientIndex].AlterIds, - "net": network, - "type": typeStr, - "host": host, - "path": path, - "tls": security, - "sni": sni, - "fp": fp, - "alpn": strings.Join(alpn, ","), - "allowInsecure": allowInsecure, - } - jsonStr, _ := json.MarshalIndent(obj, "", " ") - return "vmess://" + base64.StdEncoding.EncodeToString(jsonStr) -} - -func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { - address := s.address - if inbound.Protocol != model.VLESS { - return "" - } - var stream map[string]interface{} - json.Unmarshal([]byte(inbound.StreamSettings), &stream) - clients, _ := s.inboundService.getClients(inbound) - clientIndex := -1 - for i, client := range clients { - if client.Email == email { - clientIndex = i - break - } - } - uuid := clients[clientIndex].ID - port := inbound.Port - streamNetwork := stream["network"].(string) - params := make(map[string]string) - params["type"] = streamNetwork - - switch streamNetwork { - case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) - typeStr, _ := header["type"].(string) - if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) - params["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) - params["host"] = searchHost(headers) - params["headerType"] = "http" - } - case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) - params["headerType"] = header["type"].(string) - params["seed"] = kcp["seed"].(string) - case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) - params["path"] = ws["path"].(string) - headers, _ := ws["headers"].(map[string]interface{}) - params["host"] = searchHost(headers) - case "http": - http, _ := stream["httpSettings"].(map[string]interface{}) - params["path"] = http["path"].(string) - params["host"] = searchHost(http) - case "quic": - quic, _ := stream["quicSettings"].(map[string]interface{}) - params["quicSecurity"] = quic["security"].(string) - params["key"] = quic["key"].(string) - header := quic["header"].(map[string]interface{}) - params["headerType"] = header["type"].(string) - case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) - params["serviceName"] = grpc["serviceName"].(string) - } - - security, _ := stream["security"].(string) - if security == "tls" { - params["security"] = "tls" - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) - var alpn []string - for _, a := range alpns { - alpn = append(alpn, a.(string)) - } - if len(alpn) > 0 { - params["alpn"] = strings.Join(alpn, ",") - } - tlsSettings, _ := searchKey(tlsSetting, "settings") - if tlsSetting != nil { - if sniValue, ok := searchKey(tlsSettings, "serverName"); ok { - params["sni"], _ = sniValue.(string) - } - if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok { - params["fp"], _ = fpValue.(string) - } - if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok { - if insecure.(bool) { - params["allowInsecure"] = "1" - } - } - } - - if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 { - params["flow"] = clients[clientIndex].Flow - } - - serverName, _ := tlsSetting["serverName"].(string) - if serverName != "" { - address = serverName - } - } - - if security == "xtls" { - params["security"] = "xtls" - xtlsSetting, _ := stream["xtlsSettings"].(map[string]interface{}) - alpns, _ := xtlsSetting["alpn"].([]interface{}) - var alpn []string - for _, a := range alpns { - alpn = append(alpn, a.(string)) - } - if len(alpn) > 0 { - params["alpn"] = strings.Join(alpn, ",") - } - - xtlsSettings, _ := searchKey(xtlsSetting, "settings") - if xtlsSetting != nil { - if sniValue, ok := searchKey(xtlsSettings, "serverName"); ok { - params["sni"], _ = sniValue.(string) - } - if fpValue, ok := searchKey(xtlsSettings, "fingerprint"); ok { - params["fp"], _ = fpValue.(string) - } - if insecure, ok := searchKey(xtlsSettings, "allowInsecure"); ok { - if insecure.(bool) { - params["allowInsecure"] = "1" - } - } - } - - if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 { - params["flow"] = clients[clientIndex].Flow - } - - serverName, _ := xtlsSetting["serverName"].(string) - if serverName != "" { - address = serverName - } - } - - link := fmt.Sprintf("vless://%s@%s:%d", uuid, address, port) - url, _ := url.Parse(link) - q := url.Query() - - for k, v := range params { - q.Add(k, v) - } - - // Set the new query values on the URL - url.RawQuery = q.Encode() - - url.Fragment = email - return url.String() -} - -func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string { - address := s.address - if inbound.Protocol != model.Trojan { - return "" - } - var stream map[string]interface{} - json.Unmarshal([]byte(inbound.StreamSettings), &stream) - clients, _ := s.inboundService.getClients(inbound) - clientIndex := -1 - for i, client := range clients { - if client.Email == email { - clientIndex = i - break - } - } - password := clients[clientIndex].Password - port := inbound.Port - streamNetwork := stream["network"].(string) - params := make(map[string]string) - params["type"] = streamNetwork - - switch streamNetwork { - case "tcp": - tcp, _ := stream["tcpSettings"].(map[string]interface{}) - header, _ := tcp["header"].(map[string]interface{}) - typeStr, _ := header["type"].(string) - if typeStr == "http" { - request := header["request"].(map[string]interface{}) - requestPath, _ := request["path"].([]interface{}) - params["path"] = requestPath[0].(string) - headers, _ := request["headers"].(map[string]interface{}) - params["host"] = searchHost(headers) - params["headerType"] = "http" - } - case "kcp": - kcp, _ := stream["kcpSettings"].(map[string]interface{}) - header, _ := kcp["header"].(map[string]interface{}) - params["headerType"] = header["type"].(string) - params["seed"] = kcp["seed"].(string) - case "ws": - ws, _ := stream["wsSettings"].(map[string]interface{}) - params["path"] = ws["path"].(string) - headers, _ := ws["headers"].(map[string]interface{}) - params["host"] = searchHost(headers) - case "http": - http, _ := stream["httpSettings"].(map[string]interface{}) - params["path"] = http["path"].(string) - params["host"] = searchHost(http) - case "quic": - quic, _ := stream["quicSettings"].(map[string]interface{}) - params["quicSecurity"] = quic["security"].(string) - params["key"] = quic["key"].(string) - header := quic["header"].(map[string]interface{}) - params["headerType"] = header["type"].(string) - case "grpc": - grpc, _ := stream["grpcSettings"].(map[string]interface{}) - params["serviceName"] = grpc["serviceName"].(string) - } - - security, _ := stream["security"].(string) - if security == "tls" { - params["security"] = "tls" - tlsSetting, _ := stream["tlsSettings"].(map[string]interface{}) - alpns, _ := tlsSetting["alpn"].([]interface{}) - var alpn []string - for _, a := range alpns { - alpn = append(alpn, a.(string)) - } - if len(alpn) > 0 { - params["alpn"] = strings.Join(alpn, ",") - } - tlsSettings, _ := searchKey(tlsSetting, "settings") - if tlsSetting != nil { - if sniValue, ok := searchKey(tlsSettings, "serverName"); ok { - params["sni"], _ = sniValue.(string) - } - if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok { - params["fp"], _ = fpValue.(string) - } - if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok { - if insecure.(bool) { - params["allowInsecure"] = "1" - } - } - } - - serverName, _ := tlsSetting["serverName"].(string) - if serverName != "" { - address = serverName - } - } - - if security == "xtls" { - params["security"] = "xtls" - xtlsSetting, _ := stream["xtlsSettings"].(map[string]interface{}) - alpns, _ := xtlsSetting["alpn"].([]interface{}) - var alpn []string - for _, a := range alpns { - alpn = append(alpn, a.(string)) - } - if len(alpn) > 0 { - params["alpn"] = strings.Join(alpn, ",") - } - - xtlsSettings, _ := searchKey(xtlsSetting, "settings") - if xtlsSetting != nil { - if sniValue, ok := searchKey(xtlsSettings, "serverName"); ok { - params["sni"], _ = sniValue.(string) - } - if fpValue, ok := searchKey(xtlsSettings, "fingerprint"); ok { - params["fp"], _ = fpValue.(string) - } - if insecure, ok := searchKey(xtlsSettings, "allowInsecure"); ok { - if insecure.(bool) { - params["allowInsecure"] = "1" - } - } - } - - if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 { - params["flow"] = clients[clientIndex].Flow - } - - serverName, _ := xtlsSetting["serverName"].(string) - if serverName != "" { - address = serverName - } - } - - link := fmt.Sprintf("trojan://%s@%s:%d", password, address, port) - - url, _ := url.Parse(link) - q := url.Query() - - for k, v := range params { - q.Add(k, v) - } - - // Set the new query values on the URL - url.RawQuery = q.Encode() - - url.Fragment = email - return url.String() -} - -func searchKey(data interface{}, key string) (interface{}, bool) { - switch val := data.(type) { - case map[string]interface{}: - for k, v := range val { - if k == key { - return v, true - } - if result, ok := searchKey(v, key); ok { - return result, true - } - } - case []interface{}: - for _, v := range val { - if result, ok := searchKey(v, key); ok { - return result, true - } - } - } - return nil, false -} - -func searchHost(headers interface{}) string { - data, _ := headers.(map[string]interface{}) - for k, v := range data { - if strings.EqualFold(k, "host") { - switch v.(type) { - case []interface{}: - hosts, _ := v.([]interface{}) - return hosts[0].(string) - case interface{}: - return v.(string) - } - } - } - - return "" -} diff --git a/web/web.go b/web/web.go index a86a0419..4880ff19 100644 --- a/web/web.go +++ b/web/web.go @@ -85,7 +85,6 @@ type Server struct { server *controller.ServerController xui *controller.XUIController api *controller.APIController - sub *controller.SUBController xrayService service.XrayService settingService service.SettingService @@ -209,7 +208,6 @@ func (s *Server) initRouter() (*gin.Engine, error) { s.server = controller.NewServerController(g) s.xui = controller.NewXUIController(g) s.api = controller.NewAPIController(g) - s.sub = controller.NewSUBController(g) return engine, nil }