x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-05-06 13:17:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2023-03-20 10:25:59 +08:00
parent be89a05922
commit 793d158479
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/web/render.go
View File

@ -46,6 +46,7 @@ func Render(m *ice.Message, cmd string, args ...ice.Any) bool {
if cmd != "" && cmd != ice.RENDER_DOWNLOAD { if cmd != "" && cmd != ice.RENDER_DOWNLOAD {
defer func() { m.Logs("Render", cmd, args) }() defer func() { m.Logs("Render", cmd, args) }()
} }
m.W.Header().Add("Access-Control-Allow-Origin", "http://localhost:9020")
switch cmd { switch cmd {
case COOKIE: // value [name [path [expire]]] case COOKIE: // value [name [path [expire]]]
RenderCookie(m, arg[0], arg[1:]...) RenderCookie(m, arg[0], arg[1:]...)
@ -144,6 +145,9 @@ func RenderResult(m *ice.Message, arg ...ice.Any) {
Render(m, ice.RENDER_RESULT, arg...) Render(m, ice.RENDER_RESULT, arg...)
m.Render(ice.RENDER_VOID) m.Render(ice.RENDER_VOID)
} }
func RenderTemplate(m *ice.Message, file string, arg ...ice.Any) {
m.RenderResult(kit.Renders(kit.Format(m.Cmdx(nfs.CAT, path.Join(ice.SRC_TEMPLATE, WEB, file)), arg...), m))
}
func CookieName(url string) string { func CookieName(url string) string {
return ice.MSG_SESSID + "_" + kit.ReplaceAll(kit.ParseURLMap(url)[tcp.PORT], ".", "_", ":", "_") return ice.MSG_SESSID + "_" + kit.ReplaceAll(kit.ParseURLMap(url)[tcp.PORT], ".", "_", ":", "_")

3
data.go
View File

@ -17,6 +17,9 @@ func (m *Message) CommandKey() string {
func (m *Message) PrefixKey(arg ...Any) string { func (m *Message) PrefixKey(arg ...Any) string {
return kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...)) return kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...))
} }
func (m *Message) PrefixPath(arg ...Any) string {
return strings.TrimPrefix(strings.ReplaceAll(kit.Keys(m.Prefix(m.CommandKey()), kit.Keys(arg...)), PT, PS), "web")
}
func (m *Message) Prefix(arg ...string) string { func (m *Message) Prefix(arg ...string) string {
return m.Target().PrefixKey(arg...) return m.Target().PrefixKey(arg...)
} }

28
misc/git/token.go
View File

@ -24,38 +24,34 @@ func init() {
Index.MergeCommands(ice.Commands{ Index.MergeCommands(ice.Commands{
TOKEN: {Name: "token username auto prunes", Actions: ice.MergeActions(ice.Actions{ TOKEN: {Name: "token username auto prunes", Actions: ice.MergeActions(ice.Actions{
ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { aaa.White(m, kit.Keys(TOKEN, SID)) }}, ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { aaa.White(m, kit.Keys(TOKEN, SID)) }},
web.PP(SET): {Hand: func(m *ice.Message, arg ...string) { web.P(SET): {Hand: func(m *ice.Message, arg ...string) {
list := []string{m.Option(TOKEN)} host, list := kit.Dict(), []string{m.Option(TOKEN)}
m.Cmd(nfs.CAT, kit.HomePath(FILE), func(line string) { m.Cmd(nfs.CAT, kit.HomePath(FILE), func(line string) {
kit.If(line != list[0], func() { list = append(list, line) }) kit.IfNoKey(host, kit.ParseURL(line).Host, func(p string) { list = append(list, line) })
}) })
m.Cmd(nfs.SAVE, kit.HomePath(FILE), strings.Join(list, ice.NL)+ice.NL) m.Cmd(nfs.SAVE, kit.HomePath(FILE), strings.Join(list, ice.NL)+ice.NL)
m.RenderResult(m.Cmdx(nfs.CAT, ice.SRC_TEMPLATE+"web/close.html")) web.RenderTemplate(m, "close.html")
}}, }},
web.PP(GET): {Hand: func(m *ice.Message, arg ...string) { web.PP(GET): {Hand: func(m *ice.Message, arg ...string) {
m.Cmd(nfs.CAT, kit.HomePath(FILE), func(text string) { m.Cmd(nfs.CAT, kit.HomePath(FILE), func(text string) {
if strings.HasSuffix(text, ice.AT+arg[0]) { if u := kit.ParseURL(text); u.Host == arg[0] {
u := kit.ParseURL(text) m.Echo(u.User.Username()).Echo(u.User.Password())
if p, ok := u.User.Password(); ok { m.W.Header().Add("Access-Control-Allow-Origin", u.Scheme+"://"+u.Host)
m.Echo(u.User.Username()).Echo(p)
m.W.Header().Add("Access-Control-Allow-Origin", u.Scheme+"://"+arg[0])
}
} }
}) })
}}, }},
web.PP(SID): {Hand: func(m *ice.Message, arg ...string) { web.PP(SID): {Hand: func(m *ice.Message, arg ...string) {
if len(arg) > 1 && m.Cmd(TOKEN, arg[0]).Append(TOKEN) == arg[1] { if len(arg) > 1 && m.Cmd(TOKEN, arg[0]).Append(TOKEN) == arg[1] {
web.RenderCookie(m, aaa.SessCreate(m, arg[0])) web.RenderCookie(m.Echo(ice.OK), aaa.SessCreate(m, arg[0]))
m.Echo(ice.OK)
} }
}}, }},
}, mdb.HashAction(mdb.EXPIRE, mdb.MONTH, mdb.SHORT, aaa.USERNAME, mdb.FIELD, "time,username,token")), Hand: func(m *ice.Message, arg ...string) { }, mdb.HashAction(mdb.EXPIRE, mdb.MONTH, mdb.SHORT, aaa.USERNAME, mdb.FIELD, "time,username,token")), Hand: func(m *ice.Message, arg ...string) {
if mdb.HashSelect(m, arg...); len(arg) > 0 && m.Length() > 0 { if mdb.HashSelect(m, arg...); len(arg) > 0 && m.Length() > 0 {
p := strings.Replace(m.Option(ice.MSG_USERHOST), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), m.Append(TOKEN)), 1) p := strings.Replace(m.Option(ice.MSG_USERHOST), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), m.Append(TOKEN)), 1)
m.EchoScript(p).EchoScript(nfs.Template(m, "echo.sh", strings.Replace(m.Option(ice.MSG_USERHOST), "://", kit.Format("://%s:%s@", m.Option(ice.MSG_USERNAME), m.Append(TOKEN)), 1))) if m.EchoScript(p).EchoScript(nfs.Template(m, "echo.sh", p)); m.Option(ice.CMD) == m.PrefixKey() {
m.EchoAnchor(kit.MergeURL2(m.Option(tcp.HOST), "/code/git/token/set/", TOKEN, p)) m.ProcessReplace(kit.MergeURL2(m.Option(tcp.HOST), m.PrefixPath(SET), TOKEN, p))
if strings.Contains(m.Option(ice.MSG_USERWEB), "/chat/cmd/web.code.git.token") { } else {
m.ProcessReplace(kit.MergeURL2(m.Option(tcp.HOST), "/code/git/token/set/", TOKEN, p)) m.EchoAnchor(kit.MergeURL2(m.Option(tcp.HOST), m.PrefixPath(SET), TOKEN, p))
} }
} }
}}, }},