opt ssh.server

base/ssh/server.go

@@ -3,7 +3,6 @@ package ssh
 import (
 	ice "github.com/shylinux/icebergs"
 	"github.com/shylinux/icebergs/base/aaa"
-	"github.com/shylinux/icebergs/base/cli"
 	"github.com/shylinux/icebergs/base/mdb"
 	"github.com/shylinux/icebergs/base/nfs"
 	kit "github.com/shylinux/toolkits"
@@ -12,8 +11,6 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"errors"
-	"github.com/kr/pty"
-	"golang.org/x/crypto/ssh"
 	"io"
 	"net"
 	"os"
@@ -22,6 +19,9 @@ import (
 	"strings"
 	"syscall"
 	"unsafe"
+
+	"github.com/kr/pty"
+	"golang.org/x/crypto/ssh"
 )
 
 type Winsize struct {
@@ -41,10 +41,10 @@ func _ssh_size(fd uintptr, b []byte) {
 func _ssh_exec(m *ice.Message, cmd string, arg []string, env []string, tty io.ReadWriter, done func()) {
 	m.Log_IMPORT("cmd", cmd, "arg", arg, "env", env)
 	c := exec.Command(cmd, arg...)
-	c.Env = env
+	// c.Env = env
 
-	c.Stdout = tty
 	c.Stdin = tty
+	c.Stdout = tty
 	c.Stderr = tty
 
 	err := c.Start()
@@ -57,12 +57,167 @@ func _ssh_exec(m *ice.Message, cmd string, arg []string, env []string, tty io.Re
 	}()
 }
 
+const (
+	PUBLIC = "public"
+	LISTEN = "listen"
+)
+
 func init() {
 	Index.Merge(&ice.Context{
 		Configs: map[string]*ice.Config{
+			PUBLIC: {Name: PUBLIC, Help: "公钥", Value: kit.Data(kit.MDB_SHORT, kit.MDB_TEXT)},
+			LISTEN: {Name: LISTEN, Help: "服务", Value: kit.Data()},
+
 			"dial": {Name: "dial", Help: "远程连接", Value: kit.Data()},
 		},
 		Commands: map[string]*ice.Command{
+			PUBLIC: {Name: "public hash auto 创建 导入", Help: "公钥", Meta: kit.Dict(), Action: map[string]*ice.Action{
+				mdb.IMPORT: {Name: "import", Help: "导入", List: kit.List(
+					kit.MDB_INPUT, "text", kit.MDB_NAME, "file", kit.MDB_VALUE, ".ssh/id_rsa.pub",
+				), Hand: func(m *ice.Message, arg ...string) {
+					for _, pub := range strings.Split(m.Cmdx(nfs.CAT, path.Join(os.Getenv("HOME"), kit.Select(arg[0], arg, 1))), "\n") {
+						if len(pub) > 10 {
+							m.Cmd(PUBLIC, mdb.CREATE, pub)
+						}
+					}
+				}},
+				mdb.CREATE: {Name: "create", Help: "创建", List: kit.List(
+					kit.MDB_INPUT, "textarea", kit.MDB_NAME, "publickey", kit.MDB_VALUE, "", kit.MDB_STYLE, kit.Dict("width", "200", "height", "100"),
+				), Hand: func(m *ice.Message, arg ...string) {
+					ls := kit.Split(kit.Select(arg[0], arg, 1))
+					m.Cmdy(mdb.INSERT, m.Prefix(PUBLIC), "", mdb.HASH, kit.MDB_TYPE, ls[0], kit.MDB_NAME, ls[len(ls)-1], kit.MDB_TEXT, strings.Join(ls[1:len(ls)-1], "+"))
+				}},
+				mdb.DELETE: {Name: "delete", Help: "删除", Hand: func(m *ice.Message, arg ...string) {
+					m.Cmdy(mdb.DELETE, m.Prefix(PUBLIC), "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH))
+				}},
+			}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+				m.Cmdy(mdb.SELECT, m.Prefix(PUBLIC), "", mdb.HASH, kit.MDB_HASH, arg)
+				m.PushAction("删除")
+			}},
+
+			LISTEN: {Name: "listen host:port", Help: "服务", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+				m.Cmd(PUBLIC, mdb.IMPORT, ".ssh/id_rsa.pub")
+
+				config := &ssh.ServerConfig{
+					BannerCallback: func(conn ssh.ConnMetadata) string {
+						m.Logs("banner", "remote", conn.RemoteAddr(), aaa.USERNAME, conn.User())
+						return "hello context world\n"
+					},
+					PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
+						res := errors.New(ice.ErrNotAuth)
+						m.Richs(PUBLIC, "", kit.MDB_FOREACH, func(k string, value map[string]interface{}) {
+							if !strings.HasPrefix(kit.Format(value[kit.MDB_NAME]), conn.User()+"@") {
+								return
+							}
+							if s, e := base64.StdEncoding.DecodeString(kit.Format(value[kit.MDB_TEXT])); !m.Warn(e != nil, e) {
+								if pub, e := ssh.ParsePublicKey([]byte(s)); !m.Warn(e != nil) {
+									if bytes.Compare(pub.Marshal(), key.Marshal()) == 0 {
+										m.Log_AUTH("remote", conn.RemoteAddr(), aaa.USERNAME, conn.User(), "publickey", value[kit.MDB_NAME])
+										res = nil
+									}
+								}
+							}
+						})
+						return &ssh.Permissions{Extensions: map[string]string{"method": "publickey"}}, res
+					},
+					// KeyboardInteractiveCallback: func(conn ssh.ConnMetadata, client ssh.KeyboardInteractiveChallenge) (*ssh.Permissions, error) {
+					// 	m.Debug("what")
+					// 	return &ssh.Permissions{Extensions: map[string]string{"key-id": "2"}}, nil
+					// },
+					PasswordCallback: func(conn ssh.ConnMetadata, password []byte) (*ssh.Permissions, error) {
+						res := errors.New(ice.ErrNotAuth)
+						m.Richs(aaa.USER, "", conn.User(), func(k string, value map[string]interface{}) {
+							if string(password) == kit.Format(value[aaa.PASSWORD]) {
+								m.Log_AUTH("remote", conn.RemoteAddr(), aaa.USERNAME, conn.User(), aaa.PASSWORD, strings.Repeat("*", len(kit.Format(value[aaa.PASSWORD]))))
+								res = nil
+							}
+						})
+						return &ssh.Permissions{Extensions: map[string]string{"method": aaa.PASSWORD}}, res
+					},
+				}
+
+				if key, err := ssh.ParsePrivateKey([]byte(m.Cmdx(nfs.CAT, path.Join(os.Getenv("HOME"), ".ssh/id_rsa")))); m.Assert(err) {
+					config.AddHostKey(key)
+				}
+
+				l, e := net.Listen("tcp", arg[0])
+				m.Assert(e)
+				m.Logs(LISTEN, "address", l.Addr())
+
+				for {
+					c, e := l.Accept()
+					if m.Warn(e != nil, e) {
+						continue
+					}
+
+					go func(c net.Conn) {
+						defer c.Close()
+						defer m.Logs("disconn", "remote", c.RemoteAddr(), "->", c.LocalAddr())
+						m.Logs("connect", "remote", c.RemoteAddr(), "->", c.LocalAddr())
+
+						_, sessions, req, err := ssh.NewServerConn(c, config)
+						if m.Warn(err != nil, err) {
+							return
+						}
+						go ssh.DiscardRequests(req)
+
+						for session := range sessions {
+							channel, requests, err := session.Accept()
+							if m.Warn(err != nil, err) {
+								continue
+							}
+
+							go func(channel ssh.Channel, requests <-chan *ssh.Request) {
+								defer m.Logs("dischan", "remote", c.RemoteAddr(), "->", c.LocalAddr())
+								m.Logs("channel", "remote", c.RemoteAddr(), "->", c.LocalAddr())
+								shell := kit.Select("bash", os.Getenv("SHELL"))
+								list := []string{"PATH=" + os.Getenv("PATH")}
+
+								tty, f, err := pty.Open()
+								if m.Warn(err != nil, err) {
+									return
+								}
+								defer f.Close()
+
+								for request := range requests {
+									m.Logs("request", "remote", c.RemoteAddr(), "type", request.Type)
+
+									switch request.Type {
+									case "pty-req":
+										termLen := request.Payload[3]
+										termEnv := string(request.Payload[4 : termLen+4])
+										_ssh_size(tty.Fd(), request.Payload[termLen+4:])
+										list = append(list, "TERM="+termEnv)
+
+									case "window-change":
+										_ssh_size(tty.Fd(), request.Payload)
+
+									case "env":
+										var env struct {
+											Name  string
+											Value string
+										}
+										if err := ssh.Unmarshal(request.Payload, &env); err != nil {
+											continue
+										}
+										list = append(list, env.Name+"="+env.Value)
+
+									case "exec":
+										_ssh_exec(m, shell, []string{"-c", string(request.Payload[4 : request.Payload[3]+4])}, list,
+											channel, func() { channel.Close() })
+									case "shell":
+										_ssh_exec(m, shell, nil, list, f, func() { channel.Close() })
+										go func() { io.Copy(channel, tty) }()
+										go func() { io.Copy(tty, channel) }()
+									}
+									request.Reply(true, nil)
+								}
+							}(channel, requests)
+						}
+					}(c)
+				}
+			}},
+
 			"dial": {Name: "dial hash cmd auto 创建", Help: "守护进程", Meta: kit.Dict(), Action: map[string]*ice.Action{
 				"create": {Name: "create", Help: "创建", List: kit.List(
 					kit.MDB_INPUT, "text", "name", "hostport", "value", "shylinux.com:22",
@@ -118,134 +273,6 @@ func init() {
 					m.Echo(b.String())
 				})
 			}},
-			"listen": {Name: "listen host:port", Help: "守护进程", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
-				m.Richs(aaa.USER, "", cli.UserName, func(key string, value map[string]interface{}) {
-					value["publicKey"] = m.Cmdx(nfs.CAT, path.Join(os.Getenv("HOME"), ".ssh/id_rsa.pub"))
-				})
-
-				config := &ssh.ServerConfig{
-					BannerCallback: func(conn ssh.ConnMetadata) string {
-						m.Info("%s %s->%s", conn.User(), conn.RemoteAddr(), conn.LocalAddr())
-						return "hello context world\n"
-					},
-					PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
-						res := errors.New(ice.ErrNotAuth)
-						m.TryCatch(m, true, func(m *ice.Message) {
-							m.Richs(aaa.USER, "", conn.User(), func(k string, value map[string]interface{}) {
-								if kit.Format(value["publicKey"]) == "" {
-									return
-								}
-								if s, e := base64.StdEncoding.DecodeString(strings.Split(kit.Format(value["publicKey"]), " ")[1]); !m.Warn(e != nil, e) {
-									if pub, e := ssh.ParsePublicKey([]byte(s)); !m.Warn(e != nil) {
-										if bytes.Compare(pub.Marshal(), key.Marshal()) == 0 {
-											res = nil
-										}
-									}
-								}
-							})
-						})
-						return &ssh.Permissions{Extensions: map[string]string{"method": "publickey"}}, res
-					},
-					// KeyboardInteractiveCallback: func(conn ssh.ConnMetadata, client ssh.KeyboardInteractiveChallenge) (*ssh.Permissions, error) {
-					// 	m.Debug("what")
-					// 	return &ssh.Permissions{Extensions: map[string]string{"key-id": "2"}}, nil
-					// },
-					PasswordCallback: func(conn ssh.ConnMetadata, password []byte) (*ssh.Permissions, error) {
-						res := errors.New(ice.ErrNotAuth)
-						m.TryCatch(m, true, func(m *ice.Message) {
-							m.Richs(aaa.USER, "", conn.User(), func(k string, value map[string]interface{}) {
-								if string(password) == kit.Format(value["password"]) {
-									res = nil
-								}
-							})
-						})
-						return &ssh.Permissions{Extensions: map[string]string{"method": "password"}}, res
-					},
-					AuthLogCallback: func(conn ssh.ConnMetadata, method string, err error) {
-						m.Info("%s %s->%s %v", conn.User(), conn.RemoteAddr(), conn.LocalAddr(), err)
-					},
-				}
-
-				if key, err := ssh.ParsePrivateKey([]byte(m.Cmdx(nfs.CAT, path.Join(os.Getenv("HOME"), ".ssh/id_rsa")))); m.Assert(err) {
-					config.AddHostKey(key)
-				}
-
-				l, e := net.Listen("tcp", arg[0])
-				m.Assert(e)
-				m.Logs("listen", "address", l.Addr())
-
-				for {
-					c, e := l.Accept()
-					if m.Warn(e != nil, e) {
-						continue
-					}
-
-					go func(c net.Conn) {
-						defer c.Close()
-						defer m.Logs("disconn", "remote", c.RemoteAddr(), "local", c.LocalAddr())
-
-						_, sessions, req, err := ssh.NewServerConn(c, config)
-						if m.Warn(err != nil, err) {
-							return
-						}
-						go ssh.DiscardRequests(req)
-
-						for session := range sessions {
-							channel, requests, err := session.Accept()
-							if m.Warn(err != nil, err) {
-								continue
-							}
-
-							go func(channel ssh.Channel, requests <-chan *ssh.Request) {
-								defer m.Logs("dischan", "remote", c.RemoteAddr(), "local", c.LocalAddr())
-								m.Logs("channel", "remote", c.RemoteAddr(), "local", c.LocalAddr())
-								shell := kit.Select("bash", os.Getenv("SHELL"))
-								list := []string{"PATH=" + os.Getenv("PATH")}
-
-								tty, f, err := pty.Open()
-								if m.Warn(err != nil, err) {
-									return
-								}
-								defer f.Close()
-
-								for request := range requests {
-									m.Logs("request", "type", request.Type)
-
-									switch request.Type {
-									case "pty-req":
-										termLen := request.Payload[3]
-										termEnv := string(request.Payload[4 : termLen+4])
-										_ssh_size(tty.Fd(), request.Payload[termLen+4:])
-										list = append(list, "TERM="+termEnv)
-
-									case "window-change":
-										_ssh_size(tty.Fd(), request.Payload)
-
-									case "env":
-										var env struct {
-											Name  string
-											Value string
-										}
-										if err := ssh.Unmarshal(request.Payload, &env); err != nil {
-											continue
-										}
-										list = append(list, env.Name+"="+env.Value)
-
-									case "exec":
-										_ssh_exec(m, shell, []string{"-c", string(request.Payload[4 : request.Payload[3]+4])}, list,
-											channel, func() { channel.Close() })
-									case "shell":
-										_ssh_exec(m, shell, nil, list, f, func() { channel.Close() })
-										go func() { io.Copy(channel, tty) }()
-										go func() { io.Copy(tty, channel) }()
-									}
-									request.Reply(true, nil)
-								}
-							}(channel, requests)
-						}
-					}(c)
-				}
-			}},
 		},
 	}, nil)
 }

base/ssh/ssh.go

@@ -186,6 +186,10 @@ func (f *Frame) alias(m *ice.Message, ls []string) []string {
 func (f *Frame) parse(m *ice.Message, line string) string {
 	for _, one := range kit.Split(line, ";", ";", ";") {
 		m.Log_IMPORT("stdin", one, "length", len(one))
+		async, one := false, strings.TrimSpace(one)
+		if strings.TrimSuffix(one, "&") != one {
+			async, one = true, strings.TrimSuffix(one, "&")
+		}
 
 		ls := kit.Split(one)
 		if m.Option("scan_mode") == "scan" {
@@ -207,6 +211,12 @@ func (f *Frame) parse(m *ice.Message, line string) string {
 			continue
 		}
 
+		if async {
+			m.Debug("async %v", ls)
+			go msg.Cmd(ls[0], ls[1:])
+			continue
+		}
+
 		if strings.HasPrefix(line, "<") {
 			msg.Resultv(line)
 		} else if msg.Cmdy(ls[0], ls[1:]); strings.HasPrefix(msg.Result(), "warn: ") && m.Option("render") == "raw" {