diff --git a/base/log/log.go b/base/log/log.go index c12fcb94..e7e3fc33 100644 --- a/base/log/log.go +++ b/base/log/log.go @@ -3,7 +3,6 @@ package log import ( "bufio" "fmt" - "os" "path" "strings" @@ -15,12 +14,17 @@ import ( "shylinux.com/x/toolkits/logs" ) -type Log struct{ p, l, s string } +type Log struct { + c bool + p, l, s string +} type Frame struct{ p chan *Log } func (f *Frame) Begin(m *ice.Message, arg ...string) { f.p = make(chan *Log, ice.MOD_BUFS) - ice.Info.Log = func(m *ice.Message, p, l, s string) { f.p <- &Log{p: p, l: l, s: s} } + ice.Info.Log = func(m *ice.Message, p, l, s string) { + f.p <- &Log{c: m.Option(ice.LOG_DEBUG) == ice.TRUE, p: p, l: l, s: s} + } } func (f *Frame) Start(m *ice.Message, arg ...string) { mdb.Confm(m, FILE, nil, func(k string, v ice.Map) { @@ -47,8 +51,8 @@ func (f *Frame) Start(m *ice.Message, arg ...string) { defer fmt.Fprintln(bio) fmt.Fprint(bio, l.p, lex.SP) view := mdb.Confm(m, VIEW, m.Conf(SHOW, kit.Keys(l.l, VIEW))) - kit.If(ice.Info.Colors, func() { bio.WriteString(kit.Format(view[PREFIX])) }) - defer kit.If(ice.Info.Colors, func() { bio.WriteString(kit.Format(view[SUFFIX])) }) + kit.If(ice.Info.Colors || l.c, func() { bio.WriteString(kit.Format(view[PREFIX])) }) + defer kit.If(ice.Info.Colors || l.c, func() { bio.WriteString(kit.Format(view[SUFFIX])) }) fmt.Fprint(bio, l.l, lex.SP, l.s) }) } @@ -60,8 +64,9 @@ func (f *Frame) Close(m *ice.Message, arg ...string) { } const ( - PREFIX = "prefix" - SUFFIX = "suffix" + PREFIX = "prefix" + SUFFIX = "suffix" + TRACEID = "traceid" ) const ( GREEN = "green" @@ -106,13 +111,9 @@ var Index = &ice.Context{Name: LOG, Help: "日志模块", Configs: ice.Configs{ func init() { ice.Index.Register(Index, &Frame{}, TAIL) } -const ( - LOG_TRACE = "log_trace" -) - func Traceid() (traceid string) { ls := []string{} - kit.For(kit.Split(os.Getenv(LOG_TRACE)), func(key string) { + kit.For(kit.Split(ice.Info.Traceid), func(key string) { switch key { case "short": ls = append(ls, kit.Hashs(mdb.UNIQ)[:6]) diff --git a/base/web/serve.go b/base/web/serve.go index 1af3b122..a4ad0d9b 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -200,19 +200,20 @@ func init() { mdb.Config(m, ice.MAIN, CHAT_CMD+m.Option(ctx.INDEX)+nfs.PS) } }}, + log.TRACEID: {Help: "日志", Hand: func(m *ice.Message, arg ...string) { + kit.If(len(arg) > 0, func() { ice.Info.Traceid = arg[0] }) + m.Echo(ice.Info.Traceid) + }}, tcp.HOST: {Help: "公网", Hand: func(m *ice.Message, arg ...string) { m.Echo(kit.Formats(PublicIP(m))) }}, cli.DARK: {Help: "主题", Hand: func(m *ice.Message, arg ...string) { - if tcp.IsLocalHost(m, m.Option(ice.MSG_USERIP)) { + kit.If(tcp.IsLocalHost(m, m.Option(ice.MSG_USERIP)), func() { m.Cmd(cli.SYSTEM, "osascript", "-e", `tell app "System Events" to tell appearance preferences to set dark mode to not dark mode`) - } + }) }}, cli.SYSTEM: {Help: "系统", Hand: func(m *ice.Message, arg ...string) { cli.Opens(m, "System Settings.app") }}, - cli.START: {Name: "start dev proto host port=9020 nodename username usernick", Hand: func(m *ice.Message, arg ...string) { - _serve_start(m) - }}, + cli.START: {Name: "start dev proto host port=9020 nodename username usernick", Hand: func(m *ice.Message, arg ...string) { _serve_start(m) }}, SERVE_START: {Hand: func(m *ice.Message, arg ...string) { m.Go(func() { - m.Option(ice.MSG_USERIP, "127.0.0.1") ssh.PrintQRCode(m, tcp.PublishLocalhost(m, _serve_address(m))) cli.Opens(m, mdb.Config(m, cli.OPEN)) }) diff --git a/base/web/space.go b/base/web/space.go index 52f0fa4d..68873f4c 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -37,7 +37,7 @@ func _space_dial(m *ice.Message, dev, name string, arg ...string) { a, b, c := kit.Int(redial["a"]), kit.Int(redial["b"]), kit.Int(redial["c"]) for i := 1; i < c; i++ { next := time.Duration(rand.Intn(a*(i+1))+b*i) * time.Millisecond - m.Spawn().Cmd(tcp.CLIENT, tcp.DIAL, args, func(c net.Conn) { + m.Cmd(tcp.CLIENT, tcp.DIAL, args, func(c net.Conn) { if c, e := websocket.NewClient(c, u); !m.Warn(e, tcp.DIAL, dev, SPACE, u.String()) { defer mdb.HashCreateDeferRemove(m, kit.SimpleKV("", MASTER, dev, u.Host), kit.Dict(mdb.TARGET, c))() kit.If(ice.Info.Colors, func() { once.Do(func() { m.Go(func() { _space_qrcode(m, dev) }) }) }) diff --git a/base/web/web.go b/base/web/web.go index cc98ece0..963bcc49 100644 --- a/base/web/web.go +++ b/base/web/web.go @@ -59,7 +59,7 @@ func (f *Frame) Start(m *ice.Message, arg ...string) { case func(http.Handler): cb(f) default: - m.Spawn().Cmdy(tcp.SERVER, tcp.LISTEN, mdb.TYPE, HTTP, mdb.NAME, logs.FileLine(1), m.OptionSimple(tcp.HOST, tcp.PORT), func(l net.Listener) { + m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, HTTP, mdb.NAME, logs.FileLine(1), m.OptionSimple(tcp.HOST, tcp.PORT), func(l net.Listener) { defer mdb.HashCreateDeferRemove(m, m.OptionSimple(mdb.NAME, tcp.PROTO), arg, cli.STATUS, tcp.START)() gdb.Event(m, SERVE_START, arg) m.Warn(f.Server.Serve(l)) diff --git a/conf.go b/conf.go index 1691e1af..7fd759cc 100644 --- a/conf.go +++ b/conf.go @@ -371,3 +371,6 @@ const ( // ice CLI = "cli" LOG = "log" ) +const ( // env + LOG_TRACE = "log_trace" +) diff --git a/exec.go b/exec.go index 8567530e..4472c750 100644 --- a/exec.go +++ b/exec.go @@ -171,7 +171,11 @@ func (m *Message) _command(arg ...Any) *Message { } else if cmd, ok := m.source.Commands[strings.TrimPrefix(list[0], m.source.Prefix()+PT)]; ok { run(m.Spawn(m.source), m.source, cmd, list[0], list[1:]...) } else { - m.Search(list[0], func(p *Context, s *Context, key string, cmd *Command) { run(m.Spawn(s), s, cmd, key, list[1:]...) }) + _target, _key := m.target, m._key + m.Search(list[0], func(p *Context, s *Context, key string, cmd *Command) { + m.target, m._key = _target, _key + run(m.Spawn(s), s, cmd, key, list[1:]...) + }) } m.Warn(!ok, ErrNotFound, kit.Format(list)) return m diff --git a/info.go b/info.go index c73749b2..d4fa126e 100644 --- a/info.go +++ b/info.go @@ -2,6 +2,7 @@ package ice import ( "io" + "os" "reflect" "strings" @@ -54,6 +55,7 @@ var Info = struct { Hostname string Pathname string PidPath string + Traceid string Colors bool System string @@ -98,6 +100,9 @@ var Info = struct { Log: func(m *Message, p, l, s string) {}, } +func init() { + Info.Traceid = os.Getenv(LOG_TRACE) +} func AddMergeAction(h ...Any) { Info.merges = append(Info.merges, h...) } diff --git a/misc/ssh/channel.go b/misc/ssh/channel.go index 9baaf567..5c353cee 100644 --- a/misc/ssh/channel.go +++ b/misc/ssh/channel.go @@ -55,7 +55,7 @@ func init() { } }}, mdb.REPEAT: {Help: "执行", Hand: func(m *ice.Message, arg ...string) { m.Cmdy("", ctx.COMMAND, CMD, m.Option(mdb.TEXT)) }}, - }, mdb.HashAction(mdb.FIELD, "time,hash,status,tty,count,username,hostport", mdb.FIELDS, "time,id,type,text")), Hand: func(m *ice.Message, arg ...string) { + }, mdb.StatusHashAction(mdb.FIELD, "time,hash,status,tty,count,username,hostport", mdb.FIELDS, "time,id,type,text")), Hand: func(m *ice.Message, arg ...string) { if mdb.ZoneSelect(m, arg...); len(arg) == 0 { m.Table(func(value ice.Maps) { m.PushButton(kit.Select("", ctx.COMMAND, value[mdb.STATUS] == tcp.OPEN), mdb.REMOVE) diff --git a/misc/ssh/connect.go b/misc/ssh/connect.go index 9cb53dba..bed64ada 100644 --- a/misc/ssh/connect.go +++ b/misc/ssh/connect.go @@ -113,14 +113,12 @@ func _ssh_conn(m *ice.Message, cb func(*ssh.Client), arg ...string) { } return })) - m.Cmdy(tcp.CLIENT, tcp.DIAL, mdb.TYPE, SSH, mdb.NAME, m.Option(tcp.HOST), m.OptionSimple(tcp.HOST, tcp.PORT), arg, func(c net.Conn) { + m.Cmd(tcp.CLIENT, tcp.DIAL, mdb.TYPE, SSH, mdb.NAME, m.Option(tcp.HOST), m.OptionSimple(tcp.HOST, tcp.PORT), arg, func(c net.Conn) { conn, chans, reqs, err := ssh.NewClientConn(c, m.Option(tcp.HOST)+nfs.DF+m.Option(tcp.PORT), &ssh.ClientConfig{ User: m.Option(aaa.USERNAME), Auth: methods, BannerCallback: func(message string) error { return nil }, HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error { return nil }, }) - if !m.Warn(err) { - cb(ssh.NewClient(conn, chans, reqs)) - } + kit.If(!m.Warn(err), func() { cb(ssh.NewClient(conn, chans, reqs)) }) }) } func _ssh_hold(m *ice.Message, c *ssh.Client) { diff --git a/misc/ssh/service.go b/misc/ssh/service.go index ff6878f9..2b836c01 100644 --- a/misc/ssh/service.go +++ b/misc/ssh/service.go @@ -38,14 +38,14 @@ func _ssh_config(m *ice.Message, h string) *ssh.ServerConfig { err = nil } else { mdb.ZoneSelectCB(m, h, func(value ice.Maps) { - if !strings.HasPrefix(value[mdb.NAME], meta[aaa.USERNAME]+"@") { + if !strings.HasPrefix(value[mdb.NAME], meta[aaa.USERNAME]+mdb.AT) { return } if s, e := base64.StdEncoding.DecodeString(value[mdb.TEXT]); !m.Warn(e, ice.ErrNotValid, value[mdb.TEXT]) { if pub, e := ssh.ParsePublicKey([]byte(s)); !m.Warn(e, ice.ErrNotValid, value[mdb.TEXT]) { if bytes.Compare(pub.Marshal(), key.Marshal()) == 0 { - meta[tcp.HOSTNAME] = kit.Select("", kit.Split(value[mdb.NAME], "@"), 1) - m.Auth(kit.SimpleKV(kit.Fields(aaa.USERNAME, tcp.HOSTPORT, tcp.HOSTNAME), meta)) + meta[tcp.HOSTNAME] = kit.Select("", kit.Split(value[mdb.NAME], mdb.AT), 1) + m.Auth(kit.SimpleKV(kit.Fields(aaa.USERNAME, tcp.HOSTNAME, tcp.HOSTPORT), meta)) err = nil } } @@ -69,8 +69,8 @@ func _ssh_config(m *ice.Message, h string) *ssh.ServerConfig { return config } -func _ssh_accept(m *ice.Message, h string, c net.Conn) { - conn, chans, reqs, err := ssh.NewServerConn(c, _ssh_config(m, h)) +func _ssh_accept(m *ice.Message, c net.Conn, conf *ssh.ServerConfig) { + conn, chans, reqs, err := ssh.NewServerConn(c, conf) if m.Warn(err) { return } @@ -93,32 +93,32 @@ func _ssh_prepare(m *ice.Message, channel ssh.Channel, requests <-chan *ssh.Requ return } defer tty.Close() - list := kit.EnvSimple(cli.PATH) - for request := range requests { - m.Logs(REQUEST, m.OptionSimple(tcp.HOSTPORT), mdb.TYPE, request.Type) - switch request.Type { + list := kit.EnvSimple(cli.PATH, cli.HOME) + for req := range requests { + m.Logs(REQUEST, m.OptionSimple(tcp.HOSTPORT), mdb.TYPE, req.Type, string(req.Payload)) + switch req.Type { case "pty-req": - termLen := request.Payload[3] - termEnv := string(request.Payload[4 : termLen+4]) - _ssh_size(pty.Fd(), request.Payload[termLen+4:]) + termLen := req.Payload[3] + termEnv := string(req.Payload[4 : termLen+4]) + _ssh_size(pty.Fd(), req.Payload[termLen+4:]) list = append(list, cli.TERM, termEnv) - case "window-change": - _ssh_size(pty.Fd(), request.Payload) case "env": var env struct{ Name, Value string } - if err := ssh.Unmarshal(request.Payload, &env); err != nil { + if err := ssh.Unmarshal(req.Payload, &env); err != nil { continue } list = append(list, env.Name, env.Value) - case "shell": - _ssh_handle(m, channel, pty, tty, list) case "exec": defer channel.Close() m.Options(cli.CMD_OUTPUT, channel, cli.CMD_ENV, list) - m.Cmd(cli.SYSTEM, kit.Select("sh", kit.Env(cli.SHELL)), "-c", string(request.Payload[4:request.Payload[3]+4])) + m.Cmd(cli.SYSTEM, kit.Select("sh", kit.Env(cli.SHELL)), "-c", string(req.Payload[4:req.Payload[3]+4])) return + case "shell": + _ssh_handle(m, channel, pty, tty, list) + case "window-change": + _ssh_size(pty.Fd(), req.Payload) } - request.Reply(true, nil) + req.Reply(true, nil) } } func _ssh_handle(m *ice.Message, channel ssh.Channel, pty, tty *os.File, list []string) { @@ -126,7 +126,7 @@ func _ssh_handle(m *ice.Message, channel ssh.Channel, pty, tty *os.File, list [] p := _ssh_watch(m, h, pty, channel) m.Go(func() { io.Copy(channel, pty) }) channel.Write([]byte(mdb.Config(m, WELCOME))) - m.Options(cli.CMD_INPUT, tty, cli.CMD_OUTPUT, tty) + m.Options(cli.CMD_INPUT, tty, cli.CMD_OUTPUT, tty, cli.CMD_ENV, list) m.Cmd(cli.DAEMON, kit.Select("sh", kit.Env(cli.SHELL)), func() { defer m.Cmd(mdb.MODIFY, m.Prefix(CHANNEL), "", mdb.HASH, mdb.HASH, h, mdb.STATUS, tcp.CLOSE) channel.Write([]byte(mdb.Config(m, GOODBYE))) @@ -162,24 +162,25 @@ func init() { } m.Go(func() { m.Cmd(web.BROAD, "send", mdb.TYPE, "sshd", mdb.NAME, ice.Info.Hostname, tcp.HOST, m.Cmd(tcp.HOST).Append(aaa.IP), tcp.PORT, m.Option(tcp.PORT)) - m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, SSH, mdb.NAME, m.Option(tcp.PORT), m.OptionSimple(tcp.PORT), func(c net.Conn) { - if _c := tcp.NewPeekConn(c); _c.IsHTTP() { - _c.Redirect(http.StatusTemporaryRedirect, m.Cmdx(web.SPACE, web.DOMAIN)) + conf := _ssh_config(m, kit.Hashs(m.Option(tcp.PORT))) + m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, SSH, mdb.NAME, m.Option(tcp.PORT), m.OptionSimple(tcp.PORT), func(_c net.Conn) { + if c := tcp.NewPeekConn(_c); c.IsHTTP() { + c.Redirect(http.StatusTemporaryRedirect, m.Cmdx(web.SPACE, web.DOMAIN)) } else { - m.Go(func() { _ssh_accept(m, kit.Hashs(m.Option(tcp.PORT)), _c) }) + m.Go(func() { _ssh_accept(m, c, conf) }) } }) }) }}, - mdb.INSERT: {Name: "insert text:textarea", Help: "添加", Hand: func(m *ice.Message, arg ...string) { - if ls := kit.Split(m.Option(mdb.TEXT)); len(ls) > 2 { + mdb.INSERT: {Name: "insert pubkey:textarea", Hand: func(m *ice.Message, arg ...string) { + if ls := kit.Split(m.Option("pubkey")); len(ls) > 2 { mdb.ZoneInsert(m, m.OptionSimple(tcp.PORT), mdb.TYPE, ls[0], mdb.NAME, ls[len(ls)-1], mdb.TEXT, strings.Join(ls[1:len(ls)-1], "+")) } }}, - ctx.LOAD: {Name: "load authkey=.ssh/authorized_keys", Help: "加载", Hand: func(m *ice.Message, arg ...string) { + ctx.LOAD: {Name: "load authkey=.ssh/authorized_keys", Hand: func(m *ice.Message, arg ...string) { m.Cmd(nfs.CAT, kit.HomePath(m.Option(AUTHKEY)), func(pub string) { m.Cmd(SERVICE, mdb.INSERT, mdb.TEXT, pub) }) }}, - ctx.SAVE: {Name: "save authkey=.ssh/authorized_keys", Help: "保存", Hand: func(m *ice.Message, arg ...string) { + ctx.SAVE: {Name: "save authkey=.ssh/authorized_keys", Hand: func(m *ice.Message, arg ...string) { list := []string{} mdb.ZoneSelectCB(m, m.Option(tcp.PORT), func(value ice.Maps) { list = append(list, fmt.Sprintf("%s %s %s", value[mdb.TYPE], value[mdb.TEXT], value[mdb.NAME])) @@ -191,6 +192,8 @@ func init() { aaa.INVITE: {Help: "邀请", Hand: func(m *ice.Message, arg ...string) { m.Option(cli.HOSTNAME, tcp.PublishLocalhost(m, web.UserWeb(m).Hostname())) m.EchoScript(kit.Renders(`ssh -p {{.Option "port"}} {{.Option "user.name"}}@{{.Option "hostname"}}`, m)) + m.EchoScript(kit.Renders(`ssh-copy-id -p {{.Option "port"}} {{.Option "user.name"}}@{{.Option "hostname"}}`, m)) + m.ProcessInner() }}, }, mdb.StatusHashAction( mdb.SHORT, tcp.PORT, mdb.FIELD, "time,port,status,private,authkey,count", mdb.FIELDS, "time,id,type,name,text", diff --git a/type.go b/type.go index 918d0171..3b220e81 100644 --- a/type.go +++ b/type.go @@ -356,9 +356,9 @@ func (m *Message) Search(key string, cb Any) *Message { if cmd, ok := s.Commands[key]; ok { func() { _target, _key := m.target, m._key + defer func() { m.target, m._key = _target, _key }() m.target, m._key = s, key cb(s.context, s, key, cmd) - m.target, m._key = _target, _key }() return m }