V2.7 增加agent执行器

controllers/server.go

@@ -8,16 +8,12 @@
 package controllers
 
 import (
-	"fmt"
+	"github.com/astaxie/beego/logs"
+	"github.com/george518/PPGo_Job/libs"
 	"github.com/george518/PPGo_Job/models"
-	"golang.org/x/crypto/ssh"
-	"io/ioutil"
-	"net"
 	"strconv"
 	"strings"
 	"time"
-	"github.com/linxiaozhi/go-telnet"
-	"github.com/pkg/errors"
 )
 
 type ServerController struct {
@@ -25,13 +21,13 @@ type ServerController struct {
 }
 
 func (self *ServerController) List() {
-	self.Data["pageTitle"] = "资源管理"
+	self.Data["pageTitle"] = "执行资源管理"
 	self.Data["serverGroup"] = serverGroupLists(self.serverGroups, self.userId)
 	self.display()
 }
 
 func (self *ServerController) Add() {
-	self.Data["pageTitle"] = "新增服务器资源"
+	self.Data["pageTitle"] = "新增执行资源"
 	self.Data["serverGroup"] = serverGroupLists(self.serverGroups, self.userId)
 	self.display()
 }
@@ -92,7 +88,7 @@ func (self *ServerController) GetServerByGroupId() {
 }
 
 func (self *ServerController) Edit() {
-	self.Data["pageTitle"] = "编辑服务器资源"
+	self.Data["pageTitle"] = "编辑执行资源"
 
 	id, _ := self.GetInt("id", 0)
 	server, _ := models.TaskServerGetById(id)
@@ -136,12 +132,12 @@ func (self *ServerController) AjaxTestServer() {
 	if server.ConnectionType == 0 {
 		if server.Type == 0 {
 			//密码登录
-			err = RemoteCommandByPassword(server)
+			err = libs.RemoteCommandByPassword(server)
 		}
 
 		if server.Type == 1 {
 			//密钥登录
-			err = RemoteCommandByKey(server)
+			err = libs.RemoteCommandByKey(server)
 		}
 
 		if err != nil {
@@ -151,7 +147,7 @@ func (self *ServerController) AjaxTestServer() {
 	} else if server.ConnectionType == 1 {
 		if server.Type == 0 {
 			//密码登录
-			err = RemoteCommandByTelnetPassword(server)
+			err = libs.RemoteCommandByTelnetPassword(server)
 		} else {
 			self.ajaxMsg("Telnet方式暂不支持密钥登陆！", MSG_ERR)
 		}
@@ -160,114 +156,19 @@ func (self *ServerController) AjaxTestServer() {
 			self.ajaxMsg(err.Error(), MSG_ERR)
 		}
 		self.ajaxMsg("Success", MSG_OK)
+	} else if server.ConnectionType == 2 {
+
+		if err := libs.RemoteAgent(server); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		} else {
+			self.ajaxMsg("Success", MSG_OK)
+
+		}
 	}
 
 	self.ajaxMsg("未知连接方式", MSG_ERR)
 }
 
-func RemoteCommandByTelnetPassword(servers *models.TaskServer) error {
-
-	addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port)
-	conn, err := gote.DialTimeout("tcp", addr, time.Second*10)
-	if err != nil {
-		return err
-	}
-
-	defer conn.Close()
-
-	buf := make([]byte, 4096)
-	_, err = conn.Read(buf)
-	if err != nil {
-		return err
-	}
-
-	_, err = conn.Write([]byte(servers.ServerAccount + "\r\n"))
-	if err != nil {
-		return err
-	}
-
-	_, err = conn.Read(buf)
-	if err != nil {
-		return err
-	}
-
-	_, err = conn.Write([]byte(servers.Password + "\r\n"))
-	if err != nil {
-		return err
-	}
-
-	_, err = conn.Read(buf)
-	if err != nil {
-		return err
-	}
-
-	str := gbkAsUtf8(string(buf[:]))
-
-	if strings.Contains(str, ">") {
-		return nil
-	}
-
-	return errors.Errorf("连接失败!")
-}
-
-func RemoteCommandByPassword(servers *models.TaskServer) error {
-	var (
-		auth         []ssh.AuthMethod
-		addr         string
-		clientConfig *ssh.ClientConfig
-	)
-
-	auth = make([]ssh.AuthMethod, 0)
-	auth = append(auth, ssh.Password(servers.Password))
-
-	clientConfig = &ssh.ClientConfig{
-		User: servers.ServerAccount,
-		Auth: auth,
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-		Timeout: 5 * time.Second,
-	}
-
-	addr = fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port)
-	client, err := ssh.Dial("tcp", addr, clientConfig)
-	if err == nil {
-		defer client.Close()
-	}
-	return err
-}
-
-func RemoteCommandByKey(servers *models.TaskServer) error {
-	key, err := ioutil.ReadFile(servers.PrivateKeySrc)
-	if err != nil {
-		return err
-	}
-
-	signer, err := ssh.ParsePrivateKey(key)
-	if err != nil {
-		return err
-	}
-	addr := fmt.Sprintf("%s:%d", servers.ServerIp, servers.Port)
-	config := &ssh.ClientConfig{
-		User: servers.ServerAccount,
-		Auth: []ssh.AuthMethod{
-			// Use the PublicKeys method for remote authentication.
-			ssh.PublicKeys(signer),
-		},
-		//HostKeyCallback: ssh.FixedHostKey(hostKey),
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-		Timeout: 5 * time.Second,
-	}
-
-	client, err := ssh.Dial("tcp", addr, config)
-	if err == nil {
-		client.Close()
-	}
-	return err
-}
-
 func (self *ServerController) Copy() {
 	self.Data["pageTitle"] = "复制服务器资源"
 
@@ -347,9 +248,14 @@ func (self *ServerController) AjaxSave() {
 
 func (self *ServerController) AjaxDel() {
 	id, _ := self.GetInt("id")
+
+	if id == 1 {
+		self.ajaxMsg("默认分组id=1，禁止删除", MSG_ERR)
+	}
+
 	server, _ := models.TaskServerGetById(id)
 	server.UpdateTime = time.Now().Unix()
-	server.Status = 1
+	server.Status = 2
 	server.Id = id
 
 	//TODO 查询服务器是否用于定时任务
@@ -374,18 +280,19 @@ func (self *ServerController) Table() {
 
 	serverName := strings.TrimSpace(self.GetString("serverName"))
 	StatusText := []string{
-		"正常",
-		"<font color='red'>禁用</font>",
+		"<i class='fa fa-refresh' style='color:#5FB878'></i>",
+		"<i class='fa fa-ban' style='color:#FF5722'></i>",
 	}
+	//
+	//loginType := [2]string{
+	//	"密码",
+	//	"密钥",
+	//}
 
-	loginType := [2]string{
-		"密码",
-		"密钥",
-	}
-
-	connectionType := [2]string{
+	connectionType := [3]string{
 		"SSH",
 		"Telnet",
+		"Agent",
 	}
 
 	serverGroup := serverGroupLists(self.serverGroups, self.userId)
@@ -393,7 +300,8 @@ func (self *ServerController) Table() {
 	self.pageSize = limit
 	//查询条件
 	filters := make([]interface{}, 0)
-	filters = append(filters, "status", 0)
+	ids := []int{0, 1}
+	filters = append(filters, "status__in", ids)
 
 	groupsIds := make([]int, 0)
 	if self.userId != 1 {
@@ -425,17 +333,128 @@ func (self *ServerController) Table() {
 		row := make(map[string]interface{})
 		row["id"] = v.Id
 		row["connection_type"] = connectionType[v.ConnectionType]
-		row["server_name"] = v.ServerName
+		row["server_name"] = StatusText[v.Status] + " " + v.ServerName
 		row["detail"] = v.Detail
 		if serverGroup[v.GroupId] == "" {
 			v.GroupId = 0
 		}
+		row["ip_port"] = v.ServerIp + ":" + strconv.Itoa(v.Port)
 		row["group_name"] = serverGroup[v.GroupId]
-		row["type"] = loginType[v.Type]
+		//row["type"] = loginType[v.Type]
 		row["status"] = v.Status
-		row["status_text"] = StatusText[v.Status]
 		list[k] = row
 	}
 
 	self.ajaxList("成功", MSG_OK, count, list)
 }
+
+//以下函数为执行器接口
+//注册
+func (self *ServerController) ApiSave() {
+	//唯一确定值 ip+port
+	serverIp := strings.TrimSpace(self.GetString("server_ip"))
+	port, _ := self.GetInt("port")
+
+	if serverIp == "" || port == 0 {
+		self.ajaxMsg("执行器和端口号必填", MSG_ERR)
+	}
+
+	defaultActName := "agent-" + serverIp + "-" + strconv.Itoa(port)
+
+	id := models.TaskServerForActuator(serverIp, port)
+	if id == 0 {
+		//新增
+		server := new(models.TaskServer)
+		server.ConnectionType, _ = self.GetInt("connection_type", 3)
+		server.ServerName = strings.TrimSpace(self.GetString("server_name", defaultActName))
+		server.ServerAccount = strings.TrimSpace(self.GetString("server_account", "agent"))
+		server.ServerOuterIp = strings.TrimSpace(self.GetString("server_outer_ip", ""))
+		server.ServerIp = strings.TrimSpace(self.GetString("server_ip"))
+		server.PrivateKeySrc = strings.TrimSpace(self.GetString("private_key_src", ""))
+		server.PublicKeySrc = strings.TrimSpace(self.GetString("public_key_src", ""))
+		server.Password = strings.TrimSpace(self.GetString("password", "agent"))
+
+		server.Detail = strings.TrimSpace(self.GetString("detail", ""))
+		server.Type, _ = self.GetInt("type", 0)
+		server.Port, _ = self.GetInt("port")
+		server.GroupId, _ = self.GetInt("group_id", 0)
+		server.Status = 0
+
+		server.CreateTime = time.Now().Unix()
+		server.UpdateTime = time.Now().Unix()
+		server.Status = 0
+		serverId, err := models.TaskServerAdd(server)
+		if err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg(serverId, MSG_OK)
+	} else {
+		//修改状态
+		server, _ := models.TaskServerGetById(id)
+		server.UpdateTime = time.Now().Unix()
+		server.Status, _ = self.GetInt("status", 0)
+		if err := server.Update(); err != nil {
+			self.ajaxMsg(err.Error(), MSG_ERR)
+		}
+		self.ajaxMsg(id, MSG_OK)
+	}
+
+}
+
+//检测0-正常，1-异常，2-删除
+func (self *ServerController) ApiStatus() {
+	//唯一确定值 ip+port
+	serverId := strings.TrimSpace(self.GetString("server_ip"))
+	port, _ := self.GetInt("port")
+	status, _ := self.GetInt("status", 0)
+
+	if serverId == "" || port == 0 {
+		self.ajaxMsg("执行器和端口号必填", MSG_ERR)
+	}
+
+	id := models.TaskServerForActuator(serverId, port)
+	if id == 0 {
+		self.ajaxMsg("执行器不存在", MSG_ERR)
+	}
+
+	if status != 0 && status != 1 {
+		status = 0
+	}
+
+	server, _ := models.TaskServerGetById(id)
+	server.UpdateTime = time.Now().Unix()
+	server.Status = status
+	server.Id = id
+
+	logs.Info(server)
+
+	//TODO 查询执行器是否正在使用中
+	if err := server.Update(); err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	}
+	self.ajaxMsg(id, MSG_OK)
+}
+
+//获取 不检测执行器状态
+func (self *ServerController) ApiGet() {
+	//唯一确定值 ip+port
+	serverId := strings.TrimSpace(self.GetString("server_ip"))
+	port, _ := self.GetInt("port")
+
+	if serverId == "" || port == 0 {
+		self.ajaxMsg("执行器和端口号必填", MSG_ERR)
+	}
+
+	id := models.TaskServerForActuator(serverId, port)
+	if id == 0 {
+		self.ajaxMsg("执行器不存在", MSG_ERR)
+	}
+
+	server, err := models.TaskServerGetById(id)
+
+	if err != nil {
+		self.ajaxMsg(err.Error(), MSG_ERR)
+	} else {
+		self.ajaxMsg(server, MSG_OK)
+	}
+}