liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt some

Browse Source
This commit is contained in:
harveyshao 2022-08-17 08:41:24 +08:00
parent 9d388114be
commit 37b8b8434d
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base/aaa/sess.go
View File

@ -75,6 +75,9 @@ func SessCreate(m *ice.Message, username string) string {
return m.Option(ice.MSG_SESSID, m.Cmdx(SESS, mdb.CREATE, username))
}
func SessCheck(m *ice.Message, sessid string) bool {
m.Option(ice.MSG_USERROLE, VOID)
m.Option(ice.MSG_USERNAME, "")
m.Option(ice.MSG_USERNICK, "")
return sessid != "" && m.Cmdy(SESS, CHECK, sessid).Option(ice.MSG_USERNAME) != ""
}
func UserLogout(m *ice.Message) {

4
base/tcp/host.go
View File

@ -47,6 +47,10 @@ func _host_list(m *ice.Message, name string) {
}
func _islocalhost(m *ice.Message, ip string) (ok bool) {
if strings.HasPrefix(ip, "[") {
ip = strings.TrimPrefix(ip, "[")
ip = strings.Split(ip, "]")[0]
}
if ip == "::1" || strings.HasPrefix(ip, "127.") {
return true
}

2
base/web/spide.go
View File

@ -85,7 +85,7 @@ func _spide_list(m *ice.Message, arg ...string) {
// 请求日志
if m.Config(LOGHEADERS) == ice.TRUE {
for k, v := range res.Header {
m.Debug("%v: %v", k, v)
m.Logs(mdb.IMPORT, k, v)
}
}
m.Cost(cli.STATUS, res.Status, nfs.SIZE, res.Header.Get(ContentLength), mdb.TYPE, res.Header.Get(ContentType))

1
core/code/xterm.go
View File

@ -30,7 +30,6 @@ func _xterm_get(m *ice.Message, h string, must bool) *os.File {
}
ls := kit.Split(kit.Select("sh", m.Option(mdb.TYPE)))
m.Debug("what %v", kit.Format(ls))
cmd := exec.Command(cli.SystemFind(m, ls[0]), ls[1:]...)
cmd.Env = append(os.Environ(), "TERM=xterm")
m.Option(mdb.HASH, h)

9
misc/ssh/service.go
View File

@ -30,7 +30,7 @@ func _ssh_config(m *ice.Message, h string) *ssh.ServerConfig {
config := &ssh.ServerConfig{
PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
meta, err := _ssh_meta(conn), errors.New(ice.ErrNotRight)
if tcp.IsLocalHost(m, strings.Split(meta[tcp.HOSTPORT], ice.DF)[0]) {
if tcp.IsLocalHost(m, meta[tcp.HOSTPORT]) {
m.Auth(aaa.USERNAME, meta[aaa.USERNAME], tcp.HOSTPORT, meta[tcp.HOSTPORT])
err = nil // 本机用户
} else {
@ -112,7 +112,6 @@ func _ssh_prepare(m *ice.Message, channel ssh.Channel, requests <-chan *ssh.Requ
if err := ssh.Unmarshal(request.Payload, &env); err != nil {
continue
}
m.Debug("what %v", env)
list = append(list, env.Name+"="+env.Value)
case "shell":
@ -165,16 +164,16 @@ func init() {
}
})
}},
tcp.LISTEN: {Name: "listen port=9030 private=.ssh/id_rsa authkey=.ssh/authorized_keys", Help: "添加", Hand: func(m *ice.Message, arg ...string) {
tcp.LISTEN: {Name: "listen port=9022 private=.ssh/id_rsa authkey=.ssh/authorized_keys", Help: "添加", Hand: func(m *ice.Message, arg ...string) {
if mdb.HashSelect(m, m.Option(tcp.PORT)).Length() > 0 {
mdb.HashModify(m, m.Option(tcp.PORT), mdb.STATUS, tcp.OPEN)
} else {
mdb.HashCreate(m, mdb.STATUS, tcp.OPEN, arg)
mdb.HashCreate(m.Spawn(), mdb.STATUS, tcp.OPEN, arg)
m.Cmd("", nfs.LOAD, m.OptionSimple(AUTHKEY))
}
m.Go(func() {
m.Cmdy(tcp.SERVER, tcp.LISTEN, mdb.TYPE, SSH, mdb.NAME, tcp.PORT, m.OptionSimple(tcp.PORT), func(c net.Conn) {
m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, SSH, mdb.NAME, tcp.PORT, m.OptionSimple(tcp.PORT), func(c net.Conn) {
m.Go(func() { _ssh_accept(m, kit.Hashs(m.Option(tcp.PORT)), c) })
})
})

1
misc/vim/favor.go
View File

@ -27,7 +27,6 @@ func init() {
m.Echo("%v\n", m.Option(mdb.ZONE)).Echo("%v:%v:%v:(%v): %v\n",
value[nfs.FILE], value[nfs.LINE], "1", value[mdb.NAME], value[mdb.TEXT])
})
m.Debug("waht %v", m.Result())
}},
FAVOR: {Name: "favor zone id auto", Help: "收藏夹", Actions: ice.MergeActions(ice.Actions{
mdb.INSERT: {Name: "insert zone=数据结构 type name=hi text=hello file line", Help: "添加"},

1
misc/vim/tags.go
View File

@ -51,7 +51,6 @@ func init() {
if value == nil {
return
}
m.Debug("what %v", value)
m.Cmd(TAGS, mdb.INSERT, mdb.ZONE, value[mdb.ZONE], kit.Simple(value))
})
m.ProcessRefresh300ms()

3
misc/wework/bot.go
View File

@ -28,11 +28,9 @@ func init() {
}
aeskey, err := base64.StdEncoding.DecodeString(msg.Append("ekey"))
m.Debug("what %v %v", msg.Append("ekey"), aeskey)
m.Assert(err)
en_msg, err := base64.StdEncoding.DecodeString(m.Option("echostr"))
m.Debug("what %v", en_msg)
m.Assert(err)
block, err := aes.NewCipher(aeskey)
@ -40,7 +38,6 @@ func init() {
mode := cipher.NewCBCDecrypter(block, aeskey[:aes.BlockSize])
mode.CryptBlocks(en_msg, en_msg)
m.Debug("what %v", en_msg)
m.RenderResult(en_msg)
}},
BOT: {Name: "bot name chat text:textarea auto create", Help: "机器人", Actions: ice.MergeActions(ice.Actions{