diff --git a/etc/init.shy b/etc/init.shy index 77bddea2..1d90d4dc 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -1,5 +1,4 @@ login root root - source etc/local.shy ~file1 diff --git a/src/contexts/aaa/aaa.go b/src/contexts/aaa/aaa.go index ebd7cb0b..1cc7310c 100644 --- a/src/contexts/aaa/aaa.go +++ b/src/contexts/aaa/aaa.go @@ -83,12 +83,10 @@ func (aaa *AAA) Spawn(m *ctx.Message, c *ctx.Context, arg ...string) ctx.Server } if m.Has("pub") { s.public = m.Optionv("public").(*rsa.PublicKey) - m.Log("fuck", "public %v", s.public) } if m.Has("key") { s.private = m.Optionv("private").(*rsa.PrivateKey) s.public = &s.private.PublicKey - m.Log("fuck", "public %v", s.public) } @@ -194,7 +192,6 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", m.Optionv("private", private) } - m.Log("fuck", "stream %s", stream) if stream != "" { m.Start(m.Confx("aaa_name"), m.Confx("aaa_help"), arg[0], "", aaa.Session(arg[0])) m.Cap("stream", stream) @@ -244,7 +241,6 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", m.Travel(func(m *ctx.Message, line int) bool { if line > 0 && m.Cap("username") == arg[0] { if m.Cap("password") == aaa.Password(arg[1]) { - m.Log("fuck", "%v", m.Format()) m.Sess("aaa", m.Target()) m.Echo(m.Cap("sessid")) } else { @@ -442,7 +438,6 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", b := make([]byte, bsize) copy(b, content[pos:end]) - m.Log("fuck", "pos: %d end: %d", pos, end) aaa.encrypt.CryptBlocks(buf[pos:pos+bsize], b) } @@ -466,7 +461,6 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", content, arg = []byte(arg[0]), arg[1:] } - m.Log("fuck", "why %v", content) buf := make([]byte, 1024) n, e := base64.StdEncoding.Decode(buf, content) m.Assert(e) diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index 316a2866..86872b97 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -203,7 +203,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", // }}} }}, "cli_help": &ctx.Config{Name: "cli_help", Value: "shell", Help: "模块文档"}, - "cmd_timeout": &ctx.Config{Name: "cmd_timeout", Value: "10s", Help: "系统命令超时"}, + "cmd_timeout": &ctx.Config{Name: "cmd_timeout", Value: "60s", Help: "系统命令超时"}, "time_format": &ctx.Config{Name: "time_format", Value: "2006-01-02 15:04:05", Help: "时间格式"}, "time_unit": &ctx.Config{Name: "time_unit", Value: "1000", Help: "时间倍数"}, diff --git a/src/contexts/ctx.go b/src/contexts/ctx.go index 78782834..35c6ddec 100644 --- a/src/contexts/ctx.go +++ b/src/contexts/ctx.go @@ -1934,10 +1934,11 @@ var CGI = template.FuncMap{ } return "" }, // }}} - "msg": func(arg ...interface{}) string { // {{{ + "msg": func(arg ...interface{}) interface{} { // {{{ if len(arg) == 0 { return "" } + if m, ok := arg[0].(*Message); ok { if len(arg) == 1 { return fmt.Sprintf("%v", m.Format()) @@ -1946,8 +1947,10 @@ var CGI = template.FuncMap{ switch which := arg[1].(type) { case string: switch which { + case "spawn": + return m.Spawn() case "code": - return fmt.Sprintf("%d", m.code) + return m.code case "time": return m.time.Format("2006-01-02 15:04:05") case "source": @@ -1955,21 +1958,22 @@ var CGI = template.FuncMap{ case "target": return m.target.Name case "message": - return fmt.Sprintf("%d", m.message.code) + return m.message case "messages": - msg := []string{} - for _, v := range m.messages { - msg = append(msg, fmt.Sprintf("%d", v.code)) - } - return strings.Join(msg, " ") + return m.messages case "sessions": - msg := []string{} - for k, _ := range m.Sessions { - msg = append(msg, fmt.Sprintf("%s", k)) - } - return strings.Join(msg, " ") + return m.Sessions + default: + return m.Sess(which) } case int: + ms := []*Message{m} + for i := 0; i < len(ms); i++ { + if ms[i].code == which { + return ms[i] + } + ms = append(ms, ms[i].messages...) + } } } return "" @@ -2011,7 +2015,6 @@ var CGI = template.FuncMap{ } if m, ok := arg[0].(*Message); ok { - if len(arg) == 1 { list := []string{} for k, _ := range m.target.Configs { @@ -3175,14 +3178,18 @@ var Index = &Context{Name: "ctx", Help: "模块中心", "right": &Command{ Name: "right [share|add|del group [cache|config|command item]]", Help: "用户组管理，查看、添加、删除用户组或是接口", + Form: map[string]int{"target": 1}, Hand: func(m *Message, c *Context, key string, arg ...string) { - index := m.target.Index // {{{ + owner := m.target // {{{ + if m.Has("target") { + owner = m.Find(m.Option("target")).target + } + index := owner.Index if index == nil { index = map[string]*Context{} - m.target.Index = index + owner.Index = index } - owner := m.target aaa := m.Sess("aaa", false) if aaa.Cap("username") != aaa.Conf("rootname") { owner = index[aaa.Cap("username")] @@ -3268,7 +3275,9 @@ var Index = &Context{Name: "ctx", Help: "模块中心", return } case "command": + m.Log("fuck", "what %v %v", share.Name, arg[2]) if x, ok := share.Commands[arg[2]]; ok { + m.Log("fuck", "what") if len(arg) == 3 { m.Echo("ok") break @@ -3292,6 +3301,7 @@ var Index = &Context{Name: "ctx", Help: "模块中心", } m.Echo("ok") } + m.Log("fuck", "what") } case "add": switch arg[1] { diff --git a/src/contexts/log/log.go b/src/contexts/log/log.go index 1a64b4ec..075f9482 100644 --- a/src/contexts/log/log.go +++ b/src/contexts/log/log.go @@ -38,6 +38,7 @@ func (log *LOG) Begin(m *ctx.Message, arg ...string) ctx.Server { // {{{ func (log *LOG) Start(m *ctx.Message, arg ...string) bool { // {{{ log.nfs = m.Sess("nfs").Cmd("append", m.Confx("bench.log", arg, 0), "", "日志文件") log.out = log.nfs.Optionv("out").(*os.File) + fmt.Fprintln(log.out, "\n\n") return false } @@ -58,7 +59,7 @@ var Index = &ctx.Context{Name: "log", Help: "日志中心", "nlog": &ctx.Cache{Name: "nlog", Value: "0", Help: "日志屏蔽类型"}, }, Configs: map[string]*ctx.Config{ - "silent": &ctx.Config{Name: "silent", Value: map[string]interface{}{}, Help: "日志屏蔽类型"}, + "silent": &ctx.Config{Name: "silent", Value: map[string]interface{}{"cb": true}, Help: "日志屏蔽类型"}, "module": &ctx.Config{Name: "module", Value: map[string]interface{}{ "log": map[string]interface{}{"cmd": true}, "lex": map[string]interface{}{"cmd": true, "debug": true}, diff --git a/src/contexts/web/web.go b/src/contexts/web/web.go index bd71f664..cc28da0e 100644 --- a/src/contexts/web/web.go +++ b/src/contexts/web/web.go @@ -15,7 +15,6 @@ import ( // {{{ "path" "bytes" - "mime" "mime/multipart" "path/filepath" @@ -336,6 +335,16 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", "template": "append", "title": "", }, }, + "notice": []interface{}{ + map[string]interface{}{ + "template": "notice", "title": "notice", + }, + }, + "login": []interface{}{ + map[string]interface{}{ + "template": "login", "title": "login", + }, + }, }, Help: "资源列表"}, }, Commands: map[string]*ctx.Command{ @@ -603,90 +612,41 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", // }}} }}, "/index": &ctx.Command{Name: "/index", Help: "网页门户", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { - r := m.Optionv("request").(*http.Request) + r := m.Optionv("request").(*http.Request) // {{{ w := m.Optionv("response").(http.ResponseWriter) - login := m.Spawn().Cmd("/login") - if login.Has("template") { - m.Copy(login, "append") - return - } - - aaa := login.Appendv("aaa").(*ctx.Message) - list := m.Confv("index", aaa.Cap("username")) - if list == nil { - m.Echo("no right, please contact manager") - m.Append("template", "result") - return - } + //执行命令 if m.Options("details") { - if !ctx.Right(m.Find(m.Option("module")).Cmd("right", aaa.Cap("username"), "check", "command", m.Option("details")).Result(0)) { - m.Echo("no right, please contact manager") - m.Append("template", "result") + if check := m.Spawn().Cmd("/check", "target", m.Option("module"), "command", m.Option("details")); !check.Results(0) { + m.Copy(check, "append") return } + msg := m.Find(m.Option("module")).Cmd(m.Option("details")) m.Copy(msg, "result").Copy(msg, "append") return } + //权限检查 dir := path.Join(m.Cap("directory"), m.Option("dir")) + check := m.Spawn(c).Cmd("/check", "command", "/index", "dir", dir) + if !check.Results(0) { + m.Copy(check, "append") + return + } + + //下载文件 if s, e := os.Stat(dir); e == nil && m.Option("dir") != "" && !s.IsDir() { - w.Header().Set("Content-type", mime.TypeByExtension(dir)) http.ServeFile(w, r, dir) return } - if !ctx.Right(m.Spawn(c).Cmd("right", aaa.Cap("username"), "check", "command", "/index", "dir", dir).Result(0)) { - m.Echo("no right, please contact manager") - m.Append("template", "result") - return - } - + //浏览目录 + aaa := check.Appendv("aaa").(*ctx.Message) + m.Append("template", aaa.Cap("username")) + m.Option("title", "index") m.Option("dir", dir) - w.Header().Add("Content-Type", "text/html") - tpl := template.New("render").Funcs(ctx.CGI) - tpl = template.Must(tpl.ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("common_tmpl")))) - tpl = template.Must(tpl.ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("upload_tmpl")))) - - replace := [][]byte{ - []byte{27, 91, 51, 50, 109}, []byte(""), - []byte{27, 91, 51, 49, 109}, []byte(""), - []byte{27, 91, 109}, []byte(""), - } - - for _, v := range list.([]interface{}) { - val := v.(map[string]interface{}) - if _, ok := val["detail"]; ok { - detail := val["detail"].([]interface{}) - msg := m.Spawn().Add("detail", detail[0].(string), detail[1:]) - msg.Option("title", val["title"]) - msg.Option("module", val["module"]) - m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), msg)) - continue - } - if _, ok := val["module"]; ok { - if _, ok := val["command"]; ok { - msg := m.Find(val["module"].(string)).Cmd(val["command"], val["argument"]) - for i, v := range msg.Meta["result"] { - b := []byte(v) - for i := 0; i < len(replace)-1; i += 2 { - b = bytes.Replace(b, replace[i], replace[i+1], -1) - } - msg.Meta["result"][i] = string(b) - } - if msg.Option("title", val["title"]) == "" { - msg.Option("title", m.Option("dir")) - } - m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), msg)) - continue - } - } - - if _, ok := val["template"]; ok { - m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), m)) - } - } + // }}} }}, "/travel": &ctx.Command{Name: "/travel", Help: "文件上传", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { // r := m.Optionv("request").(*http.Request) // {{{ @@ -975,15 +935,15 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", // }}} }}, "/check": &ctx.Command{Name: "/check cache|config|command name args", Help: "权限检查, cache|config|command: 接口类型, name: 接口名称, args: 其它参数", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { - w := m.Optionv("response").(http.ResponseWriter) //{{{ + // w := m.Optionv("response").(http.ResponseWriter) //{{{ if login := m.Spawn().Cmd("/login"); login.Has("redirect") { aaa := m.Appendv("aaa").(*ctx.Message) if msg := m.Spawn().Cmd("right", aaa.Cap("username"), "check", arg); msg.Results(0) { m.Copy(login, "append").Echo(msg.Result(0)) return } - w.WriteHeader(http.StatusForbidden) - m.Append("message", "please contact manager") + // w.WriteHeader(http.StatusForbidden) + m.Append("message", "no right, please contact manager") m.Echo("no") return } else { @@ -1012,20 +972,58 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", } w.WriteHeader(http.StatusUnauthorized) - m.Append("template", "login.html") + m.Append("template", "login") // }}} }}, - "/render": &ctx.Command{Name: "/render [main [tmpl]]", Help: "模板响应, main: 模板入口, tmpl: 附加模板", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { + "/render": &ctx.Command{Name: "/render index", Help: "模板响应, main: 模板入口, tmpl: 附加模板", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { w := m.Optionv("response").(http.ResponseWriter) // {{{ w.Header().Add("Content-Type", "text/html") tpl := template.New("render").Funcs(ctx.CGI) tpl = template.Must(tpl.ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("common_tmpl")))) - if len(arg) > 1 { - tpl = template.Must(tpl.ParseGlob(path.Join(m.Conf("template_dir"), arg[1]))) + tpl = template.Must(tpl.ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("upload_tmpl")))) + + replace := [][]byte{ + []byte{27, 91, 51, 50, 109}, []byte(""), + []byte{27, 91, 51, 49, 109}, []byte(""), + []byte{27, 91, 109}, []byte(""), } - m.Assert(tpl.ExecuteTemplate(w, m.Confx("common_main", arg, 0), m.Message())) + m.Assert(tpl.ExecuteTemplate(w, "head", m)) + for _, v := range m.Confv("index", arg[0]).([]interface{}) { + val := v.(map[string]interface{}) + //命令模板 + if detail, ok := val["detail"].([]interface{}); ok { + msg := m.Spawn().Add("detail", detail[0].(string), detail[1:]) + msg.Option("module", val["module"]) + msg.Option("title", val["title"]) + m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), msg)) + continue + } + + //执行命令 + if _, ok := val["command"]; ok { + msg := m.Find(val["module"].(string)).Cmd(val["command"], val["argument"]) + for i, v := range msg.Meta["result"] { + b := []byte(v) + for i := 0; i < len(replace)-1; i += 2 { + b = bytes.Replace(b, replace[i], replace[i+1], -1) + } + msg.Meta["result"][i] = string(b) + } + if msg.Option("title", val["title"]) == "" { + msg.Option("title", m.Option("dir")) + } + m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), msg)) + continue + } + + //解析模板 + if _, ok := val["template"]; ok { + m.Assert(tpl.ExecuteTemplate(w, val["template"].(string), m)) + } + } + m.Assert(tpl.ExecuteTemplate(w, "tail", m)) // }}} }}, "/json": &ctx.Command{Name: "/json", Help: "json响应", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) { diff --git a/usr/template/common/base.html b/usr/template/common/base.html index 52f37a8a..54d052f4 100644 --- a/usr/template/common/base.html +++ b/usr/template/common/base.html @@ -2,7 +2,7 @@ -{{meta .title}} +{{option .Meta "title"}} + {{end}} {{define "main"}} @@ -119,6 +106,6 @@ welcome to context world! {{end}} {{define "tail"}} - + {{end}} diff --git a/usr/template/common/login.html b/usr/template/common/login.html index a8a570da..bf8c1830 100644 --- a/usr/template/common/login.html +++ b/usr/template/common/login.html @@ -1,7 +1,7 @@ {{define "login"}}
login
- +