Revert "feat($gocron-node): 增加token鉴权, #14"

This reverts commit 8ec80a02b6.

README.md

@@ -74,7 +74,6 @@
     * -s ip:port 监听地址
     * -cert-file 证书文件
     * -key-file  私钥文件
-    * -token 
     * -h 查看帮助
     * -v 查看版本
 

gocron-node.go

@@ -20,12 +20,10 @@ func main()  {
     var version bool
     var keyFile string
     var certFile string
-    var token string
     flag.BoolVar(&allowRoot, "allow-root", false, "./gocron-node -allow-root")
     flag.StringVar(&serverAddr, "s", "0.0.0.0:5921", "./gocron-node -s ip:port")
     flag.StringVar(&certFile, "cert-file", "", "./gocron-node -cert-file path")
     flag.StringVar(&keyFile, "key-file", "", "./gocron-node -key-file path")
-    flag.StringVar(&token, "token", "", "./gocron-node -token")
     flag.BoolVar(&version, "v", false, "./gocron-node -v")
     flag.Parse()
 
@@ -54,5 +52,5 @@ func main()  {
 
 
 
-	server.Start(serverAddr, certFile, keyFile, token)
+	server.Start(serverAddr, certFile, keyFile)
 }

models/host.go

@@ -11,7 +11,6 @@ type Host struct {
     Alias     string    `xorm:"varchar(32) notnull default '' "`  // 主机别名
     Port      int       `xorm:"notnull default 22"`               // 主机端口
     CertFile  string    `xorm:"varchar(64) notnull default '' "`
-    Token     string    `xorm:"varchar(128) notnull default '' "`
     Remark    string    `xorm:"varchar(100) notnull default '' "` // 备注
     BaseModel       `xorm:"-"`
     Selected bool   `xorm:"-"`
@@ -28,7 +27,7 @@ func (host *Host) Create() (insertId int16, err error) {
 }
 
 func (host *Host) UpdateBean(id int16) (int64, error)  {
-    return Db.ID(id).Cols("name,alias,port,cert_file,token,remark").Update(host)
+    return Db.ID(id).Cols("name,alias,port,cert_file,remark").Update(host)
 }
 
 

models/migration.go

@@ -143,11 +143,6 @@ func (migration *Migration) upgradeFor120(session *xorm.Session) error {
     // host表增加cert_file字段
     tableName := TablePrefix + "host"
     _, err := session.Exec(fmt.Sprintf("ALTER TABLE %s Add COLUMN cert_file VARCHAR(64) NOT NULL DEFAULT ''", tableName))
-    if err != nil {
-        return err
-    }
-
-    _, err = session.Exec(fmt.Sprintf("ALTER TABLE %s Add COLUMN token VARCHAR(64) NOT NULL DEFAULT ''", tableName))
 
     return err
 }

models/task_host.go

@@ -13,7 +13,6 @@ type TaskHostDetail struct {
     Port int
     Alias string
     CertFile string
-    Token string
 }
 
 func (TaskHostDetail) TableName() string  {
@@ -50,7 +49,7 @@ func (th *TaskHost) Add(taskId int, hostIds []int) error {
 
 func (th *TaskHost) GetHostIdsByTaskId(taskId int) ([]TaskHostDetail, error) {
     list := make([]TaskHostDetail, 0)
-    fields := "th.id,th.host_id,h.alias,h.name,h.port,h.cert_file,h.token"
+    fields := "th.id,th.host_id,h.alias,h.name,h.port,h.cert_file"
     err := Db.Alias("th").
         Join("LEFT", hostTableName(), "th.host_id=h.id").
         Where("th.task_id = ?", taskId).

modules/rpc/client/client.go

@@ -16,11 +16,11 @@ var (
     errUnavailable = errors.New("无法连接远程服务器")
 )
 
-func ExecWithRetry(ip string, port int, certFile string, token string, taskReq *pb.TaskRequest) (string, error)  {
+func ExecWithRetry(ip string, port int, certFile string,taskReq *pb.TaskRequest) (string, error)  {
     tryTimes := 15
     i := 0
     for i < tryTimes {
-        output, err := Exec(ip, port, certFile, token, taskReq)
+        output, err := Exec(ip, port, certFile, taskReq)
         if err != errUnavailable {
             return output, err
         }
@@ -31,14 +31,14 @@ func ExecWithRetry(ip string, port int, certFile string, token string, taskReq *
     return "", errUnavailable
 }
 
-func Exec(ip string, port int, certFile string, token string, taskReq *pb.TaskRequest) (string, error)  {
+func Exec(ip string, port int, certFile string, taskReq *pb.TaskRequest) (string, error)  {
     defer func() {
        if err := recover(); err != nil {
            logger.Error("panic#rpc/client.go:Exec#", err)
        }
     } ()
     addr := fmt.Sprintf("%s:%d", ip, port)
-    conn, err := grpcpool.Pool.Get(addr, certFile, token)
+    conn, err := grpcpool.Pool.Get(addr, certFile)
     if err != nil {
         return "", err
     }
@@ -77,4 +77,4 @@ func parseGRPCError(err error, conn *grpc.ClientConn, connClosed *bool) (string,
             return "", errors.New("执行超时, 强制结束")
     }
     return "", err
-}
+}

modules/rpc/grpcpool/grpc_pool.go

@@ -7,7 +7,6 @@ import (
     "google.golang.org/grpc"
     "errors"
     "google.golang.org/grpc/credentials"
-    "golang.org/x/net/context"
     "strings"
 )
 
@@ -33,12 +32,12 @@ type GRPCPool struct {
     sync.RWMutex
 }
 
-func (p *GRPCPool) Get(addr, certFile, token string) (*grpc.ClientConn, error)  {
+func (p *GRPCPool) Get(addr, certFile string) (*grpc.ClientConn, error)  {
     p.RLock()
     pool, ok := p.conns[addr]
     p.RUnlock()
     if !ok {
-        err := p.newCommonPool(addr, certFile, token)
+        err := p.newCommonPool(addr, certFile)
         if err != nil {
             return nil, err
         }
@@ -89,7 +88,7 @@ func (p *GRPCPool) ReleaseAll()  {
 }
 
 // 初始化底层连接池
-func (p *GRPCPool) newCommonPool(addr, certFile, token string) (error) {
+func (p *GRPCPool) newCommonPool(addr, certFile string) (error) {
     p.Lock()
     defer p.Unlock()
     commonPool, ok := p.conns[addr]
@@ -110,13 +109,7 @@ func (p *GRPCPool) newCommonPool(addr, certFile, token string) (error) {
                 return nil, err
             }
 
-            customCredential := &CustomCredential{Token: token}
+            return grpc.Dial(addr, grpc.WithTransportCredentials(creds))
-
-
-            return grpc.Dial(addr,
-                grpc.WithTransportCredentials(creds),
-                grpc.WithPerRPCCredentials(customCredential),
-            )
         },
         Close: func(v interface{}) error {
             conn, ok := v.(*grpc.ClientConn)
@@ -136,19 +129,4 @@ func (p *GRPCPool) newCommonPool(addr, certFile, token string) (error) {
     p.conns[addr] = commonPool
 
     return nil
-}
-
-type CustomCredential struct
-{
-    Token string
-}
-
-func (c CustomCredential) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
-    return map[string]string{
-        "token": c.Token,
-    }, nil
-}
-
-func (c CustomCredential) RequireTransportSecurity() bool {
-    return true
 }

modules/rpc/server/server.go

@@ -8,32 +8,9 @@ import (
     pb "github.com/ouqiang/gocron/modules/rpc/proto"
     "github.com/ouqiang/gocron/modules/utils"
     "google.golang.org/grpc/credentials"
-    "google.golang.org/grpc/metadata"
-    "errors"
 )
 
-type Server struct
+type Server struct {}
-{
-    Token string
-}
-
-func (s Server) auth(ctx context.Context) error  {
-    // 验证token是否有效
-    meta, ok := metadata.FromContext(ctx)
-    if !ok {
-        return errors.New("missing metadata")
-    }
-
-    token, ok := meta["token"]
-    if !ok {
-        return errors.New("missing param token")
-    }
-    if token[0] != s.Token {
-        return errors.New("invalid token")
-    }
-
-    return nil
-}
 
 func (s Server) Run(ctx context.Context, req *pb.TaskRequest) (*pb.TaskResponse, error)  {
     defer func() {
@@ -41,15 +18,6 @@ func (s Server) Run(ctx context.Context, req *pb.TaskRequest) (*pb.TaskResponse,
             grpclog.Println(err)
         }
     } ()
-
-
-    if s.Token != "" {
-        err := s.auth(ctx)
-        if err != nil {
-            return nil, err
-        }
-    }
-
     output, err := utils.ExecShell(ctx, req.Command)
     resp := new(pb.TaskResponse)
     resp.Output = output
@@ -62,7 +30,7 @@ func (s Server) Run(ctx context.Context, req *pb.TaskRequest) (*pb.TaskResponse,
     return resp, nil
 }
 
-func Start(addr, certFile, keyFile, token string)  {
+func Start(addr, certFile, keyFile string)  {
     defer func() {
        if err := recover(); err != nil {
            grpclog.Println("panic", err)
@@ -74,7 +42,6 @@ func Start(addr, certFile, keyFile, token string)  {
     }
 
     var s *grpc.Server
-    server := Server{Token: token}
     if certFile != "" {
         // TLS认证
         creds, err := credentials.NewServerTLSFromFile(certFile, keyFile)
@@ -83,11 +50,11 @@ func Start(addr, certFile, keyFile, token string)  {
         }
 
         s = grpc.NewServer(grpc.Creds(creds))
-        pb.RegisterTaskServer(s, server)
+        pb.RegisterTaskServer(s, Server{})
         grpclog.Printf("listen %s with TLS", addr)
     } else {
         s = grpc.NewServer()
-        pb.RegisterTaskServer(s, server)
+        pb.RegisterTaskServer(s, Server{})
         grpclog.Println("listen ", addr)
     }
     err = s.Serve(l)

routers/host/host.go

@@ -65,7 +65,6 @@ type HostForm struct {
     Alias string `binding:"Required;MaxSize(32)"`
     Port int `binding:"Required;Range(1-65535)"`
     CertFile string
-    Token string
     Remark string
 }
 
@@ -96,7 +95,6 @@ func Store(ctx *macaron.Context, form HostForm) string  {
     hostModel.Port = form.Port
     hostModel.Remark = strings.TrimSpace(form.Remark)
     hostModel.CertFile = strings.TrimSpace(form.CertFile)
-    hostModel.Token = strings.TrimSpace(form.Token)
 
     if hostModel.CertFile != "" && !utils.FileExist(hostModel.CertFile) {
         return json.CommonFailure("证书文件不存在或无权限访问")
@@ -182,11 +180,7 @@ func Ping(ctx *macaron.Context) string  {
     taskReq := &rpc.TaskRequest{}
     taskReq.Command = "echo hello"
     taskReq.Timeout = 10
-    output, err := client.Exec(hostModel.Name,
+    output, err := client.Exec(hostModel.Name, hostModel.Port, hostModel.CertFile, taskReq)
-        hostModel.Port,
-        hostModel.CertFile,
-        hostModel.Token,
-        taskReq)
     if err != nil {
         return json.CommonFailure("连接失败-" + err.Error() + " " + output, err)
     }

service/task.go

@@ -181,11 +181,7 @@ func (h *RPCHandler) Run(taskModel models.Task) (result string, err error)  {
     var resultChan chan TaskResult = make(chan TaskResult, len(taskModel.Hosts))
     for _, taskHost := range taskModel.Hosts {
         go func(th models.TaskHostDetail) {
-            output, err := rpcClient.ExecWithRetry(th.Name,
+            output, err := rpcClient.ExecWithRetry(th.Name, th.Port, th.CertFile, taskRequest)
-                th.Port,
-                th.CertFile,
-                th.Token,
-                taskRequest)
             var errorMessage string = ""
             if err != nil {
                 errorMessage = err.Error()

templates/host/host_form.html

@@ -45,14 +45,6 @@
                     </div>
                 </div>
             </div>
-            <div class="two fields">
-                <div class="field">
-                    <label>Token</label>
-                    <div class="ui small  input">
-                        <textarea rows="4" name="token" placeholder="gocron-node中配置的token">{{{.Host.Token}}}</textarea>
-                    </div>
-                </div>
-            </div>
             <div class="two fields">
                 <div class="field">
                     <label>备注</label>