kccsl/s-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only allow shadowsocks multi-user #489

Browse Source
This commit is contained in:
Alireza Ahmadi
2025-02-22 12:43:11 +01:00
parent 59d2c652e6
commit 6ad2a7af70
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/inbounds.go
+3 -14
View File
@@ -67,8 +67,7 @@ func (s *InboundService) GetAll() (*[]map[string]interface{}, error) {
json.Unmarshal(restFields["version"], &shadowtls_version) json.Unmarshal(restFields["version"], &shadowtls_version)
} }
} }
switch inbound.Type { if s.hasUser(inbound.Type) {
case "mixed", "socks", "http", "shadowsocks", "vmess", "trojan", "naive", "hysteria", "shadowtls", "tuic", "hysteria2", "vless":
if inbound.Type == "shadowtls" && shadowtls_version < 3 { if inbound.Type == "shadowtls" && shadowtls_version < 3 {
break break
} }
@@ -77,10 +76,8 @@ func (s *InboundService) GetAll() (*[]map[string]interface{}, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(users) > 0 || inbound.Type != "shadowsocks" {
inbData["users"] = users inbData["users"] = users
} }
}
data = append(data, inbData) data = append(data, inbData)
} }
@@ -275,15 +272,11 @@ func (s *InboundService) addUsers(db *gorm.DB, inboundJson []byte, inboundId uin
} }
condition := fmt.Sprintf("%d IN (SELECT json_each.value FROM json_each(clients.inbounds))", inboundId) condition := fmt.Sprintf("%d IN (SELECT json_each.value FROM json_each(clients.inbounds))", inboundId)
usersJson, err := s.fetchUsers(db, inboundType, condition, inbound) inbound["users"], err = s.fetchUsers(db, inboundType, condition, inbound)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(usersJson) > 0 || inboundType != "shadowsocks" {
inbound["users"] = usersJson
}
return json.Marshal(inbound) return json.Marshal(inbound)
} }
@@ -304,15 +297,11 @@ func (s *InboundService) initUsers(db *gorm.DB, inboundJson []byte, clientIds st
} }
condition := fmt.Sprintf("id IN (%s)", strings.Join(ClientIds, ",")) condition := fmt.Sprintf("id IN (%s)", strings.Join(ClientIds, ","))
usersJson, err := s.fetchUsers(db, inboundType, condition, inbound) inbound["users"], err = s.fetchUsers(db, inboundType, condition, inbound)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(usersJson) > 0 || inboundType != "shadowsocks" {
inbound["users"] = usersJson
}
return json.Marshal(inbound) return json.Marshal(inbound)
} }