github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-02 03:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

结构调整、kcp支持

Browse Source
This commit is contained in:
刘河
2019-02-09 17:07:47 +08:00
parent 2e8af6f120
commit 59d789d253
60 changed files with 11097 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/controllers/base.go
View File

@@ -1,8 +1,8 @@
package controllers
import (
"github.com/astaxie/beego"
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/lib/beego"
"github.com/cnlh/nps/lib/common"
"github.com/cnlh/nps/server"
"strconv"
"strings"
@@ -40,7 +40,7 @@ func (s *BaseController) display(tpl ...string) {
}
ip := s.Ctx.Request.Host
if strings.LastIndex(ip, ":") > 0 {
arr := strings.Split(lib.GetHostByName(ip), ":")
arr := strings.Split(common.GetHostByName(ip), ":")
s.Data["ip"] = arr[0]
}
s.Data["p"] = server.Bridge.TunnelPort

32
web/controllers/client.go
View File

@@ -1,7 +1,9 @@
package controllers
import (
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/lib/crypt"
"github.com/cnlh/nps/lib/file"
"github.com/cnlh/nps/lib/rate"
"github.com/cnlh/nps/server"
)
@@ -28,29 +30,29 @@ func (s *ClientController) Add() {
s.SetInfo("新增")
s.display()
} else {
t := &lib.Client{
VerifyKey: lib.GetRandomString(16),
Id: lib.GetCsvDb().GetClientId(),
t := &file.Client{
VerifyKey: crypt.GetRandomString(16),
Id: file.GetCsvDb().GetClientId(),
Status: true,
Remark: s.GetString("remark"),
Cnf: &lib.Config{
Cnf: &file.Config{
U: s.GetString("u"),
P: s.GetString("p"),
Compress: s.GetString("compress"),
Crypt: s.GetBoolNoErr("crypt"),
},
RateLimit: s.GetIntNoErr("rate_limit"),
Flow: &lib.Flow{
Flow: &file.Flow{
ExportFlow: 0,
InletFlow: 0,
FlowLimit: int64(s.GetIntNoErr("flow_limit")),
},
}
if t.RateLimit > 0 {
t.Rate = lib.NewRate(int64(t.RateLimit * 1024))
t.Rate = rate.NewRate(int64(t.RateLimit * 1024))
t.Rate.Start()
}
lib.GetCsvDb().NewClient(t)
file.GetCsvDb().NewClient(t)
s.AjaxOk("添加成功")
}
}
@@ -58,7 +60,7 @@ func (s *ClientController) GetClient() {
if s.Ctx.Request.Method == "POST" {
id := s.GetIntNoErr("id")
data := make(map[string]interface{})
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
if c, err := file.GetCsvDb().GetClient(id); err != nil {
data["code"] = 0
} else {
data["code"] = 1
@@ -74,7 +76,7 @@ func (s *ClientController) Edit() {
id := s.GetIntNoErr("id")
if s.Ctx.Request.Method == "GET" {
s.Data["menu"] = "client"
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
if c, err := file.GetCsvDb().GetClient(id); err != nil {
s.error()
} else {
s.Data["c"] = c
@@ -82,7 +84,7 @@ func (s *ClientController) Edit() {
s.SetInfo("修改")
s.display()
} else {
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
if c, err := file.GetCsvDb().GetClient(id); err != nil {
s.error()
} else {
c.Remark = s.GetString("remark")
@@ -96,12 +98,12 @@ func (s *ClientController) Edit() {
c.Rate.Stop()
}
if c.RateLimit > 0 {
c.Rate = lib.NewRate(int64(c.RateLimit * 1024))
c.Rate = rate.NewRate(int64(c.RateLimit * 1024))
c.Rate.Start()
} else {
c.Rate = nil
}
lib.GetCsvDb().UpdateClient(c)
file.GetCsvDb().UpdateClient(c)
}
s.AjaxOk("修改成功")
}
@@ -110,7 +112,7 @@ func (s *ClientController) Edit() {
//更改状态
func (s *ClientController) ChangeStatus() {
id := s.GetIntNoErr("id")
if client, err := lib.GetCsvDb().GetClient(id); err == nil {
if client, err := file.GetCsvDb().GetClient(id); err == nil {
client.Status = s.GetBoolNoErr("status")
if client.Status == false {
server.DelClientConnect(client.Id)
@@ -123,7 +125,7 @@ func (s *ClientController) ChangeStatus() {
//删除客户端
func (s *ClientController) Del() {
id := s.GetIntNoErr("id")
if err := lib.GetCsvDb().DelClient(id); err != nil {
if err := file.GetCsvDb().DelClient(id); err != nil {
s.AjaxErr("删除失败")
}
server.DelTunnelAndHostByClientId(id)

40
web/controllers/index.go
View File

@@ -1,7 +1,7 @@
package controllers
import (
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/lib/file"
"github.com/cnlh/nps/server"
)
@@ -72,27 +72,27 @@ func (s *IndexController) Add() {
s.SetInfo("新增")
s.display()
} else {
t := &lib.Tunnel{
t := &file.Tunnel{
TcpPort: s.GetIntNoErr("port"),
Mode: s.GetString("type"),
Target: s.GetString("target"),
Config: &lib.Config{
Config: &file.Config{
U: s.GetString("u"),
P: s.GetString("p"),
Compress: s.GetString("compress"),
Crypt: s.GetBoolNoErr("crypt"),
},
Id: lib.GetCsvDb().GetTaskId(),
Id: file.GetCsvDb().GetTaskId(),
UseClientCnf: s.GetBoolNoErr("use_client"),
Status: true,
Remark: s.GetString("remark"),
Flow: &lib.Flow{},
Flow: &file.Flow{},
}
var err error
if t.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
if t.Client, err = file.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr(err.Error())
}
lib.GetCsvDb().NewTask(t)
file.GetCsvDb().NewTask(t)
if err := server.AddTask(t); err != nil {
s.AjaxErr(err.Error())
} else {
@@ -103,7 +103,7 @@ func (s *IndexController) Add() {
func (s *IndexController) GetOneTunnel() {
id := s.GetIntNoErr("id")
data := make(map[string]interface{})
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
if t, err := file.GetCsvDb().GetTask(id); err != nil {
data["code"] = 0
} else {
data["code"] = 1
@@ -115,7 +115,7 @@ func (s *IndexController) GetOneTunnel() {
func (s *IndexController) Edit() {
id := s.GetIntNoErr("id")
if s.Ctx.Request.Method == "GET" {
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
if t, err := file.GetCsvDb().GetTask(id); err != nil {
s.error()
} else {
s.Data["t"] = t
@@ -123,7 +123,7 @@ func (s *IndexController) Edit() {
s.SetInfo("修改")
s.display()
} else {
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
if t, err := file.GetCsvDb().GetTask(id); err != nil {
s.error()
} else {
t.TcpPort = s.GetIntNoErr("port")
@@ -137,10 +137,10 @@ func (s *IndexController) Edit() {
t.Config.Crypt = s.GetBoolNoErr("crypt")
t.UseClientCnf = s.GetBoolNoErr("use_client")
t.Remark = s.GetString("remark")
if t.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
if t.Client, err = file.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("修改失败")
}
lib.GetCsvDb().UpdateTask(t)
file.GetCsvDb().UpdateTask(t)
}
s.AjaxOk("修改成功")
}
@@ -179,7 +179,7 @@ func (s *IndexController) HostList() {
} else {
start, length := s.GetAjaxParams()
clientId := s.GetIntNoErr("client_id")
list, cnt := lib.GetCsvDb().GetHost(start, length, clientId)
list, cnt := file.GetCsvDb().GetHost(start, length, clientId)
s.AjaxTable(list, cnt, cnt)
}
}
@@ -200,7 +200,7 @@ func (s *IndexController) GetHost() {
func (s *IndexController) DelHost() {
host := s.GetString("host")
if err := lib.GetCsvDb().DelHost(host); err != nil {
if err := file.GetCsvDb().DelHost(host); err != nil {
s.AjaxErr("删除失败")
}
s.AjaxOk("删除成功")
@@ -213,19 +213,19 @@ func (s *IndexController) AddHost() {
s.SetInfo("新增")
s.display("index/hadd")
} else {
h := &lib.Host{
h := &file.Host{
Host: s.GetString("host"),
Target: s.GetString("target"),
HeaderChange: s.GetString("header"),
HostChange: s.GetString("hostchange"),
Remark: s.GetString("remark"),
Flow: &lib.Flow{},
Flow: &file.Flow{},
}
var err error
if h.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
if h.Client, err = file.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("添加失败")
}
lib.GetCsvDb().NewHost(h)
file.GetCsvDb().NewHost(h)
s.AjaxOk("添加成功")
}
}
@@ -251,9 +251,9 @@ func (s *IndexController) EditHost() {
h.HostChange = s.GetString("hostchange")
h.Remark = s.GetString("remark")
h.TargetArr = nil
lib.GetCsvDb().UpdateHost(h)
file.GetCsvDb().UpdateHost(h)
var err error
if h.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
if h.Client, err = file.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("修改失败")
}
}

2
web/controllers/login.go
View File

@@ -1,7 +1,7 @@
package controllers
import (
"github.com/astaxie/beego"
"github.com/cnlh/nps/lib/beego"
)
type LoginController struct {

2
web/routers/router.go
View File

@@ -1,7 +1,7 @@
package routers
import (
"github.com/astaxie/beego"
"github.com/cnlh/nps/lib/beego"
"github.com/cnlh/nps/web/controllers"
)