alex/GoSally
2
0
Fork 0
mirror of https://github.com/akyaiy/GoSally-mvp.git synced 2026-01-03 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change method separator to . and move separator symbol and regexp template to global variables

Browse Source
This commit is contained in:
Alexey
2025-10-09 19:56:41 +03:00
parent 4a58845211
commit 1252634420
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/run.go
View File

@@ -29,6 +29,7 @@ import (
) )
var NodeApp = app.New() var NodeApp = app.New()
var AllowedCmdPattern = `^[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*$`
func Run(cmd *cobra.Command, args []string) { func Run(cmd *cobra.Command, args []string) {
NodeApp.InitialHooks( NodeApp.InitialHooks(
@@ -60,7 +61,7 @@ func RunHook(ctx context.Context, cs *corestate.CoreState, x *app.AppX) error {
serverv1 := sv1.InitV1Server(&sv1.HandlerV1InitStruct{ serverv1 := sv1.InitV1Server(&sv1.HandlerV1InitStruct{
X: x, X: x,
CS: cs, CS: cs,
AllowedCmd: regexp.MustCompile(`^[a-zA-Z0-9]+(>[a-zA-Z0-9]+)*$`), AllowedCmd: regexp.MustCompile(AllowedCmdPattern),
Ver: "v1", Ver: "v1",
}) })

4
internal/server/sv1/path.go
View File

@@ -9,12 +9,14 @@ import (
"github.com/akyaiy/GoSally-mvp/internal/server/rpc" "github.com/akyaiy/GoSally-mvp/internal/server/rpc"
) )
var RPCMethodSeparator = "."
func (h *HandlerV1) resolveMethodPath(method string) (string, error) { func (h *HandlerV1) resolveMethodPath(method string) (string, error) {
if !h.allowedCmd.MatchString(method) { if !h.allowedCmd.MatchString(method) {
return "", errors.New(rpc.ErrInvalidMethodFormatS) return "", errors.New(rpc.ErrInvalidMethodFormatS)
} }
parts := strings.Split(method, ">") parts := strings.Split(method, RPCMethodSeparator)
relPath := filepath.Join(parts...) + ".lua" relPath := filepath.Join(parts...) + ".lua"
fullPath := filepath.Join(*h.x.Config.Conf.Node.ComDir, relPath) fullPath := filepath.Join(*h.x.Config.Conf.Node.ComDir, relPath)