diff --git a/base/web/space.go b/base/web/space.go index fd0cebdf..61bf4844 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -56,6 +56,10 @@ func _space_fork(m *ice.Message) { !(IsLocalHost(m) || m.Option(TOKEN) != "" && m.Cmdv(TOKEN, m.Option(TOKEN), mdb.TIME) > m.Time()) { name, text = kit.Hashs(name), kit.Select(addr, m.Option(mdb.NAME), m.Option(mdb.TEXT)) } + if m.Option(TOKEN) != "" { + msg := m.Cmd(TOKEN, m.Option(TOKEN)) + aaa.SessAuth(m, kit.Dict(m.Cmd(aaa.USER, m.Option(ice.MSG_USERNAME, msg.Append(mdb.NAME))).AppendSimple())) + } if m.Option(mdb.TYPE) == WORKER { if p := nfs.USR_LOCAL_WORK + m.Option(mdb.NAME); nfs.Exists(m, p) { text = p diff --git a/base/web/token.go b/base/web/token.go index bc1aeb66..717bd770 100644 --- a/base/web/token.go +++ b/base/web/token.go @@ -10,7 +10,6 @@ import ( "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" "shylinux.com/x/icebergs/base/tcp" - "shylinux.com/x/icebergs/base/web/html" kit "shylinux.com/x/toolkits" ) @@ -27,13 +26,13 @@ func init() { Index.MergeCommands(ice.Commands{ TOKEN: {Help: "令牌", Actions: ice.MergeActions(ice.Actions{ GEN: {Hand: func(m *ice.Message, arg ...string) { - m.Echo("请授权 %s 代码权限\n", m.Option(tcp.HOST)).EchoButton(CONFIRM) + m.Echo("请授权 %s %s 代码权限\n", m.Option(tcp.HOST), m.Option(mdb.TYPE)).EchoButton(CONFIRM) }}, CONFIRM: {Hand: func(m *ice.Message, arg ...string) { if m.Warn(m.R.Method != http.MethodPost, ice.ErrNotAllow) { return } - msg := m.Cmd("", mdb.CREATE, mdb.TYPE, html.Basic, mdb.NAME, m.Option(ice.MSG_USERNAME), mdb.TEXT, m.Option(tcp.HOST)) + msg := m.Cmd("", mdb.CREATE, mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, m.Option(ice.MSG_USERNAME), mdb.TEXT, m.Option(tcp.HOST)) m.ProcessReplace(kit.MergeURL2(m.Option(tcp.HOST), ChatCmdPath(m, m.PrefixKey(), SET), TOKEN, strings.Replace(UserHost(m), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), msg.Result()), 1))) }},