github/trojan-go
4
0
Fork 0
mirror of https://github.com/p4gefau1t/trojan-go.git synced 2024-04-21 12:21:34 +00:00
Code Issues Releases Wiki Activity

Capitalize log info, add plain text server support

Browse Source
This commit is contained in:
Page Fault
2020-05-11 12:21:55 +00:00
parent cbb447505d
commit f88a3c551e
38 changed files with 236 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client.go
+3 -3
View File
@@ -26,14 +26,14 @@ type ClientAPI struct {
func (s *ClientAPI) GetTraffic(ctx context.Context, req *GetTrafficRequest) (*GetTrafficResponse, error) {
log.Debug("API: GetTraffic")
if req.User == nil {
return nil, common.NewError("user is unspecified")
return nil, common.NewError("User is unspecified")
}
if req.User.Hash == "" {
req.User.Hash = common.SHA224String(req.User.Password)
}
valid, meter := s.auth.AuthUser(req.User.Hash)
if !valid {
return nil, common.NewError("user " + req.User.Hash + " not found")
return nil, common.NewError("User " + req.User.Hash + " not found")
}
sent, recv := meter.Get()
sentSpeed, recvSpeed := meter.GetSpeed()
@@ -62,7 +62,7 @@ func RunClientAPI(ctx context.Context, config *conf.GlobalConfig, auth stat.Auth
if err != nil {
return err
}
log.Info("client api service is running at", config.API.APIAddress)
log.Info("Client api service is running at", config.API.APIAddress)
errChan := make(chan error, 1)
go func() {
errChan <- server.Serve(listener)
api/server.go
+6 -6
View File
@@ -29,7 +29,7 @@ func (s *ServerAPI) GetTraffic(stream TrojanServerService_GetTrafficServer) erro
return err
}
if req.User == nil {
return common.NewError("user is unspecified")
return common.NewError("User is unspecified")
}
if req.User.Hash == "" {
req.User.Hash = common.SHA224String(req.User.Password)
@@ -38,7 +38,7 @@ func (s *ServerAPI) GetTraffic(stream TrojanServerService_GetTrafficServer) erro
if !valid {
stream.Send(&GetTrafficResponse{
Success: false,
Info: "invalid user " + req.User.Hash,
Info: "Invalid user " + req.User.Hash,
})
continue
}
@@ -77,7 +77,7 @@ func (s *ServerAPI) SetUsers(stream TrojanServerService_SetUsersServer) error {
return err
}
if req.User == nil {
return common.NewError("user is unspecified")
return common.NewError("User is unspecified")
}
if req.User.Hash == "" {
req.User.Hash = common.SHA224String(req.User.Password)
@@ -88,7 +88,7 @@ func (s *ServerAPI) SetUsers(stream TrojanServerService_SetUsersServer) error {
if req.SpeedLimit != nil {
valid, meter := s.auth.AuthUser(req.User.Hash)
if !valid {
return common.NewError("failed to add new user")
return common.NewError("Failed to add new user")
}
meter.LimitSpeed(int(req.SpeedLimit.DownloadSpeed), int(req.SpeedLimit.UploadSpeed))
}
@@ -97,7 +97,7 @@ func (s *ServerAPI) SetUsers(stream TrojanServerService_SetUsersServer) error {
case SetUserRequest_Modify:
valid, meter := s.auth.AuthUser(req.User.Hash)
if !valid {
err = common.NewError("invalid user " + req.User.Hash)
err = common.NewError("Invalid user " + req.User.Hash)
} else {
meter.LimitSpeed(int(req.SpeedLimit.DownloadSpeed), int(req.SpeedLimit.UploadSpeed))
}
@@ -161,7 +161,7 @@ func RunServerAPI(ctx context.Context, config *conf.GlobalConfig, auth stat.Auth
if err != nil {
return err
}
log.Info("server api service is running at", config.API.APIAddress)
log.Info("Server api service is running at", config.API.APIAddress)
errChan := make(chan error, 1)
go func() {
errChan <- server.Serve(listener)