From c0f46d38b544560e24c8cef528022fcc77d2de53 Mon Sep 17 00:00:00 2001 From: p4gefau1t Date: Fri, 1 May 2020 07:56:07 -0400 Subject: [PATCH] implement server api --- api/api.pb.go | 971 +++++++---------------------------------- api/api.proto | 71 +-- api/client.go | 22 +- api/client_test.go | 2 +- api/server.go | 145 +++++- api/server_test.go | 91 ++++ proxy/client/client.go | 5 + proxy/server/server.go | 4 + 8 files changed, 425 insertions(+), 886 deletions(-) create mode 100644 api/server_test.go diff --git a/api/api.pb.go b/api/api.pb.go index 6490c32..71fb6a2 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -24,6 +24,34 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +type SetUserRequest_Operation int32 + +const ( + SetUserRequest_Add SetUserRequest_Operation = 0 + SetUserRequest_Delete SetUserRequest_Operation = 1 + SetUserRequest_Modify SetUserRequest_Operation = 2 +) + +var SetUserRequest_Operation_name = map[int32]string{ + 0: "Add", + 1: "Delete", + 2: "Modify", +} + +var SetUserRequest_Operation_value = map[string]int32{ + "Add": 0, + "Delete": 1, + "Modify": 2, +} + +func (x SetUserRequest_Operation) String() string { + return proto.EnumName(SetUserRequest_Operation_name, int32(x)) +} + +func (SetUserRequest_Operation) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_00212fb1f9d3bf1c, []int{7, 0} +} + type Traffic struct { UploadTraffic uint64 `protobuf:"varint,1,opt,name=upload_traffic,json=uploadTraffic,proto3" json:"upload_traffic,omitempty"` DownloadTraffic uint64 `protobuf:"varint,2,opt,name=download_traffic,json=downloadTraffic,proto3" json:"download_traffic,omitempty"` @@ -121,7 +149,6 @@ func (m *Speed) GetDownloadSpeed() uint64 { type User struct { Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` Hash string `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` - Valid bool `protobuf:"varint,3,opt,name=valid,proto3" json:"valid,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -166,13 +193,6 @@ func (m *User) GetHash() string { return "" } -func (m *User) GetValid() bool { - if m != nil { - return m.Valid - } - return false -} - type GetTrafficRequest struct { User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -213,8 +233,11 @@ func (m *GetTrafficRequest) GetUser() *User { } type GetTrafficResponse struct { - TrafficTotal *Traffic `protobuf:"bytes,1,opt,name=traffic_total,json=trafficTotal,proto3" json:"traffic_total,omitempty"` - TrafficQuota *Traffic `protobuf:"bytes,2,opt,name=traffic_quota,json=trafficQuota,proto3" json:"traffic_quota,omitempty"` + Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` + TrafficTotal *Traffic `protobuf:"bytes,2,opt,name=traffic_total,json=trafficTotal,proto3" json:"traffic_total,omitempty"` + SpeedCurrent *Speed `protobuf:"bytes,3,opt,name=speed_current,json=speedCurrent,proto3" json:"speed_current,omitempty"` + SpeedLimit *Speed `protobuf:"bytes,4,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` + Info string `protobuf:"bytes,5,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -245,6 +268,13 @@ func (m *GetTrafficResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetTrafficResponse proto.InternalMessageInfo +func (m *GetTrafficResponse) GetSuccess() bool { + if m != nil { + return m.Success + } + return false +} + func (m *GetTrafficResponse) GetTrafficTotal() *Traffic { if m != nil { return m.TrafficTotal @@ -252,99 +282,27 @@ func (m *GetTrafficResponse) GetTrafficTotal() *Traffic { return nil } -func (m *GetTrafficResponse) GetTrafficQuota() *Traffic { - if m != nil { - return m.TrafficQuota - } - return nil -} - -type GetSpeedRequest struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetSpeedRequest) Reset() { *m = GetSpeedRequest{} } -func (m *GetSpeedRequest) String() string { return proto.CompactTextString(m) } -func (*GetSpeedRequest) ProtoMessage() {} -func (*GetSpeedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{5} -} - -func (m *GetSpeedRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetSpeedRequest.Unmarshal(m, b) -} -func (m *GetSpeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetSpeedRequest.Marshal(b, m, deterministic) -} -func (m *GetSpeedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSpeedRequest.Merge(m, src) -} -func (m *GetSpeedRequest) XXX_Size() int { - return xxx_messageInfo_GetSpeedRequest.Size(m) -} -func (m *GetSpeedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetSpeedRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetSpeedRequest proto.InternalMessageInfo - -func (m *GetSpeedRequest) GetUser() *User { - if m != nil { - return m.User - } - return nil -} - -type GetSpeedResponse struct { - SpeedCurrent *Speed `protobuf:"bytes,1,opt,name=speed_current,json=speedCurrent,proto3" json:"speed_current,omitempty"` - SpeedLimit *Speed `protobuf:"bytes,2,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetSpeedResponse) Reset() { *m = GetSpeedResponse{} } -func (m *GetSpeedResponse) String() string { return proto.CompactTextString(m) } -func (*GetSpeedResponse) ProtoMessage() {} -func (*GetSpeedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{6} -} - -func (m *GetSpeedResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetSpeedResponse.Unmarshal(m, b) -} -func (m *GetSpeedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetSpeedResponse.Marshal(b, m, deterministic) -} -func (m *GetSpeedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSpeedResponse.Merge(m, src) -} -func (m *GetSpeedResponse) XXX_Size() int { - return xxx_messageInfo_GetSpeedResponse.Size(m) -} -func (m *GetSpeedResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetSpeedResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetSpeedResponse proto.InternalMessageInfo - -func (m *GetSpeedResponse) GetSpeedCurrent() *Speed { +func (m *GetTrafficResponse) GetSpeedCurrent() *Speed { if m != nil { return m.SpeedCurrent } return nil } -func (m *GetSpeedResponse) GetSpeedLimit() *Speed { +func (m *GetTrafficResponse) GetSpeedLimit() *Speed { if m != nil { return m.SpeedLimit } return nil } +func (m *GetTrafficResponse) GetInfo() string { + if m != nil { + return m.Info + } + return "" +} + type ListUserRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -355,7 +313,7 @@ func (m *ListUserRequest) Reset() { *m = ListUserRequest{} } func (m *ListUserRequest) String() string { return proto.CompactTextString(m) } func (*ListUserRequest) ProtoMessage() {} func (*ListUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{7} + return fileDescriptor_00212fb1f9d3bf1c, []int{5} } func (m *ListUserRequest) XXX_Unmarshal(b []byte) error { @@ -380,9 +338,8 @@ type ListUserResponse struct { User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` Online bool `protobuf:"varint,2,opt,name=online,proto3" json:"online,omitempty"` TrafficTotal *Traffic `protobuf:"bytes,3,opt,name=traffic_total,json=trafficTotal,proto3" json:"traffic_total,omitempty"` - TrafficQuota *Traffic `protobuf:"bytes,4,opt,name=traffic_quota,json=trafficQuota,proto3" json:"traffic_quota,omitempty"` - SpeedCurrent *Speed `protobuf:"bytes,5,opt,name=speed_current,json=speedCurrent,proto3" json:"speed_current,omitempty"` - SpeedLimit *Speed `protobuf:"bytes,6,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` + SpeedCurrent *Speed `protobuf:"bytes,4,opt,name=speed_current,json=speedCurrent,proto3" json:"speed_current,omitempty"` + SpeedLimit *Speed `protobuf:"bytes,5,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -392,7 +349,7 @@ func (m *ListUserResponse) Reset() { *m = ListUserResponse{} } func (m *ListUserResponse) String() string { return proto.CompactTextString(m) } func (*ListUserResponse) ProtoMessage() {} func (*ListUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{8} + return fileDescriptor_00212fb1f9d3bf1c, []int{6} } func (m *ListUserResponse) XXX_Unmarshal(b []byte) error { @@ -434,13 +391,6 @@ func (m *ListUserResponse) GetTrafficTotal() *Traffic { return nil } -func (m *ListUserResponse) GetTrafficQuota() *Traffic { - if m != nil { - return m.TrafficQuota - } - return nil -} - func (m *ListUserResponse) GetSpeedCurrent() *Speed { if m != nil { return m.SpeedCurrent @@ -455,148 +405,62 @@ func (m *ListUserResponse) GetSpeedLimit() *Speed { return nil } -type SetTrafficRequest struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - TrafficQuota *Traffic `protobuf:"bytes,2,opt,name=traffic_quota,json=trafficQuota,proto3" json:"traffic_quota,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type SetUserRequest struct { + User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` + SpeedLimit *Speed `protobuf:"bytes,2,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` + Operation SetUserRequest_Operation `protobuf:"varint,3,opt,name=operation,proto3,enum=api.SetUserRequest_Operation" json:"operation,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *SetTrafficRequest) Reset() { *m = SetTrafficRequest{} } -func (m *SetTrafficRequest) String() string { return proto.CompactTextString(m) } -func (*SetTrafficRequest) ProtoMessage() {} -func (*SetTrafficRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{9} +func (m *SetUserRequest) Reset() { *m = SetUserRequest{} } +func (m *SetUserRequest) String() string { return proto.CompactTextString(m) } +func (*SetUserRequest) ProtoMessage() {} +func (*SetUserRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_00212fb1f9d3bf1c, []int{7} } -func (m *SetTrafficRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetTrafficRequest.Unmarshal(m, b) +func (m *SetUserRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetUserRequest.Unmarshal(m, b) } -func (m *SetTrafficRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetTrafficRequest.Marshal(b, m, deterministic) +func (m *SetUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetUserRequest.Marshal(b, m, deterministic) } -func (m *SetTrafficRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetTrafficRequest.Merge(m, src) +func (m *SetUserRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetUserRequest.Merge(m, src) } -func (m *SetTrafficRequest) XXX_Size() int { - return xxx_messageInfo_SetTrafficRequest.Size(m) +func (m *SetUserRequest) XXX_Size() int { + return xxx_messageInfo_SetUserRequest.Size(m) } -func (m *SetTrafficRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SetTrafficRequest.DiscardUnknown(m) +func (m *SetUserRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetUserRequest.DiscardUnknown(m) } -var xxx_messageInfo_SetTrafficRequest proto.InternalMessageInfo +var xxx_messageInfo_SetUserRequest proto.InternalMessageInfo -func (m *SetTrafficRequest) GetUser() *User { +func (m *SetUserRequest) GetUser() *User { if m != nil { return m.User } return nil } -func (m *SetTrafficRequest) GetTrafficQuota() *Traffic { - if m != nil { - return m.TrafficQuota - } - return nil -} - -type SetTrafficReponse struct { - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Info string `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SetTrafficReponse) Reset() { *m = SetTrafficReponse{} } -func (m *SetTrafficReponse) String() string { return proto.CompactTextString(m) } -func (*SetTrafficReponse) ProtoMessage() {} -func (*SetTrafficReponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{10} -} - -func (m *SetTrafficReponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetTrafficReponse.Unmarshal(m, b) -} -func (m *SetTrafficReponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetTrafficReponse.Marshal(b, m, deterministic) -} -func (m *SetTrafficReponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetTrafficReponse.Merge(m, src) -} -func (m *SetTrafficReponse) XXX_Size() int { - return xxx_messageInfo_SetTrafficReponse.Size(m) -} -func (m *SetTrafficReponse) XXX_DiscardUnknown() { - xxx_messageInfo_SetTrafficReponse.DiscardUnknown(m) -} - -var xxx_messageInfo_SetTrafficReponse proto.InternalMessageInfo - -func (m *SetTrafficReponse) GetSuccess() bool { - if m != nil { - return m.Success - } - return false -} - -func (m *SetTrafficReponse) GetInfo() string { - if m != nil { - return m.Info - } - return "" -} - -type SetSpeedRequest struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - SpeedLimit *Speed `protobuf:"bytes,2,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SetSpeedRequest) Reset() { *m = SetSpeedRequest{} } -func (m *SetSpeedRequest) String() string { return proto.CompactTextString(m) } -func (*SetSpeedRequest) ProtoMessage() {} -func (*SetSpeedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{11} -} - -func (m *SetSpeedRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetSpeedRequest.Unmarshal(m, b) -} -func (m *SetSpeedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetSpeedRequest.Marshal(b, m, deterministic) -} -func (m *SetSpeedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetSpeedRequest.Merge(m, src) -} -func (m *SetSpeedRequest) XXX_Size() int { - return xxx_messageInfo_SetSpeedRequest.Size(m) -} -func (m *SetSpeedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SetSpeedRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_SetSpeedRequest proto.InternalMessageInfo - -func (m *SetSpeedRequest) GetUser() *User { - if m != nil { - return m.User - } - return nil -} - -func (m *SetSpeedRequest) GetSpeedLimit() *Speed { +func (m *SetUserRequest) GetSpeedLimit() *Speed { if m != nil { return m.SpeedLimit } return nil } -type SetSpeedResponse struct { +func (m *SetUserRequest) GetOperation() SetUserRequest_Operation { + if m != nil { + return m.Operation + } + return SetUserRequest_Add +} + +type SetUserResponse struct { Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` Info string `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -604,219 +468,39 @@ type SetSpeedResponse struct { XXX_sizecache int32 `json:"-"` } -func (m *SetSpeedResponse) Reset() { *m = SetSpeedResponse{} } -func (m *SetSpeedResponse) String() string { return proto.CompactTextString(m) } -func (*SetSpeedResponse) ProtoMessage() {} -func (*SetSpeedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{12} +func (m *SetUserResponse) Reset() { *m = SetUserResponse{} } +func (m *SetUserResponse) String() string { return proto.CompactTextString(m) } +func (*SetUserResponse) ProtoMessage() {} +func (*SetUserResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_00212fb1f9d3bf1c, []int{8} } -func (m *SetSpeedResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetSpeedResponse.Unmarshal(m, b) +func (m *SetUserResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetUserResponse.Unmarshal(m, b) } -func (m *SetSpeedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetSpeedResponse.Marshal(b, m, deterministic) +func (m *SetUserResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetUserResponse.Marshal(b, m, deterministic) } -func (m *SetSpeedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetSpeedResponse.Merge(m, src) +func (m *SetUserResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetUserResponse.Merge(m, src) } -func (m *SetSpeedResponse) XXX_Size() int { - return xxx_messageInfo_SetSpeedResponse.Size(m) +func (m *SetUserResponse) XXX_Size() int { + return xxx_messageInfo_SetUserResponse.Size(m) } -func (m *SetSpeedResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SetSpeedResponse.DiscardUnknown(m) +func (m *SetUserResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SetUserResponse.DiscardUnknown(m) } -var xxx_messageInfo_SetSpeedResponse proto.InternalMessageInfo +var xxx_messageInfo_SetUserResponse proto.InternalMessageInfo -func (m *SetSpeedResponse) GetSuccess() bool { +func (m *SetUserResponse) GetSuccess() bool { if m != nil { return m.Success } return false } -func (m *SetSpeedResponse) GetInfo() string { - if m != nil { - return m.Info - } - return "" -} - -type AddUserRequest struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - TrafficQuota *Traffic `protobuf:"bytes,4,opt,name=traffic_quota,json=trafficQuota,proto3" json:"traffic_quota,omitempty"` - SpeedLimit *Speed `protobuf:"bytes,6,opt,name=speed_limit,json=speedLimit,proto3" json:"speed_limit,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddUserRequest) Reset() { *m = AddUserRequest{} } -func (m *AddUserRequest) String() string { return proto.CompactTextString(m) } -func (*AddUserRequest) ProtoMessage() {} -func (*AddUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{13} -} - -func (m *AddUserRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddUserRequest.Unmarshal(m, b) -} -func (m *AddUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddUserRequest.Marshal(b, m, deterministic) -} -func (m *AddUserRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddUserRequest.Merge(m, src) -} -func (m *AddUserRequest) XXX_Size() int { - return xxx_messageInfo_AddUserRequest.Size(m) -} -func (m *AddUserRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AddUserRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_AddUserRequest proto.InternalMessageInfo - -func (m *AddUserRequest) GetUser() *User { - if m != nil { - return m.User - } - return nil -} - -func (m *AddUserRequest) GetTrafficQuota() *Traffic { - if m != nil { - return m.TrafficQuota - } - return nil -} - -func (m *AddUserRequest) GetSpeedLimit() *Speed { - if m != nil { - return m.SpeedLimit - } - return nil -} - -type AddUserResponse struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddUserResponse) Reset() { *m = AddUserResponse{} } -func (m *AddUserResponse) String() string { return proto.CompactTextString(m) } -func (*AddUserResponse) ProtoMessage() {} -func (*AddUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{14} -} - -func (m *AddUserResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddUserResponse.Unmarshal(m, b) -} -func (m *AddUserResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddUserResponse.Marshal(b, m, deterministic) -} -func (m *AddUserResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddUserResponse.Merge(m, src) -} -func (m *AddUserResponse) XXX_Size() int { - return xxx_messageInfo_AddUserResponse.Size(m) -} -func (m *AddUserResponse) XXX_DiscardUnknown() { - xxx_messageInfo_AddUserResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_AddUserResponse proto.InternalMessageInfo - -func (m *AddUserResponse) GetUser() *User { - if m != nil { - return m.User - } - return nil -} - -type DeleteUserRequest struct { - User *User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteUserRequest) Reset() { *m = DeleteUserRequest{} } -func (m *DeleteUserRequest) String() string { return proto.CompactTextString(m) } -func (*DeleteUserRequest) ProtoMessage() {} -func (*DeleteUserRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{15} -} - -func (m *DeleteUserRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteUserRequest.Unmarshal(m, b) -} -func (m *DeleteUserRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteUserRequest.Marshal(b, m, deterministic) -} -func (m *DeleteUserRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteUserRequest.Merge(m, src) -} -func (m *DeleteUserRequest) XXX_Size() int { - return xxx_messageInfo_DeleteUserRequest.Size(m) -} -func (m *DeleteUserRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteUserRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DeleteUserRequest proto.InternalMessageInfo - -func (m *DeleteUserRequest) GetUser() *User { - if m != nil { - return m.User - } - return nil -} - -type DeleteUserResponse struct { - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Info string `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteUserResponse) Reset() { *m = DeleteUserResponse{} } -func (m *DeleteUserResponse) String() string { return proto.CompactTextString(m) } -func (*DeleteUserResponse) ProtoMessage() {} -func (*DeleteUserResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00212fb1f9d3bf1c, []int{16} -} - -func (m *DeleteUserResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteUserResponse.Unmarshal(m, b) -} -func (m *DeleteUserResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteUserResponse.Marshal(b, m, deterministic) -} -func (m *DeleteUserResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteUserResponse.Merge(m, src) -} -func (m *DeleteUserResponse) XXX_Size() int { - return xxx_messageInfo_DeleteUserResponse.Size(m) -} -func (m *DeleteUserResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteUserResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DeleteUserResponse proto.InternalMessageInfo - -func (m *DeleteUserResponse) GetSuccess() bool { - if m != nil { - return m.Success - } - return false -} - -func (m *DeleteUserResponse) GetInfo() string { +func (m *SetUserResponse) GetInfo() string { if m != nil { return m.Info } @@ -824,23 +508,16 @@ func (m *DeleteUserResponse) GetInfo() string { } func init() { + proto.RegisterEnum("api.SetUserRequest_Operation", SetUserRequest_Operation_name, SetUserRequest_Operation_value) proto.RegisterType((*Traffic)(nil), "api.Traffic") proto.RegisterType((*Speed)(nil), "api.Speed") proto.RegisterType((*User)(nil), "api.User") proto.RegisterType((*GetTrafficRequest)(nil), "api.GetTrafficRequest") proto.RegisterType((*GetTrafficResponse)(nil), "api.GetTrafficResponse") - proto.RegisterType((*GetSpeedRequest)(nil), "api.GetSpeedRequest") - proto.RegisterType((*GetSpeedResponse)(nil), "api.GetSpeedResponse") proto.RegisterType((*ListUserRequest)(nil), "api.ListUserRequest") proto.RegisterType((*ListUserResponse)(nil), "api.ListUserResponse") - proto.RegisterType((*SetTrafficRequest)(nil), "api.SetTrafficRequest") - proto.RegisterType((*SetTrafficReponse)(nil), "api.SetTrafficReponse") - proto.RegisterType((*SetSpeedRequest)(nil), "api.SetSpeedRequest") - proto.RegisterType((*SetSpeedResponse)(nil), "api.SetSpeedResponse") - proto.RegisterType((*AddUserRequest)(nil), "api.AddUserRequest") - proto.RegisterType((*AddUserResponse)(nil), "api.AddUserResponse") - proto.RegisterType((*DeleteUserRequest)(nil), "api.DeleteUserRequest") - proto.RegisterType((*DeleteUserResponse)(nil), "api.DeleteUserResponse") + proto.RegisterType((*SetUserRequest)(nil), "api.SetUserRequest") + proto.RegisterType((*SetUserResponse)(nil), "api.SetUserResponse") } func init() { @@ -848,47 +525,41 @@ func init() { } var fileDescriptor_00212fb1f9d3bf1c = []byte{ - // 634 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xad, 0x9b, 0x8f, 0x3a, 0x93, 0xa4, 0x49, 0xb6, 0xa1, 0x44, 0x91, 0x90, 0x60, 0x25, 0xa4, - 0x22, 0xa4, 0x52, 0xc2, 0x09, 0x01, 0x82, 0x36, 0x95, 0xb8, 0xe4, 0x52, 0x3b, 0x9c, 0x10, 0x8a, - 0x4c, 0xbc, 0x51, 0x8d, 0x8c, 0xed, 0x7a, 0xd7, 0xad, 0xc4, 0x7f, 0x40, 0x88, 0x1f, 0xc8, 0x7f, - 0xc1, 0xfb, 0x95, 0xd8, 0x71, 0x69, 0xe3, 0x70, 0xf3, 0x8e, 0xdf, 0x9b, 0x79, 0x7e, 0x79, 0x3b, - 0x0a, 0x34, 0x9c, 0xc8, 0x3b, 0x8e, 0xe2, 0x90, 0x85, 0xa8, 0x92, 0x3e, 0xe2, 0xcf, 0xb0, 0x37, - 0x8d, 0x9d, 0xc5, 0xc2, 0x9b, 0xa3, 0xa7, 0xb0, 0x9f, 0x44, 0x7e, 0xe8, 0xb8, 0x33, 0x26, 0x2b, - 0x03, 0xe3, 0xb1, 0x71, 0x54, 0xb5, 0xda, 0xb2, 0xaa, 0x61, 0xcf, 0xa0, 0xeb, 0x86, 0x37, 0x41, - 0x0e, 0xb8, 0x2b, 0x80, 0x1d, 0x5d, 0x57, 0x50, 0x7c, 0x01, 0x35, 0x3b, 0x22, 0xc4, 0x45, 0x4f, - 0xa0, 0xa5, 0x5a, 0x53, 0x7e, 0x56, 0x8d, 0x9b, 0xb2, 0x26, 0x21, 0xe9, 0xf4, 0x65, 0x5b, 0x09, - 0x92, 0x4d, 0xdb, 0xba, 0x2a, 0x60, 0x78, 0x02, 0xd5, 0x4f, 0x94, 0xc4, 0x68, 0x08, 0x66, 0xe4, - 0x50, 0x7a, 0x13, 0xc6, 0xb2, 0x5b, 0xc3, 0x5a, 0x9e, 0x11, 0x82, 0xea, 0xa5, 0x43, 0x2f, 0x45, - 0x83, 0x86, 0x25, 0x9e, 0x51, 0x1f, 0x6a, 0xd7, 0x8e, 0xef, 0xb9, 0x83, 0x4a, 0x5a, 0x34, 0x2d, - 0x79, 0xc0, 0x23, 0xe8, 0x7d, 0x24, 0x4c, 0xc9, 0xb5, 0xc8, 0x55, 0x42, 0x28, 0x43, 0x8f, 0xa0, - 0x9a, 0xa4, 0x23, 0x44, 0xdb, 0xe6, 0xa8, 0x71, 0xcc, 0x1d, 0xe3, 0x33, 0x2d, 0x51, 0xc6, 0x3f, - 0x00, 0x65, 0x39, 0x34, 0x0a, 0x03, 0x4a, 0xd0, 0x4b, 0x68, 0x2b, 0x33, 0x66, 0x2c, 0x64, 0x8e, - 0xaf, 0xd8, 0x2d, 0xc1, 0xd6, 0xe0, 0x96, 0x82, 0x4c, 0x39, 0x22, 0x4b, 0xb9, 0x4a, 0xd2, 0x8a, - 0xd0, 0xfb, 0x2f, 0xca, 0x05, 0x47, 0xe0, 0x13, 0xe8, 0xa4, 0xb3, 0x85, 0x13, 0x1b, 0xaa, 0x8d, - 0xa0, 0xbb, 0x62, 0x28, 0xad, 0x2f, 0xa0, 0x2d, 0x1c, 0x9e, 0xcd, 0x93, 0x38, 0x26, 0x01, 0x53, - 0x5c, 0x10, 0x5c, 0x09, 0x6d, 0x09, 0xc0, 0x58, 0xbe, 0x47, 0xcf, 0xa1, 0x29, 0x09, 0xbe, 0xf7, - 0xdd, 0x63, 0x4a, 0x67, 0x16, 0x0e, 0xe2, 0xf5, 0x84, 0xbf, 0xc5, 0x3d, 0xe8, 0x4c, 0x3c, 0xca, - 0x84, 0x06, 0xa9, 0x11, 0xff, 0xdc, 0x85, 0xee, 0xaa, 0xa6, 0x54, 0xdc, 0x2d, 0x1c, 0x1d, 0x42, - 0x3d, 0x0c, 0x7c, 0x2f, 0x20, 0x62, 0x9c, 0x69, 0xa9, 0x53, 0xd1, 0xe8, 0x4a, 0x79, 0xa3, 0xab, - 0xf7, 0x19, 0x5d, 0xb4, 0xa8, 0x56, 0xce, 0xa2, 0xfa, 0x9d, 0x16, 0x11, 0xe8, 0xd9, 0x25, 0x63, - 0xb7, 0x4d, 0x5a, 0x4e, 0xf3, 0x63, 0xa4, 0xed, 0x03, 0xd8, 0xa3, 0xc9, 0x7c, 0x4e, 0x28, 0x15, - 0x93, 0x4c, 0x4b, 0x1f, 0xf9, 0xb5, 0xf1, 0x82, 0x45, 0xa8, 0xaf, 0x0d, 0x7f, 0xc6, 0x5f, 0xa0, - 0x63, 0x97, 0x0a, 0x5c, 0xb9, 0xac, 0x7c, 0x80, 0xae, 0xbd, 0x9e, 0xce, 0x72, 0x02, 0x7f, 0x19, - 0xb0, 0x7f, 0xea, 0xba, 0x99, 0xb4, 0x95, 0x36, 0xf2, 0xfe, 0x34, 0x94, 0xfa, 0x71, 0xd3, 0x3b, - 0xba, 0x14, 0xb4, 0x51, 0xd4, 0xf9, 0x16, 0x3a, 0x27, 0x3e, 0x61, 0x64, 0xf3, 0xaf, 0xc0, 0x67, - 0x80, 0xb2, 0x9c, 0x6d, 0xbc, 0x1b, 0xfd, 0x36, 0xe0, 0x60, 0x1a, 0x87, 0xdf, 0x9c, 0x60, 0xec, - 0x7b, 0x69, 0x88, 0x6d, 0x12, 0x5f, 0x7b, 0x73, 0x82, 0xde, 0x03, 0xac, 0x36, 0x1c, 0x3a, 0x14, - 0xa3, 0x0b, 0x6b, 0x72, 0xf8, 0xb0, 0x50, 0x97, 0x22, 0xf0, 0x0e, 0x7a, 0x0d, 0xa6, 0x5e, 0x3a, - 0xa8, 0xaf, 0x61, 0xd9, 0x10, 0x0d, 0x1f, 0xac, 0x55, 0x35, 0x75, 0xf4, 0xa7, 0xa2, 0x35, 0x71, - 0x35, 0x24, 0xd6, 0x9a, 0xde, 0x42, 0x43, 0x6f, 0x10, 0xaa, 0x7a, 0xae, 0x6d, 0x19, 0xd5, 0x73, - 0x7d, 0xcf, 0xe0, 0x9d, 0x13, 0x03, 0x8d, 0xff, 0xf3, 0x8b, 0x8e, 0x8c, 0xb4, 0xc9, 0x19, 0x80, - 0xbd, 0xde, 0xa4, 0x70, 0x8d, 0x87, 0xc5, 0x7a, 0xb6, 0xc7, 0xbb, 0xad, 0x9d, 0xd1, 0x74, 0x3b, - 0x4f, 0xb7, 0x6f, 0xa5, 0xdb, 0xb7, 0xd3, 0xdf, 0x80, 0xa9, 0xa2, 0x49, 0xd1, 0x81, 0x00, 0xe6, - 0xaf, 0xce, 0xb0, 0x9f, 0x2f, 0xe6, 0xc8, 0xe7, 0xd0, 0x5c, 0x25, 0x8e, 0xaa, 0xef, 0x2f, 0xe4, - 0x56, 0x99, 0x58, 0xcc, 0xa6, 0xec, 0xf2, 0xb5, 0x2e, 0xfe, 0x7b, 0xbc, 0xfa, 0x1b, 0x00, 0x00, - 0xff, 0xff, 0xad, 0xc6, 0xad, 0x2b, 0x88, 0x08, 0x00, 0x00, + // 543 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0x5d, 0x6b, 0x13, 0x41, + 0x14, 0x86, 0xbb, 0xc9, 0xe6, 0x63, 0x4f, 0x3e, 0x7b, 0x5a, 0x6b, 0x08, 0x14, 0x74, 0x40, 0xa8, + 0x28, 0x51, 0x57, 0xf0, 0xa6, 0x42, 0x91, 0x08, 0xde, 0x54, 0xc4, 0x4d, 0xf4, 0xc6, 0x8b, 0xb0, + 0x66, 0x27, 0x74, 0x64, 0xdd, 0x59, 0x77, 0x26, 0x16, 0x7f, 0xa1, 0x3f, 0x40, 0xbc, 0xf1, 0xd7, + 0x98, 0x3d, 0xb3, 0x93, 0x4f, 0x49, 0x29, 0xde, 0xcd, 0xbc, 0xf3, 0x9e, 0x67, 0xcf, 0x79, 0x67, + 0x12, 0xf0, 0xc2, 0x54, 0x0c, 0xd2, 0x4c, 0x6a, 0x89, 0xe5, 0xc5, 0x92, 0x7d, 0x82, 0xda, 0x38, + 0x0b, 0x67, 0x33, 0x31, 0xc5, 0x07, 0xd0, 0x9e, 0xa7, 0xb1, 0x0c, 0xa3, 0x89, 0x36, 0x4a, 0xcf, + 0xb9, 0xe7, 0x9c, 0xb9, 0x41, 0xcb, 0xa8, 0xd6, 0xf6, 0x10, 0xba, 0x91, 0xbc, 0x4e, 0x36, 0x8c, + 0x25, 0x32, 0x76, 0xac, 0x5e, 0x58, 0xd9, 0x7b, 0xa8, 0x8c, 0x52, 0xce, 0x23, 0xbc, 0x0f, 0xcd, + 0x02, 0xad, 0xf2, 0x7d, 0x01, 0x6e, 0x18, 0xcd, 0x58, 0x16, 0x5f, 0x5f, 0x62, 0x8d, 0xc9, 0x40, + 0x5b, 0x56, 0x25, 0x1b, 0x7b, 0x01, 0xee, 0x07, 0xc5, 0x33, 0xec, 0x43, 0x3d, 0x0d, 0x95, 0xba, + 0x96, 0x99, 0xa1, 0x79, 0xc1, 0x72, 0x8f, 0x08, 0xee, 0x55, 0xa8, 0xae, 0x08, 0xe0, 0x05, 0xb4, + 0x66, 0x3e, 0x1c, 0xbe, 0xe1, 0xba, 0x68, 0x2c, 0xe0, 0xdf, 0xe6, 0x5c, 0x69, 0x3c, 0x05, 0x77, + 0xbe, 0x80, 0x11, 0xa0, 0xe1, 0x7b, 0x83, 0x3c, 0x9b, 0x9c, 0x1e, 0x90, 0xcc, 0x7e, 0x39, 0x80, + 0xeb, 0x45, 0x2a, 0x95, 0x89, 0xe2, 0xd8, 0x83, 0x9a, 0x9a, 0x4f, 0xa7, 0x5c, 0x29, 0x2a, 0xac, + 0x07, 0x76, 0x8b, 0xcf, 0xa0, 0x55, 0x24, 0x32, 0xd1, 0x52, 0x87, 0x31, 0x75, 0xd0, 0xf0, 0x9b, + 0x04, 0xb6, 0x98, 0x66, 0x61, 0x19, 0xe7, 0x0e, 0x7c, 0x02, 0x2d, 0x9a, 0x76, 0x32, 0x9d, 0x67, + 0x19, 0x4f, 0x74, 0xaf, 0x4c, 0x25, 0x40, 0x25, 0x34, 0x72, 0xd0, 0x24, 0xc3, 0xd0, 0x9c, 0xe3, + 0x23, 0x68, 0x98, 0x82, 0x58, 0x7c, 0x15, 0xba, 0xe7, 0xee, 0xd8, 0x81, 0x8e, 0x2f, 0xf3, 0xd3, + 0x3c, 0x09, 0x91, 0xcc, 0x64, 0xaf, 0x62, 0x92, 0xc8, 0xd7, 0xec, 0x10, 0x3a, 0x97, 0x42, 0x69, + 0x9a, 0xd3, 0xe4, 0xc0, 0xfe, 0x38, 0xd0, 0x5d, 0x69, 0xc5, 0x98, 0xfb, 0xc3, 0xc1, 0x13, 0xa8, + 0xca, 0x24, 0x16, 0x09, 0xa7, 0x21, 0xeb, 0x41, 0xb1, 0xdb, 0xcd, 0xa0, 0x7c, 0xfb, 0x0c, 0xdc, + 0xdb, 0x65, 0x50, 0xd9, 0x97, 0x01, 0xfb, 0xe9, 0x40, 0x7b, 0xc4, 0xd7, 0xe7, 0xbd, 0x69, 0xb4, + 0x2d, 0x7c, 0x69, 0x6f, 0xc4, 0xe7, 0xe0, 0xc9, 0x94, 0x67, 0xa1, 0x16, 0x32, 0xa1, 0x59, 0xdb, + 0xfe, 0xa9, 0xb1, 0x6e, 0x7c, 0x73, 0xf0, 0xce, 0x9a, 0x82, 0x95, 0x9f, 0x3d, 0x06, 0x6f, 0xa9, + 0x63, 0x0d, 0xca, 0xaf, 0xa2, 0xa8, 0x7b, 0x80, 0x00, 0xd5, 0xd7, 0x3c, 0xe6, 0x9a, 0x77, 0x9d, + 0x7c, 0xfd, 0x56, 0x46, 0x62, 0xf6, 0xa3, 0x5b, 0x62, 0x17, 0xd0, 0x59, 0x42, 0x6f, 0x7c, 0x8b, + 0xf6, 0xea, 0x4b, 0xab, 0xab, 0xf7, 0x3f, 0xc2, 0xd1, 0x38, 0x93, 0x5f, 0xc2, 0x64, 0x18, 0x8b, + 0x45, 0x8e, 0x23, 0x9e, 0x7d, 0x17, 0x53, 0x8e, 0x17, 0x00, 0xab, 0x67, 0x8e, 0x27, 0xd4, 0xfd, + 0xce, 0x8f, 0xa5, 0x7f, 0x77, 0x47, 0x37, 0x3d, 0xb0, 0x03, 0xff, 0xb7, 0x63, 0xc1, 0x39, 0x92, + 0x67, 0x16, 0xfc, 0x12, 0x3c, 0xfb, 0xac, 0x14, 0x1e, 0x53, 0xfd, 0xd6, 0xd3, 0xeb, 0xdf, 0xd9, + 0x52, 0x2d, 0xf3, 0xa9, 0x83, 0xc3, 0xff, 0x6c, 0xeb, 0xcc, 0x59, 0x40, 0xce, 0xa1, 0x5e, 0x64, + 0xa6, 0xf0, 0xe8, 0x1f, 0xf7, 0xd2, 0x3f, 0xde, 0x14, 0xd7, 0x8b, 0x3f, 0x57, 0xe9, 0x8f, 0xf2, + 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x39, 0xcf, 0x4f, 0x4f, 0x35, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -904,7 +575,6 @@ const _ = grpc.SupportPackageIsVersion6 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type TrojanClientServiceClient interface { GetTraffic(ctx context.Context, in *GetTrafficRequest, opts ...grpc.CallOption) (*GetTrafficResponse, error) - GetSpeed(ctx context.Context, in *GetSpeedRequest, opts ...grpc.CallOption) (*GetSpeedResponse, error) } type trojanClientServiceClient struct { @@ -924,19 +594,9 @@ func (c *trojanClientServiceClient) GetTraffic(ctx context.Context, in *GetTraff return out, nil } -func (c *trojanClientServiceClient) GetSpeed(ctx context.Context, in *GetSpeedRequest, opts ...grpc.CallOption) (*GetSpeedResponse, error) { - out := new(GetSpeedResponse) - err := c.cc.Invoke(ctx, "/api.TrojanClientService/GetSpeed", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - // TrojanClientServiceServer is the server API for TrojanClientService service. type TrojanClientServiceServer interface { GetTraffic(context.Context, *GetTrafficRequest) (*GetTrafficResponse, error) - GetSpeed(context.Context, *GetSpeedRequest) (*GetSpeedResponse, error) } // UnimplementedTrojanClientServiceServer can be embedded to have forward compatible implementations. @@ -946,9 +606,6 @@ type UnimplementedTrojanClientServiceServer struct { func (*UnimplementedTrojanClientServiceServer) GetTraffic(ctx context.Context, req *GetTrafficRequest) (*GetTrafficResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTraffic not implemented") } -func (*UnimplementedTrojanClientServiceServer) GetSpeed(ctx context.Context, req *GetSpeedRequest) (*GetSpeedResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetSpeed not implemented") -} func RegisterTrojanClientServiceServer(s *grpc.Server, srv TrojanClientServiceServer) { s.RegisterService(&_TrojanClientService_serviceDesc, srv) @@ -972,24 +629,6 @@ func _TrojanClientService_GetTraffic_Handler(srv interface{}, ctx context.Contex return interceptor(ctx, in, info, handler) } -func _TrojanClientService_GetSpeed_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetSpeedRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TrojanClientServiceServer).GetSpeed(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/api.TrojanClientService/GetSpeed", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TrojanClientServiceServer).GetSpeed(ctx, req.(*GetSpeedRequest)) - } - return interceptor(ctx, in, info, handler) -} - var _TrojanClientService_serviceDesc = grpc.ServiceDesc{ ServiceName: "api.TrojanClientService", HandlerType: (*TrojanClientServiceServer)(nil), @@ -998,10 +637,6 @@ var _TrojanClientService_serviceDesc = grpc.ServiceDesc{ MethodName: "GetTraffic", Handler: _TrojanClientService_GetTraffic_Handler, }, - { - MethodName: "GetSpeed", - Handler: _TrojanClientService_GetSpeed_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "api.proto", @@ -1013,11 +648,7 @@ var _TrojanClientService_serviceDesc = grpc.ServiceDesc{ type TrojanServerServiceClient interface { ListUsers(ctx context.Context, in *ListUserRequest, opts ...grpc.CallOption) (TrojanServerService_ListUsersClient, error) GetTraffic(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_GetTrafficClient, error) - SetTraffic(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetTrafficClient, error) - GetSpeed(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_GetSpeedClient, error) - SetSpeed(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetSpeedClient, error) - AddUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_AddUsersClient, error) - DeleteUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_DeleteUsersClient, error) + SetUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetUsersClient, error) } type trojanServerServiceClient struct { @@ -1091,155 +722,31 @@ func (x *trojanServerServiceGetTrafficClient) Recv() (*GetTrafficResponse, error return m, nil } -func (c *trojanServerServiceClient) SetTraffic(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetTrafficClient, error) { - stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[2], "/api.TrojanServerService/SetTraffic", opts...) +func (c *trojanServerServiceClient) SetUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetUsersClient, error) { + stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[2], "/api.TrojanServerService/SetUsers", opts...) if err != nil { return nil, err } - x := &trojanServerServiceSetTrafficClient{stream} + x := &trojanServerServiceSetUsersClient{stream} return x, nil } -type TrojanServerService_SetTrafficClient interface { - Send(*SetTrafficRequest) error - Recv() (*SetTrafficReponse, error) +type TrojanServerService_SetUsersClient interface { + Send(*SetUserRequest) error + Recv() (*SetUserResponse, error) grpc.ClientStream } -type trojanServerServiceSetTrafficClient struct { +type trojanServerServiceSetUsersClient struct { grpc.ClientStream } -func (x *trojanServerServiceSetTrafficClient) Send(m *SetTrafficRequest) error { +func (x *trojanServerServiceSetUsersClient) Send(m *SetUserRequest) error { return x.ClientStream.SendMsg(m) } -func (x *trojanServerServiceSetTrafficClient) Recv() (*SetTrafficReponse, error) { - m := new(SetTrafficReponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *trojanServerServiceClient) GetSpeed(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_GetSpeedClient, error) { - stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[3], "/api.TrojanServerService/GetSpeed", opts...) - if err != nil { - return nil, err - } - x := &trojanServerServiceGetSpeedClient{stream} - return x, nil -} - -type TrojanServerService_GetSpeedClient interface { - Send(*GetSpeedRequest) error - Recv() (*GetSpeedResponse, error) - grpc.ClientStream -} - -type trojanServerServiceGetSpeedClient struct { - grpc.ClientStream -} - -func (x *trojanServerServiceGetSpeedClient) Send(m *GetSpeedRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *trojanServerServiceGetSpeedClient) Recv() (*GetSpeedResponse, error) { - m := new(GetSpeedResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *trojanServerServiceClient) SetSpeed(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_SetSpeedClient, error) { - stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[4], "/api.TrojanServerService/SetSpeed", opts...) - if err != nil { - return nil, err - } - x := &trojanServerServiceSetSpeedClient{stream} - return x, nil -} - -type TrojanServerService_SetSpeedClient interface { - Send(*SetSpeedRequest) error - Recv() (*SetSpeedResponse, error) - grpc.ClientStream -} - -type trojanServerServiceSetSpeedClient struct { - grpc.ClientStream -} - -func (x *trojanServerServiceSetSpeedClient) Send(m *SetSpeedRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *trojanServerServiceSetSpeedClient) Recv() (*SetSpeedResponse, error) { - m := new(SetSpeedResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *trojanServerServiceClient) AddUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_AddUsersClient, error) { - stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[5], "/api.TrojanServerService/AddUsers", opts...) - if err != nil { - return nil, err - } - x := &trojanServerServiceAddUsersClient{stream} - return x, nil -} - -type TrojanServerService_AddUsersClient interface { - Send(*AddUserRequest) error - Recv() (*AddUserResponse, error) - grpc.ClientStream -} - -type trojanServerServiceAddUsersClient struct { - grpc.ClientStream -} - -func (x *trojanServerServiceAddUsersClient) Send(m *AddUserRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *trojanServerServiceAddUsersClient) Recv() (*AddUserResponse, error) { - m := new(AddUserResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *trojanServerServiceClient) DeleteUsers(ctx context.Context, opts ...grpc.CallOption) (TrojanServerService_DeleteUsersClient, error) { - stream, err := c.cc.NewStream(ctx, &_TrojanServerService_serviceDesc.Streams[6], "/api.TrojanServerService/DeleteUsers", opts...) - if err != nil { - return nil, err - } - x := &trojanServerServiceDeleteUsersClient{stream} - return x, nil -} - -type TrojanServerService_DeleteUsersClient interface { - Send(*DeleteUserRequest) error - Recv() (*DeleteUserResponse, error) - grpc.ClientStream -} - -type trojanServerServiceDeleteUsersClient struct { - grpc.ClientStream -} - -func (x *trojanServerServiceDeleteUsersClient) Send(m *DeleteUserRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *trojanServerServiceDeleteUsersClient) Recv() (*DeleteUserResponse, error) { - m := new(DeleteUserResponse) +func (x *trojanServerServiceSetUsersClient) Recv() (*SetUserResponse, error) { + m := new(SetUserResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -1250,11 +757,7 @@ func (x *trojanServerServiceDeleteUsersClient) Recv() (*DeleteUserResponse, erro type TrojanServerServiceServer interface { ListUsers(*ListUserRequest, TrojanServerService_ListUsersServer) error GetTraffic(TrojanServerService_GetTrafficServer) error - SetTraffic(TrojanServerService_SetTrafficServer) error - GetSpeed(TrojanServerService_GetSpeedServer) error - SetSpeed(TrojanServerService_SetSpeedServer) error - AddUsers(TrojanServerService_AddUsersServer) error - DeleteUsers(TrojanServerService_DeleteUsersServer) error + SetUsers(TrojanServerService_SetUsersServer) error } // UnimplementedTrojanServerServiceServer can be embedded to have forward compatible implementations. @@ -1267,20 +770,8 @@ func (*UnimplementedTrojanServerServiceServer) ListUsers(req *ListUserRequest, s func (*UnimplementedTrojanServerServiceServer) GetTraffic(srv TrojanServerService_GetTrafficServer) error { return status.Errorf(codes.Unimplemented, "method GetTraffic not implemented") } -func (*UnimplementedTrojanServerServiceServer) SetTraffic(srv TrojanServerService_SetTrafficServer) error { - return status.Errorf(codes.Unimplemented, "method SetTraffic not implemented") -} -func (*UnimplementedTrojanServerServiceServer) GetSpeed(srv TrojanServerService_GetSpeedServer) error { - return status.Errorf(codes.Unimplemented, "method GetSpeed not implemented") -} -func (*UnimplementedTrojanServerServiceServer) SetSpeed(srv TrojanServerService_SetSpeedServer) error { - return status.Errorf(codes.Unimplemented, "method SetSpeed not implemented") -} -func (*UnimplementedTrojanServerServiceServer) AddUsers(srv TrojanServerService_AddUsersServer) error { - return status.Errorf(codes.Unimplemented, "method AddUsers not implemented") -} -func (*UnimplementedTrojanServerServiceServer) DeleteUsers(srv TrojanServerService_DeleteUsersServer) error { - return status.Errorf(codes.Unimplemented, "method DeleteUsers not implemented") +func (*UnimplementedTrojanServerServiceServer) SetUsers(srv TrojanServerService_SetUsersServer) error { + return status.Errorf(codes.Unimplemented, "method SetUsers not implemented") } func RegisterTrojanServerServiceServer(s *grpc.Server, srv TrojanServerServiceServer) { @@ -1334,130 +825,26 @@ func (x *trojanServerServiceGetTrafficServer) Recv() (*GetTrafficRequest, error) return m, nil } -func _TrojanServerService_SetTraffic_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(TrojanServerServiceServer).SetTraffic(&trojanServerServiceSetTrafficServer{stream}) +func _TrojanServerService_SetUsers_Handler(srv interface{}, stream grpc.ServerStream) error { + return srv.(TrojanServerServiceServer).SetUsers(&trojanServerServiceSetUsersServer{stream}) } -type TrojanServerService_SetTrafficServer interface { - Send(*SetTrafficReponse) error - Recv() (*SetTrafficRequest, error) +type TrojanServerService_SetUsersServer interface { + Send(*SetUserResponse) error + Recv() (*SetUserRequest, error) grpc.ServerStream } -type trojanServerServiceSetTrafficServer struct { +type trojanServerServiceSetUsersServer struct { grpc.ServerStream } -func (x *trojanServerServiceSetTrafficServer) Send(m *SetTrafficReponse) error { +func (x *trojanServerServiceSetUsersServer) Send(m *SetUserResponse) error { return x.ServerStream.SendMsg(m) } -func (x *trojanServerServiceSetTrafficServer) Recv() (*SetTrafficRequest, error) { - m := new(SetTrafficRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _TrojanServerService_GetSpeed_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(TrojanServerServiceServer).GetSpeed(&trojanServerServiceGetSpeedServer{stream}) -} - -type TrojanServerService_GetSpeedServer interface { - Send(*GetSpeedResponse) error - Recv() (*GetSpeedRequest, error) - grpc.ServerStream -} - -type trojanServerServiceGetSpeedServer struct { - grpc.ServerStream -} - -func (x *trojanServerServiceGetSpeedServer) Send(m *GetSpeedResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *trojanServerServiceGetSpeedServer) Recv() (*GetSpeedRequest, error) { - m := new(GetSpeedRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _TrojanServerService_SetSpeed_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(TrojanServerServiceServer).SetSpeed(&trojanServerServiceSetSpeedServer{stream}) -} - -type TrojanServerService_SetSpeedServer interface { - Send(*SetSpeedResponse) error - Recv() (*SetSpeedRequest, error) - grpc.ServerStream -} - -type trojanServerServiceSetSpeedServer struct { - grpc.ServerStream -} - -func (x *trojanServerServiceSetSpeedServer) Send(m *SetSpeedResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *trojanServerServiceSetSpeedServer) Recv() (*SetSpeedRequest, error) { - m := new(SetSpeedRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _TrojanServerService_AddUsers_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(TrojanServerServiceServer).AddUsers(&trojanServerServiceAddUsersServer{stream}) -} - -type TrojanServerService_AddUsersServer interface { - Send(*AddUserResponse) error - Recv() (*AddUserRequest, error) - grpc.ServerStream -} - -type trojanServerServiceAddUsersServer struct { - grpc.ServerStream -} - -func (x *trojanServerServiceAddUsersServer) Send(m *AddUserResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *trojanServerServiceAddUsersServer) Recv() (*AddUserRequest, error) { - m := new(AddUserRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func _TrojanServerService_DeleteUsers_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(TrojanServerServiceServer).DeleteUsers(&trojanServerServiceDeleteUsersServer{stream}) -} - -type TrojanServerService_DeleteUsersServer interface { - Send(*DeleteUserResponse) error - Recv() (*DeleteUserRequest, error) - grpc.ServerStream -} - -type trojanServerServiceDeleteUsersServer struct { - grpc.ServerStream -} - -func (x *trojanServerServiceDeleteUsersServer) Send(m *DeleteUserResponse) error { - return x.ServerStream.SendMsg(m) -} - -func (x *trojanServerServiceDeleteUsersServer) Recv() (*DeleteUserRequest, error) { - m := new(DeleteUserRequest) +func (x *trojanServerServiceSetUsersServer) Recv() (*SetUserRequest, error) { + m := new(SetUserRequest) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } @@ -1481,32 +868,8 @@ var _TrojanServerService_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, { - StreamName: "SetTraffic", - Handler: _TrojanServerService_SetTraffic_Handler, - ServerStreams: true, - ClientStreams: true, - }, - { - StreamName: "GetSpeed", - Handler: _TrojanServerService_GetSpeed_Handler, - ServerStreams: true, - ClientStreams: true, - }, - { - StreamName: "SetSpeed", - Handler: _TrojanServerService_SetSpeed_Handler, - ServerStreams: true, - ClientStreams: true, - }, - { - StreamName: "AddUsers", - Handler: _TrojanServerService_AddUsers_Handler, - ServerStreams: true, - ClientStreams: true, - }, - { - StreamName: "DeleteUsers", - Handler: _TrojanServerService_DeleteUsers_Handler, + StreamName: "SetUsers", + Handler: _TrojanServerService_SetUsers_Handler, ServerStreams: true, ClientStreams: true, }, diff --git a/api/api.proto b/api/api.proto index 06ed3b4..1e50e46 100644 --- a/api/api.proto +++ b/api/api.proto @@ -14,7 +14,6 @@ message Speed { message User { string password = 1; string hash = 2; - bool valid = 3; } message GetTrafficRequest { @@ -22,17 +21,11 @@ message GetTrafficRequest { } message GetTrafficResponse { - Traffic traffic_total = 1; - Traffic traffic_quota = 2; -} - -message GetSpeedRequest { - User user = 1; -} - -message GetSpeedResponse { - Speed speed_current = 1; - Speed speed_limit = 2; + bool success = 1; + Traffic traffic_total = 2; + Speed speed_current = 3; + Speed speed_limit = 4; + string info = 5; } message ListUserRequest { @@ -43,64 +36,32 @@ message ListUserResponse { User user = 1; bool online = 2; Traffic traffic_total = 3; - Traffic traffic_quota = 4; - Speed speed_current = 5; - Speed speed_limit = 6; + Speed speed_current = 4; + Speed speed_limit = 5; } -message SetTrafficRequest { - User user = 1; - Traffic traffic_quota = 2; -} - -message SetTrafficReponse { - bool success = 1; - string info = 2; -} - -message SetSpeedRequest { +message SetUserRequest { User user = 1; Speed speed_limit = 2; + enum Operation { + Add = 0; + Delete = 1; + Modify = 2; + } + Operation operation = 3; } -message SetSpeedResponse { - bool success = 1; - string info = 2; -} - -message AddUserRequest { - User user = 1; - Traffic traffic_quota = 4; - Speed speed_limit = 6; -} - -message AddUserResponse { - User user = 1; -} - -message DeleteUserRequest { - User user = 1; -} - -message DeleteUserResponse { +message SetUserResponse { bool success = 1; string info = 2; } service TrojanClientService { rpc GetTraffic(GetTrafficRequest) returns(GetTrafficResponse){} - rpc GetSpeed(GetSpeedRequest) returns(GetSpeedResponse){} } service TrojanServerService { rpc ListUsers(ListUserRequest) returns(stream ListUserResponse){} - rpc GetTraffic(stream GetTrafficRequest) returns(stream GetTrafficResponse){} - rpc SetTraffic(stream SetTrafficRequest) returns(stream SetTrafficReponse) {} - - rpc GetSpeed(stream GetSpeedRequest) returns(stream GetSpeedResponse){} - rpc SetSpeed(stream SetSpeedRequest) returns(stream SetSpeedResponse) {} - - rpc AddUsers(stream AddUserRequest) returns(stream AddUserResponse){} - rpc DeleteUsers(stream DeleteUserRequest) returns(stream DeleteUserResponse){} + rpc SetUsers(stream SetUserRequest) returns(stream SetUserResponse){} } diff --git a/api/client.go b/api/client.go index 83908c5..003e855 100644 --- a/api/client.go +++ b/api/client.go @@ -26,36 +26,30 @@ func (s *ClientAPI) GetTraffic(ctx context.Context, req *GetTrafficRequest) (*Ge if req.User == nil { 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") } sent, recv := meter.Get() + sentSpeed, recvSpeed := meter.GetSpeed() resp := &GetTrafficResponse{ + Success: true, TrafficTotal: &Traffic{ UploadTraffic: sent, DownloadTraffic: recv, }, - } - return resp, nil -} - -func (s *ClientAPI) GetSpeed(ctx context.Context, req *GetSpeedRequest) (*GetSpeedResponse, error) { - valid, meter := s.auth.AuthUser(req.User.Hash) - if !valid { - return &GetSpeedResponse{}, nil - } - sent, recv := meter.GetSpeed() - resp := &GetSpeedResponse{ SpeedCurrent: &Speed{ - UploadSpeed: sent, - DownloadSpeed: recv, + UploadSpeed: sentSpeed, + DownloadSpeed: recvSpeed, }, } return resp, nil } -func RunClientAPIService(ctx context.Context, config *conf.GlobalConfig, auth stat.Authenticator) error { +func RunClientAPI(ctx context.Context, config *conf.GlobalConfig, auth stat.Authenticator) error { server := grpc.NewServer() service := &ClientAPI{ ctx: ctx, diff --git a/api/client_test.go b/api/client_test.go index 33a6348..ce711b9 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -15,7 +15,7 @@ func TestClientAPI(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) auth, err := memory.NewMemoryAuth(ctx, &conf.GlobalConfig{}) common.Must(err) - go RunClientAPIService(ctx, &conf.GlobalConfig{ + go RunClientAPI(ctx, &conf.GlobalConfig{ API: conf.APIConfig{ APIAddress: common.NewAddress("127.0.0.1", 10000, "tcp"), }, diff --git a/api/server.go b/api/server.go index 3700406..beb1b76 100644 --- a/api/server.go +++ b/api/server.go @@ -1,24 +1,145 @@ package api import ( - "sync" + "context" + "io" + "net" + "github.com/p4gefau1t/trojan-go/common" + "github.com/p4gefau1t/trojan-go/conf" + "github.com/p4gefau1t/trojan-go/log" "github.com/p4gefau1t/trojan-go/stat" + grpc "google.golang.org/grpc" ) -type MemoryTraffic struct { - downloadTraffic uint64 - uploadTraffic uint64 +type ServerAPI struct { + TrojanServerServiceServer + auth stat.Authenticator } -type MemoryUser struct { - password string - hash string - trafficTotal MemoryTraffic - trafficQuota MemoryTraffic +func (s *ServerAPI) GetTraffic(stream TrojanServerService_GetTrafficServer) error { + for { + req, err := stream.Recv() + if err == io.EOF { + return nil + } + if err != nil { + return err + } + if req.User == nil { + return 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 { + stream.Send(&GetTrafficResponse{ + Success: false, + Info: "invalid user", + }) + continue + } + downloadTraffic, uploadTraffic := meter.Get() + downloadSpeed, uploadSpeed := meter.GetSpeed() + err = stream.Send(&GetTrafficResponse{ + Success: true, + TrafficTotal: &Traffic{ + UploadTraffic: uploadTraffic, + DownloadTraffic: downloadTraffic, + }, + SpeedCurrent: &Speed{ + DownloadSpeed: downloadSpeed, + UploadSpeed: uploadSpeed, + }, + }) + if err != nil { + return err + } + } } -type APIAuth struct { - stat.Authenticator - users sync.Map +func (s *ServerAPI) SetUsers(stream TrojanServerService_SetUsersServer) error { + for { + req, err := stream.Recv() + if err == io.EOF { + return nil + } + if err != nil { + return err + } + if req.User == nil { + return common.NewError("user is unspecified") + } + if req.User.Hash == "" { + req.User.Hash = common.SHA224String(req.User.Password) + } + switch req.Operation { + case SetUserRequest_Add: + err = s.auth.AddUser(req.User.Hash) + case SetUserRequest_Delete: + err = s.auth.DelUser(req.User.Hash) + case SetUserRequest_Modify: + err = common.NewError("not support yet") + } + if err != nil { + stream.Send(&SetUserResponse{ + Success: false, + Info: err.Error(), + }) + continue + } + stream.Send(&SetUserResponse{ + Success: true, + }) + } +} + +func (s *ServerAPI) ListUsers(req *ListUserRequest, stream TrojanServerService_ListUsersServer) error { + users := s.auth.ListUsers() + for _, meter := range users { + downloadTraffic, uploadTraffic := meter.Get() + downloadSpeed, uploadSpeed := meter.GetSpeed() + err := stream.Send(&ListUserResponse{ + User: &User{ + Hash: meter.Hash(), + }, + TrafficTotal: &Traffic{ + DownloadTraffic: downloadTraffic, + UploadTraffic: uploadTraffic, + }, + SpeedCurrent: &Speed{ + DownloadSpeed: downloadSpeed, + UploadSpeed: uploadSpeed, + }, + }) + if err != nil { + return err + } + } + return nil +} + +func RunServerAPI(ctx context.Context, config *conf.GlobalConfig, auth stat.Authenticator) error { + server := grpc.NewServer() + service := &ServerAPI{ + auth: auth, + } + RegisterTrojanServerServiceServer(server, service) + listener, err := net.Listen("tcp", config.API.APIAddress.String()) + if err != nil { + return err + } + log.Info("server api service is running at", config.API.APIAddress) + errChan := make(chan error, 1) + go func() { + errChan <- server.Serve(listener) + }() + select { + case err := <-errChan: + return err + case <-ctx.Done(): + server.Stop() + return nil + } } diff --git a/api/server_test.go b/api/server_test.go new file mode 100644 index 0000000..7f01ad8 --- /dev/null +++ b/api/server_test.go @@ -0,0 +1,91 @@ +package api + +import ( + context "context" + "fmt" + "testing" + "time" + + "github.com/p4gefau1t/trojan-go/common" + "github.com/p4gefau1t/trojan-go/conf" + "github.com/p4gefau1t/trojan-go/stat/memory" + grpc "google.golang.org/grpc" +) + +func TestServerAPI(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + auth, err := memory.NewMemoryAuth(ctx, &conf.GlobalConfig{}) + common.Must(err) + go RunServerAPI(ctx, &conf.GlobalConfig{ + API: conf.APIConfig{ + APIAddress: common.NewAddress("127.0.0.1", 10000, "tcp"), + }, + }, auth) + common.Must(auth.AddUser("hash1234")) + _, meter := auth.AuthUser("hash1234") + conn, err := grpc.Dial("127.0.0.1:10000", grpc.WithInsecure()) + server := NewTrojanServerServiceClient(conn) + stream1, err := server.ListUsers(ctx, &ListUserRequest{}) + common.Must(err) + for { + resp, err := stream1.Recv() + if err != nil { + break + } + fmt.Println(resp.User.Hash) + if resp.User.Hash != "hash1234" { + t.Fail() + } + } + stream1.CloseSend() + + meter.Count(1234, 5678) + time.Sleep(time.Millisecond * 400) + stream2, err := server.GetTraffic(ctx) + common.Must(err) + stream2.Send(&GetTrafficRequest{ + User: &User{ + Hash: "hash1234", + }, + }) + resp2, err := stream2.Recv() + common.Must(err) + if resp2.TrafficTotal.DownloadTraffic != 1234 || resp2.TrafficTotal.UploadTraffic != 5678 { + t.Fail() + } + if resp2.SpeedCurrent.DownloadSpeed != 1234 || resp2.TrafficTotal.UploadTraffic != 5678 { + t.Fail() + } + stream2.CloseSend() + + stream3, err := server.SetUsers(ctx) + stream3.Send(&SetUserRequest{ + User: &User{ + Hash: "hash1234", + }, + Operation: SetUserRequest_Delete, + }) + resp3, err := stream3.Recv() + if err != nil || !resp3.Success { + t.Fail() + } + valid, _ := auth.AuthUser("hash1234") + if valid { + t.Fail() + } + stream3.Send(&SetUserRequest{ + User: &User{ + Hash: "newhash", + }, + Operation: SetUserRequest_Add, + }) + resp3, err = stream3.Recv() + if err != nil || !resp3.Success { + t.Fail() + } + valid, _ = auth.AuthUser("newhash") + if !valid { + t.Fail() + } + cancel() +} diff --git a/proxy/client/client.go b/proxy/client/client.go index 1acf57b..513eada 100644 --- a/proxy/client/client.go +++ b/proxy/client/client.go @@ -5,6 +5,7 @@ import ( "io" "net" + "github.com/p4gefau1t/trojan-go/api" "github.com/p4gefau1t/trojan-go/common" "github.com/p4gefau1t/trojan-go/conf" "github.com/p4gefau1t/trojan-go/log" @@ -366,6 +367,10 @@ func (c *Client) Build(config *conf.GlobalConfig) (common.Runnable, error) { auth: auth, appMan: appMan, } + + if config.API.Enabled { + go api.RunClientAPI(ctx, config, auth) + } return newClient, nil } diff --git a/proxy/server/server.go b/proxy/server/server.go index 19d978d..f6f104a 100644 --- a/proxy/server/server.go +++ b/proxy/server/server.go @@ -6,6 +6,7 @@ import ( "fmt" "net" + "github.com/p4gefau1t/trojan-go/api" "github.com/p4gefau1t/trojan-go/common" "github.com/p4gefau1t/trojan-go/conf" "github.com/p4gefau1t/trojan-go/log" @@ -208,6 +209,9 @@ func (*Server) Build(config *conf.GlobalConfig) (common.Runnable, error) { shadow: shadow.NewShadowManager(ctx, config), auth: auth, } + if config.API.Enabled { + go api.RunServerAPI(ctx, config, auth) + } return s, nil }