From ccc8972ea25846e11f046b9538657129cfcadc24 Mon Sep 17 00:00:00 2001 From: TavenLi Date: Fri, 2 Jun 2017 10:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=AF=8F=E6=9D=A1=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E8=BD=AC=E5=8F=91=E7=9A=84=E5=90=8C=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=88=86=E5=8F=91=E7=BB=99=E5=A4=9A=E4=B8=AA=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=BB=A1=E8=B6=B3=E6=9F=90=E4=BA=9B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.conf | 2 + conf/data.conf | 2 - controllers/RestApiCtrl.go | 2 +- controllers/TcpForwardCtrl.go | 12 +- data/data.db | Bin 6144 -> 8192 bytes models/PortForward.go | 2 + services/ForwardService.go | 60 ++++- services/InitServices.go | 24 +- services/SysDataService.go | 5 +- views/ucenter/forwardForm.html | 15 +- views/ucenter/forwardList.html | 407 +++++++++++++++------------------ 11 files changed, 281 insertions(+), 250 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index 8b85693..48431a8 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -11,6 +11,8 @@ viewspath = "views" httpaddr = "0.0.0.0" httpport = 8000 recoverpanic = false +app.store = "mysql" +mysql.url = "root:grant@tcp(127.0.0.1:3306)/PortForwardDb?charset=utf8&loc=Asia%2FShanghai" [prod] httpaddr = "0.0.0.0" httpport = 8000 diff --git a/conf/data.conf b/conf/data.conf index ab70899..e38340c 100644 --- a/conf/data.conf +++ b/conf/data.conf @@ -1,6 +1,4 @@ -mysql.url = "root:grant@tcp(127.0.0.1:3306)/PortForwardDb?charset=utf8&loc=Asia%2FShanghai" - api.auth = "26CCD056107481F45D1AC805A24A9E59" diff --git a/controllers/RestApiCtrl.go b/controllers/RestApiCtrl.go index 40dec9d..59fa550 100644 --- a/controllers/RestApiCtrl.go +++ b/controllers/RestApiCtrl.go @@ -42,7 +42,7 @@ func (c *RestApiCtrl) OpenForward() { //测试 //http://127.0.0.1:8000/api/v1/OpenForward?auth=26CCD056107481F45D1AC805A24A9E59&fromAddr=:8010&toAddr=127.0.0.1:3306 resultChan := make(chan models.ResultData) - go services.ForwardS.StartPortForward(fromAddr, toAddr, resultChan) + go services.ForwardS.StartPortForward(entity, resultChan) c.Data["json"] = <-resultChan diff --git a/controllers/TcpForwardCtrl.go b/controllers/TcpForwardCtrl.go index e1499e5..48fbb40 100644 --- a/controllers/TcpForwardCtrl.go +++ b/controllers/TcpForwardCtrl.go @@ -113,6 +113,7 @@ func (c *ForwardCtrl) SaveForward() { //protocol := c.GetString("protocol", "TCP") targetAddr := c.GetString("targetAddr", "") targetPort, _ := c.GetInt("targetPort") + others := c.GetString("others", "") if utils.IsEmpty(name) { // @@ -142,6 +143,11 @@ func (c *ForwardCtrl) SaveForward() { return } + // if utils.IsNotEmpty(others) { + // //如果有others信息，则检查 + + // } + if id > 0 { entity := services.SysDataS.GetPortForwardById(id) key := services.ForwardS.GetKeyByEntity(entity) @@ -164,6 +170,7 @@ func (c *ForwardCtrl) SaveForward() { entity.Protocol = "TCP" entity.TargetAddr = targetAddr entity.TargetPort = targetPort + entity.Others = others err := services.SysDataS.SavePortForward(entity) if err == nil { @@ -181,11 +188,8 @@ func (c *ForwardCtrl) OpenForward() { id, _ := c.GetInt("id") entity := services.SysDataS.GetPortForwardById(id) - fromAddr := fmt.Sprint(entity.Addr, ":", entity.Port) - toAddr := fmt.Sprint(entity.TargetAddr, ":", entity.TargetPort) - resultChan := make(chan models.ResultData) - go services.ForwardS.StartPortForward(fromAddr, toAddr, resultChan) + go services.ForwardS.StartPortForward(entity, resultChan) c.Data["json"] = <-resultChan diff --git a/data/data.db b/data/data.db index 442d3a5b4beaaa1a11270468ff8cdde41dd0afd1..c84154795eb8b31691e20a46147c943f46a9605a 100644 GIT binary patch delta 836 zcmZoLXmFSyEhx>vz`y~-OhC*C#EKJjjK!rH^mqkWK_bk*fg}S5kebZUJ<(CLo{fhM zB*M^a$jvTpZ_n6TSdy5OlUiJulUb6QT2YW%R1#m3np+SL7LGT>DZ%6%_f1V?-N4Qbb_$SSUc;QqoVr<%Ly&p1 zJo`hINgOO3Ow7p)%&VD`H}mj>GxNGJaWkkgN;3*8Gg>oDE@Zdn4QAwKFlUrz5>{sd zitJ$bXVEX7 zCck5{0Y=SfCN@SUF9s&B&4MfrOkB;zJnZ6{nv89V6Za`HvP^s+>i~{Vc#MX)y1ND` z1O$2dItE25c)La_IEIG!d-?&Bhp($&h=QL#5QqBs=qP}a0Z?1sWPN6t$=S@hEI>}; zOgr^+&xq~;dHmn0_Tq{bVWyPBK0x>>rJxSE*= RF*9od6(c)l^M7GR764g=INksN diff --git a/models/PortForward.go b/models/PortForward.go index 60371b2..fc380a6 100644 --- a/models/PortForward.go +++ b/models/PortForward.go @@ -20,6 +20,8 @@ type PortForward struct { // 端口号 TargetPort int `orm:"column(targetPort);null"` CreateTime time.Time `orm:"column(createTime);type(datetime)"` + //暂时用来存放端口分发配置，后续版本再调整 + Others string `orm:"column(others);size(500);null"` } func (t *PortForward) TableName() string { diff --git a/services/ForwardService.go b/services/ForwardService.go index 7289016..1934e3f 100644 --- a/services/ForwardService.go +++ b/services/ForwardService.go @@ -4,6 +4,7 @@ import ( "io" "net" "port-forward/models" + "port-forward/utils" "strings" "sync" "time" @@ -91,7 +92,11 @@ func (_self *ForwardService) GetKey(sourcePort, targetPort string) string { // // sourcePort 源地址和端口，例如：0.0.0.0:8700，本程序会新建立监听 // targetPort 数据转发给哪个端口，例如：192.168.1.100:3306 -func (_self *ForwardService) StartPortForward(sourcePort string, targetPort string, result chan models.ResultData) { +func (_self *ForwardService) StartPortForward(portForward *models.PortForward, result chan models.ResultData) { + + sourcePort := fmt.Sprint(portForward.Addr, ":", portForward.Port) + targetPort := fmt.Sprint(portForward.TargetAddr, ":", portForward.TargetPort) + resultData := &models.ResultData{Code: 0, Msg: ""} logs.Debug("StartTcpPortForward sourcePort: ", sourcePort, " targetPort:", targetPort) @@ -135,18 +140,43 @@ func (_self *ForwardService) StartPortForward(sourcePort string, targetPort stri //targetPort := "172.16.128.83:22" targetConn, err := net.DialTimeout("tcp", targetPort, 30*time.Second) - go func() { - _, err = _self.Copy(targetConn, sourceConn) - if err != nil { - logs.Error("1网络连接异常：", err) - _self.UnRegistryClient(fmt.Sprint(sourcePort, "_", sourceConn.RemoteAddr().String())) + if utils.IsNotEmpty(portForward.Others) { + var dispatchConns []io.Writer + dispatchConns = append(dispatchConns, targetConn) + //分发方式 + dispatchTargets := utils.Split(portForward.Others, ";") + + for _, dispatchTarget := range dispatchTargets { + logs.Debug("分发到：", dispatchTarget) + dispatchTargetConn, err := net.DialTimeout("tcp", dispatchTarget, 30*time.Second) + if err == nil { + dispatchConns = append(dispatchConns, dispatchTargetConn) + } + } - }() + + go func() { + mWriter := io.MultiWriter(dispatchConns...) + _, err = _self.Copy(mWriter, sourceConn) + if err != nil { + logs.Error("Dispatch网络连接异常：", err) + } + }() + + } else { + go func() { + _, err = _self.Copy(targetConn, sourceConn) + if err != nil { + logs.Error("客户端来源数据转发到目标端口异常：", err) + _self.UnRegistryClient(fmt.Sprint(sourcePort, "_", sourceConn.RemoteAddr().String())) + } + }() + } go func() { _, err = _self.Copy(sourceConn, targetConn) if err != nil { - logs.Error("2网络连接异常：", err) + logs.Error("目标端口返回响应数据异常：", err) _self.UnRegistryPort(sourcePort) } }() @@ -157,6 +187,20 @@ func (_self *ForwardService) StartPortForward(sourcePort string, targetPort stri } +func (_self *ForwardService) DataDispatch(src io.Reader, targetPorts []string) { + for _, target := range targetPorts { + logs.Debug("分发到：", target) + go func() { + targetConn, err := net.DialTimeout("tcp", target, 30*time.Second) + _, err = _self.Copy(targetConn, src) + if err != nil { + logs.Error("Dispatch网络连接异常：", err) + } + }() + } + +} + func (_self *ForwardService) ClosePortForward(sourcePort string, targetPort string, result chan models.ResultData) { resultData := &models.ResultData{Code: 0, Msg: ""} diff --git a/services/InitServices.go b/services/InitServices.go index a1e76e0..fe70f19 100644 --- a/services/InitServices.go +++ b/services/InitServices.go @@ -1,7 +1,9 @@ package services import ( + "github.com/astaxie/beego" "github.com/astaxie/beego/orm" + _ "github.com/go-sql-driver/mysql" _ "github.com/mattn/go-sqlite3" ) @@ -12,16 +14,20 @@ var ( ) func init() { - //数据库连接 - //_ "github.com/mattn/go-sqlite3" - orm.RegisterDriver("sqlite3", orm.DRSqlite) - orm.RegisterDataBase("default", "sqlite3", "file:data/data.db?cache=shared&loc=auto") - //orm.RegisterDataBase("default", "sqlite3", "file::memory:?mode=memory&cache=shared&loc=auto") + appStore := beego.AppConfig.DefaultString("app.store", "sqlite3") - //_ "github.com/go-sql-driver/mysql" - //dataSource := beego.AppConfig.String("mysql.url") - //orm.RegisterDriver("mysql", orm.DRMySQL) - //orm.RegisterDataBase("default", "mysql", dataSource) + //数据库连接 + if appStore == "mysql" { + //_ "github.com/go-sql-driver/mysql" + dataSource := beego.AppConfig.String("mysql.url") + orm.RegisterDriver("mysql", orm.DRMySQL) + orm.RegisterDataBase("default", "mysql", dataSource) + } else { + //_ "github.com/mattn/go-sqlite3" + orm.RegisterDriver("sqlite3", orm.DRSqlite) + orm.RegisterDataBase("default", "sqlite3", "file:data/data.db?cache=shared&loc=auto") + //orm.RegisterDataBase("default", "sqlite3", "file::memory:?mode=memory&cache=shared&loc=auto") + } //开启DEBUG模式，输出SQL信息 orm.Debug = true diff --git a/services/SysDataService.go b/services/SysDataService.go index ce61ad2..e4b77b6 100644 --- a/services/SysDataService.go +++ b/services/SysDataService.go @@ -210,14 +210,15 @@ func (_self *SysDataService) SavePortForward(entity *models.PortForward) error { update.Protocol = entity.Protocol update.TargetAddr = entity.TargetAddr update.TargetPort = entity.TargetPort + update.Others = entity.Others _, err1 := OrmerS.Update(update) return err1 } else { entity.CreateTime = time.Now() //_, err := OrmerS.Insert(entity) - res, err := OrmerS.Raw("INSERT INTO t_port_forward(name, status, addr, port, protocol, targetAddr, targetPort, createTime) values(?,?,?,?,?,?,?,?)", - entity.Name, entity.Status, entity.Addr, entity.Port, entity.Protocol, entity.TargetAddr, entity.TargetPort, entity.CreateTime).Exec() + res, err := OrmerS.Raw("INSERT INTO t_port_forward(name, status, addr, port, protocol, targetAddr, targetPort, createTime, others) values(?,?,?,?,?,?,?,?,?)", + entity.Name, entity.Status, entity.Addr, entity.Port, entity.Protocol, entity.TargetAddr, entity.TargetPort, entity.CreateTime, entity.Others).Exec() if err == nil { num, _ := res.RowsAffected() logs.Debug("AddPortForward", num) diff --git a/views/ucenter/forwardForm.html b/views/ucenter/forwardForm.html index 1102370..5ef9ede 100644 --- a/views/ucenter/forwardForm.html +++ b/views/ucenter/forwardForm.html @@ -42,7 +42,20 @@ - +
+ +
+ +
+
+
+ 
+*多分发说明：
+如果不需要“多分发”，请留空；
+如果需要分发到多个端口，填写格式为 “IP:端口”，多个用 ; 号隔开
+如 192.1.1.100:8081;192.1.1.100:8082
+
+
diff --git a/views/ucenter/forwardList.html b/views/ucenter/forwardList.html index 88c3df7..9c9ee86 100644 --- a/views/ucenter/forwardList.html +++ b/views/ucenter/forwardList.html @@ -84,228 +84,189 @@ \ No newline at end of file