Skip to content

Commit

Permalink
fix: ss2022 not working as expect
Browse files Browse the repository at this point in the history 
fix: minor bugs
  • Loading branch information
@Septrum101
Septrum101 committed Dec 27, 2022
1 parent 451b5a1 commit b5a8f44
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 63 deletions.
105 changes: 43 additions & 62 deletions api/newV2board/v2board.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,58 +124,42 @@ func (c *APIClient) assembleURL(path string) string {
return c.APIHost + path
}

func (c *APIClient) parseServerConfig(res *resty.Response, path string, err error) (*serverConfig, error) {
func (c *APIClient) parseResponse(res *resty.Response, path string, err error) (*simplejson.Json, error) {
if err != nil {
return nil, fmt.Errorf("request %s failed: %s", c.assembleURL(path), err)
return nil, fmt.Errorf("request %s failed: %v", c.assembleURL(path), err)
}

if res.StatusCode() > 399 {
return nil, fmt.Errorf("request %s failed: %s, %s", c.assembleURL(path), res.String(), err)
return nil, fmt.Errorf("request %s failed: %s, %v", c.assembleURL(path), res.String(), err)
}

s := new(serverConfig)
if err := json.Unmarshal(res.Body(), s); err != nil {
return nil, fmt.Errorf("ret %s invalid", res.String())
}

if s.ServerPort == 0 {
return nil, errors.New("server port must > 0")
}

return s, nil
}
func (c *APIClient) parseUsers(res *resty.Response, path string, err error) ([]*user, error) {
rtn, err := simplejson.NewJson(res.Body())
if err != nil {
return nil, fmt.Errorf("request %s failed: %s", c.assembleURL(path), err)
}

if res.StatusCode() > 399 {
return nil, fmt.Errorf("request %s failed: %s, %s", c.assembleURL(path), res.String(), err)
}

var users []*user
if data, err := simplejson.NewJson(res.Body()); err != nil {
return nil, fmt.Errorf("ret %s invalid", res.String())
} else {
b, _ := data.Get("users").MarshalJSON()
json.Unmarshal(b, &users)
}

return users, nil
return rtn, nil
}

// GetNodeInfo will pull NodeInfo Config from panel
func (c *APIClient) GetNodeInfo() (nodeInfo *api.NodeInfo, err error) {
server := new(serverConfig)
path := "/api/v1/server/UniProxy/config"

res, err := c.client.R().
ForceContentType("application/json").
Get(path)

server, err := c.parseServerConfig(res, path, err)
nodeInfoResp, err := c.parseResponse(res, path, err)
if err != nil {
return nil, err
}
b, _ := nodeInfoResp.Encode()
json.Unmarshal(b, server)

if server.ServerPort == 0 {
return nil, errors.New("server port must > 0")
}

c.resp.Store(server)

Expand All @@ -191,14 +175,15 @@ func (c *APIClient) GetNodeInfo() (nodeInfo *api.NodeInfo, err error) {
}

if err != nil {
return nil, fmt.Errorf("parse node info failed: %s, \nError: %s", res.String(), err)
return nil, fmt.Errorf("parse node info failed: %s, \nError: %v", res.String(), err)
}

return nodeInfo, nil
}

// GetUserList will pull user form panel
func (c *APIClient) GetUserList() (UserList *[]api.UserInfo, err error) {
var users []*user
path := "/api/v1/server/UniProxy/user"

switch c.NodeType {
Expand All @@ -222,10 +207,12 @@ func (c *APIClient) GetUserList() (UserList *[]api.UserInfo, err error) {
c.eTag = res.Header().Get("Etag")
}

users, err := c.parseUsers(res, path, err)
usersResp, err := c.parseResponse(res, path, err)
if err != nil {
return nil, err
}
b, _ := usersResp.Get("users").Encode()
json.Unmarshal(b, &users)

userList := make([]api.UserInfo, len(users))
for i := 0; i < len(users); i++ {
Expand Down Expand Up @@ -262,11 +249,8 @@ func (c *APIClient) ReportUserTraffic(userTraffic *[]api.UserTraffic) error {
data[traffic.UID] = []int64{traffic.Upload, traffic.Download}
}

res, err := c.client.R().
SetBody(data).
ForceContentType("application/json").
Post(path)
_, err = c.parseServerConfig(res, path, err)
res, err := c.client.R().SetBody(data).ForceContentType("application/json").Post(path)
_, err = c.parseResponse(res, path, err)
if err != nil {
return err
}
Expand Down Expand Up @@ -336,13 +320,16 @@ func (c *APIClient) parseSSNodeResponse(s *serverConfig) (*api.NodeInfo, error)
if s.Obfs == "http" {
path := "/"
if p := s.ObfsSettings.Path; p != "" {
path = p
if strings.HasPrefix(p, "/") {
path = p
} else {
path += p
}
}
header, _ = json.Marshal(map[string]any{
"type": "http",
"request": map[string]any{
"path": path,
}})
h := simplejson.New()
h.Set("type", "http")
h.SetPath([]string{"request", "path"}, path)
header, _ = h.Encode()
}
// Create GeneralNodeInfo
return &api.NodeInfo{
Expand All @@ -360,11 +347,10 @@ func (c *APIClient) parseSSNodeResponse(s *serverConfig) (*api.NodeInfo, error)
// parseV2rayNodeResponse parse the response for the given nodeInfo format
func (c *APIClient) parseV2rayNodeResponse(s *serverConfig) (*api.NodeInfo, error) {
var (
TLSType = "tls"
path, host, serviceName string
header json.RawMessage
enableTLS bool
alterID uint16 = 0
TLSType = "tls"
host string
header json.RawMessage
enableTLS bool
)

if c.EnableXTLS {
Expand All @@ -375,18 +361,13 @@ func (c *APIClient) parseV2rayNodeResponse(s *serverConfig) (*api.NodeInfo, erro
if httpHeader, err := s.NetworkSettings.Headers.MarshalJSON(); err != nil {
return nil, err
} else {
header = httpHeader
}
}

switch s.Network {
case "ws":
path = s.NetworkSettings.Path
b, _ := simplejson.NewJson(header)
host = b.Get("Host").MustString()
case "grpc":
if s.NetworkSettings.ServiceName != "" {
serviceName = s.NetworkSettings.ServiceName
switch s.Network {
case "ws":
b, _ := simplejson.NewJson(httpHeader)
host = b.Get("Host").MustString()
case "tcp":
header = httpHeader
}
}
}

Expand All @@ -399,14 +380,14 @@ func (c *APIClient) parseV2rayNodeResponse(s *serverConfig) (*api.NodeInfo, erro
NodeType: c.NodeType,
NodeID: c.NodeID,
Port: uint32(s.ServerPort),
AlterID: alterID,
AlterID: 0,
TransportProtocol: s.Network,
EnableTLS: enableTLS,
TLSType: TLSType,
Path: path,
Path: s.NetworkSettings.Path,
Host: host,
EnableVless: c.EnableVless,
ServiceName: serviceName,
ServiceName: s.NetworkSettings.ServiceName,
Header: header,
NameServerConfig: s.parseDNSConfig(),
}, nil
Expand Down
2 changes: 1 addition & 1 deletion service/controller/userbuilder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (c *Controller) buildUserTag(user *api.UserInfo) string {
}

func (c *Controller) checkShadowsocksPassword(password string, method string) (string, error) {
if c.panelType == "V2board" {
if strings.Contains(c.panelType, "V2board") {
var userKey string
if len(password) < 16 {
return "", fmt.Errorf("shadowsocks2022 key's length must be greater than 16")
Expand Down

0 comments on commit b5a8f44

Please sign in to comment.