chore: update gen_help and gen_lua

M09Ic · M09Ic · commit e8c8e2996a28 · 2025-07-10T03:47:08.000+08:00
diff --git a/client/cmd/genhelp/gen_help.go b/client/cmd/genhelp/gen_help.go
@@ -4,10 +4,15 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/chainreactors/malice-network/client/assets"
+	"github.com/chainreactors/malice-network/client/command"
 	"github.com/chainreactors/malice-network/client/command/addon"
 	"github.com/chainreactors/malice-network/client/command/alias"
 	"github.com/chainreactors/malice-network/client/command/armory"
+	"github.com/chainreactors/malice-network/client/command/basic"
 	"github.com/chainreactors/malice-network/client/command/build"
+	"github.com/chainreactors/malice-network/client/command/cert"
+	configCmd "github.com/chainreactors/malice-network/client/command/config"
+	"github.com/chainreactors/malice-network/client/command/context"
 	"github.com/chainreactors/malice-network/client/command/exec"
 	"github.com/chainreactors/malice-network/client/command/explorer"
 	"github.com/chainreactors/malice-network/client/command/extension"
@@ -17,16 +22,24 @@ import (
 	"github.com/chainreactors/malice-network/client/command/listener"
 	"github.com/chainreactors/malice-network/client/command/mal"
 	"github.com/chainreactors/malice-network/client/command/modules"
+	"github.com/chainreactors/malice-network/client/command/mutant"
 	"github.com/chainreactors/malice-network/client/command/pipe"
+	"github.com/chainreactors/malice-network/client/command/pipeline"
+	"github.com/chainreactors/malice-network/client/command/pivot"
 	"github.com/chainreactors/malice-network/client/command/privilege"
 	"github.com/chainreactors/malice-network/client/command/reg"
 	"github.com/chainreactors/malice-network/client/command/service"
 	"github.com/chainreactors/malice-network/client/command/sessions"
 	"github.com/chainreactors/malice-network/client/command/sys"
 	"github.com/chainreactors/malice-network/client/command/tasks"
 	"github.com/chainreactors/malice-network/client/command/taskschd"
+	"github.com/chainreactors/malice-network/client/command/third"
+	"github.com/chainreactors/malice-network/client/command/website"
+	"github.com/chainreactors/malice-network/client/plugin"
 	"github.com/chainreactors/malice-network/client/repl"
 	"github.com/chainreactors/malice-network/helper/consts"
+	"github.com/chainreactors/malice-network/helper/intermediate"
+	"github.com/chainreactors/malice-network/helper/proto/services/clientrpc"
 	"github.com/gookit/config/v2"
 	"github.com/gookit/config/v2/yaml"
 	"github.com/spf13/cobra"
@@ -185,6 +198,7 @@ func GenImplantHelp(con *repl.Console) {
 		panic(err)
 	}
 	GenGroupHelp(implantMd, con, consts.ImplantGroup,
+		basic.Commands,
 		tasks.Commands,
 		modules.Commands,
 		explorer.Commands,
@@ -200,12 +214,17 @@ func GenImplantHelp(con *repl.Console) {
 		reg.Commands,
 		taskschd.Commands,
 		privilege.Commands,
+		third.Commands,
 	)
 
 	GenGroupHelp(implantMd, con, consts.FileGroup,
 		file.Commands,
 		filesystem.Commands,
 		pipe.Commands)
+
+	GenGroupHelp(implantMd, con, consts.PivotGroup,
+		pivot.Commands,
+	)
 }
 
 func GenClientHelp(con *repl.Console) {
@@ -222,15 +241,47 @@ func GenClientHelp(con *repl.Console) {
 		extension.Commands,
 		armory.Commands,
 		mal.Commands,
+		configCmd.Commands,
+		context.Commands,
+		cert.Commands,
 	)
 
 	GenGroupHelp(clientMd, con, consts.ListenerGroup,
 		listener.Commands,
+		website.Commands,
+		pipeline.Commands,
 	)
 
 	GenGroupHelp(clientMd, con, consts.GeneratorGroup,
-		build.Commands)
+		build.Commands,
+		mutant.Commands)
+
+}
+
+func GenMalHelper(con *repl.Console, name string) {
+	clientMd, err := os.Create(name + ".md")
+	if err != nil {
+		panic(err)
+	}
 
+	rpc := clientrpc.NewMaliceRPCClient(nil)
+	intermediate.RegisterBuiltin(rpc)
+	command.RegisterClientFunc(con)
+	command.RegisterImplantFunc(con)
+	clientMd.Write([]byte(fmt.Sprintf("## %s\n", name)))
+	for _, p := range plugin.GetGlobalMalManager().GetAllEmbeddedPlugins() {
+		var cmds []*cobra.Command
+		for _, cc := range p.CMDs {
+			cmds = append(cmds, cc.Command)
+		}
+		sort.Sort(byName(cmds))
+		for _, c := range cmds {
+			c.SetHelpCommand(nil)
+			_ = GenMarkdownTreeCustom(c, clientMd, func(s string) string {
+				return "#" + strings.ReplaceAll(s, " ", "-")
+			})
+		}
+	}
 }
 
 func main() {
@@ -242,4 +293,5 @@ func main() {
 
 	GenClientHelp(con)
 	GenImplantHelp(con)
+	GenMalHelper(con, "community")
 }
diff --git a/client/cmd/genlua/gen_lua.go b/client/cmd/genlua/gen_lua.go
@@ -33,6 +33,8 @@ func main() {
 	vm := plugin.NewLuaVM()
 	plug := &plugin.LuaPlugin{DefaultPlugin: &plugin.DefaultPlugin{MalManiFest: &plugin.MalManiFest{}}}
 	plug.InitLuaContext(vm)
+	plug.RegisterLuaFunction()
+
 	mals.GenerateLuaDefinitionFile(vm, intermediate.BuiltinPackage, plugin.ProtoPackage, intermediate.InternalFunctions.Package(intermediate.BuiltinPackage))
 	mals.GenerateLuaDefinitionFile(vm, intermediate.RpcPackage, plugin.ProtoPackage, intermediate.InternalFunctions.Package(intermediate.RpcPackage))
 	mals.GenerateLuaDefinitionFile(vm, intermediate.BeaconPackage, plugin.ProtoPackage, intermediate.InternalFunctions.Package(intermediate.BeaconPackage))
diff --git a/client/command/mal/load.go b/client/command/mal/load.go
@@ -1,7 +1,7 @@
 package mal
 
 import (
-	plugin2 "github.com/chainreactors/malice-network/client/plugin"
+	"github.com/chainreactors/malice-network/client/plugin"
 	"path/filepath"
 
 	"github.com/chainreactors/logs"
@@ -15,28 +15,26 @@ import (
 
 func MalLoadCmd(ctx *cobra.Command, con *repl.Console) error {
 	dirPath := ctx.Flags().Arg(0)
-	malManager := plugin2.GetGlobalMalManager()
-
 	manifestPath := filepath.Join(assets.GetMalsDir(), dirPath, m.ManifestFileName)
-	manifest, err := plugin2.LoadMalManiFest(manifestPath)
+	manifest, err := plugin.LoadMalManiFest(manifestPath)
 	if err != nil {
 		return err
 	}
 
-	var plug plugin2.Plugin
+	var plug plugin.Plugin
 
 	// 检查是否已加载
-	if _, exists := malManager.GetExternalPlugin(manifest.Name); exists {
+	if _, exists := con.MalManager.GetExternalPlugin(manifest.Name); exists {
 		con.Log.Warnf("mal %s already loaded, reloading\n", manifest.Name)
-		err := malManager.ReloadExternalMal(manifest.Name)
+		err := con.MalManager.ReloadExternalMal(manifest.Name)
 		if err != nil {
 			return err
 		}
 		// 重新获取插件
-		plug, _ = malManager.GetExternalPlugin(manifest.Name)
+		plug, _ = con.MalManager.GetExternalPlugin(manifest.Name)
 	} else {
 		// 首次加载
-		plug, err = malManager.LoadExternalMal(manifest)
+		plug, err = con.MalManager.LoadExternalMal(manifest)
 		if err != nil {
 			return err
 		}
@@ -64,16 +62,15 @@ func MalLoadCmd(ctx *cobra.Command, con *repl.Console) error {
 }
 
 func LoadMal(con *repl.Console, rootCmd *cobra.Command, filename string) error {
-	manifest, err := plugin2.LoadMalManiFest(filename)
+	manifest, err := plugin.LoadMalManiFest(filename)
 	if err != nil {
 		return err
 	}
 	return LoadMalWithManifest(con, rootCmd, manifest)
 }
 
-func LoadMalWithManifest(con *repl.Console, rootCmd *cobra.Command, manifest *plugin2.MalManiFest) error {
-	malManager := plugin2.GetGlobalMalManager()
-	plug, err := malManager.LoadExternalMal(manifest)
+func LoadMalWithManifest(con *repl.Console, rootCmd *cobra.Command, manifest *plugin.MalManiFest) error {
+	plug, err := con.MalManager.LoadExternalMal(manifest)
 	if err != nil {
 		return err
 	}
@@ -99,11 +96,9 @@ func LoadMalWithManifest(con *repl.Console, rootCmd *cobra.Command, manifest *pl
 }
 
 func ListMalManifest(con *repl.Console) {
-	malManager := plugin2.GetGlobalMalManager()
-
 	// 获取所有外部插件
-	externalPlugins := malManager.GetAllExternalPlugins()
-	embeddedPlugins := malManager.GetAllEmbeddedPlugins()
+	externalPlugins := con.MalManager.GetAllExternalPlugins()
+	embeddedPlugins := con.MalManager.GetAllEmbeddedPlugins()
 
 	if len(externalPlugins) == 0 && len(embeddedPlugins) == 0 {
 		con.Log.Infof("No mal loaded")
diff --git a/client/command/mal/refresh.go b/client/command/mal/refresh.go
@@ -1,14 +1,12 @@
 package mal
 
 import (
-	"github.com/chainreactors/malice-network/client/plugin"
 	"github.com/chainreactors/malice-network/client/repl"
 	"github.com/chainreactors/malice-network/helper/consts"
 	"github.com/spf13/cobra"
 )
 
 func RefreshMalCmd(cmd *cobra.Command, con *repl.Console) error {
-	malManager := plugin.GetGlobalMalManager()
 	implantCmd := con.ImplantMenu()
 
 	// 移除所有mal组的命令
@@ -19,22 +17,22 @@ func RefreshMalCmd(cmd *cobra.Command, con *repl.Console) error {
 	}
 
 	// 获取所有外部插件名称
-	externalPlugins := malManager.GetAllExternalPlugins()
+	externalPlugins := con.MalManager.GetAllExternalPlugins()
 	var pluginNames []string
 	for name := range externalPlugins {
 		pluginNames = append(pluginNames, name)
 	}
 
 	// 移除所有外部插件
 	for _, name := range pluginNames {
-		err := malManager.RemoveExternalMal(name)
+		err := con.MalManager.RemoveExternalMal(name)
 		if err != nil {
 			con.Log.Warnf("Failed to remove plugin %s: %s\n", name, err)
 		}
 	}
 
 	// 重新加载所有外部mal插件
-	for _, manifest := range malManager.GetPluginManifests() {
+	for _, manifest := range con.MalManager.GetPluginManifests() {
 		err := LoadMalWithManifest(con, implantCmd, manifest)
 		if err != nil {
 			con.Log.Errorf("Failed to load mal %s: %s\n", manifest.Name, err)
diff --git a/client/command/mal/remove.go b/client/command/mal/remove.go
@@ -3,7 +3,6 @@ package mal
 import (
 	"errors"
 	"fmt"
-	"github.com/chainreactors/malice-network/client/plugin"
 	"github.com/chainreactors/tui"
 	"os"
 	"path/filepath"
@@ -39,13 +38,11 @@ func RemoveMal(name string, con *repl.Console) error {
 		return errors.New("mal name is required")
 	}
 
-	malManager := plugin.GetGlobalMalManager()
-
-	if _, exists := malManager.GetEmbedPlugin(name); exists {
+	if _, exists := con.MalManager.GetEmbedPlugin(name); exists {
 		return errors.New("cannot remove embedded mal")
 	}
 
-	plug, exists := malManager.GetExternalPlugin(name)
+	plug, exists := con.MalManager.GetExternalPlugin(name)
 	if !exists {
 		return errors.New("mal not found")
 	}
@@ -55,7 +52,7 @@ func RemoveMal(name string, con *repl.Console) error {
 		implantMenu.RemoveCommand(cmd.Command)
 	}
 
-	err := malManager.RemoveExternalMal(name)
+	err := con.MalManager.RemoveExternalMal(name)
 	if err != nil {
 		return err
 	}
diff --git a/client/plugin/embed.go b/client/plugin/embed.go
@@ -90,7 +90,6 @@ func NewEmbedPlugin(malPath, malName string, level MalLevel) (*EmbedPlugin, erro
 	// 创建LuaPlugin
 	luaPlugin := &LuaPlugin{
 		DefaultPlugin: defaultPlugin,
-		vmFns:         make(map[string]lua.LGFunction),
 	}
 
 	// 创建嵌入式插件
@@ -110,7 +109,7 @@ func (plug *EmbedPlugin) Run() error {
 	if err != nil {
 		return err
 	}
-	plug.registerLuaFunction()
+	plug.RegisterLuaFunction()
 	plug.setContext = func(vm *lua.LState) error {
 		return plug.addEmbedLoader(vm)
 	}
diff --git a/client/plugin/lua.go b/client/plugin/lua.go
@@ -60,7 +60,6 @@ func NewLuaMalPlugin(manifest *MalManiFest) (*LuaPlugin, error) {
 
 	mal := &LuaPlugin{
 		DefaultPlugin: plug,
-		vmFns:         make(map[string]lua.LGFunction),
 	}
 
 	return mal, nil
@@ -72,7 +71,7 @@ func (plug *LuaPlugin) Run() error {
 	if err != nil {
 		return err
 	}
-	plug.registerLuaFunction()
+	plug.RegisterLuaFunction()
 	err = plug.registerLuaOnHooks()
 	if err != nil {
 		return err
@@ -195,7 +194,8 @@ func (plug *LuaPlugin) InitLuaContext(vm *lua.LState) error {
 	return nil
 }
 
-func (plug *LuaPlugin) registerLuaFunction() {
+func (plug *LuaPlugin) RegisterLuaFunction() {
+	plug.vmFns = make(map[string]lua.LGFunction)
 	// 读取resource文件路径（文件系统版本）
 	plug.registerFunction("script_resource", func(filename string) (string, error) {
 		resourceFile := filepath.Join(assets.GetMalsDir(), plug.Name, "resources", filename)
@@ -294,6 +294,7 @@ func (plug *LuaPlugin) registerLuaFunction() {
 			Short: short,
 			Annotations: map[string]string{
 				"ttp": ttp,
+				"mal": plug.Name,
 			},
 			Run: func(cmd *cobra.Command, args []string) {
 				go func() {
diff --git a/client/plugin/manager.go b/client/plugin/manager.go
@@ -12,8 +12,11 @@ import (
 )
 
 var (
-	globalMalManager *MalManager
-	managerOnce      sync.Once
+	globalMalManager *MalManager = &MalManager{
+		embeddedPlugins: make(map[string]*EmbedPlugin),
+		externalPlugins: make(map[string]Plugin),
+		globalPlugins:   make([]*DefaultPlugin, 0),
+		loadedCommands:  make(Commands)}
 )
 
 // MalManager 统一的mal插件管理器，分别管理嵌入式和外部插件
@@ -28,16 +31,9 @@ type MalManager struct {
 
 // GetGlobalMalManager 获取全局mal管理器（单例）
 func GetGlobalMalManager() *MalManager {
-	managerOnce.Do(func() {
-		globalMalManager = &MalManager{
-			embeddedPlugins: make(map[string]*EmbedPlugin),
-			externalPlugins: make(map[string]Plugin),
-			globalPlugins:   make([]*DefaultPlugin, 0),
-			loadedCommands:  make(Commands),
-		}
-		// 初始化时加载所有插件
+	if !globalMalManager.initialized {
 		globalMalManager.initialize()
-	})
+	}
 	return globalMalManager
 }
 
diff --git a/helper/intl/community/modules/base.lua b/helper/intl/community/modules/base.lua
@@ -1,10 +1,10 @@
 
-function load_preset(arg_0)
+function load_prebuild(arg_0)
     local session = active()
     local arch = barch(session)
 
     return load_module(session, "arg_0", script_resource("modules/"  .. arg_0 .. "." .. arch .. ".dll"))
 end
 
-local load_preset_cmd = command("load_preset", load_preset, "load full|fs|execute|sys|rem precompiled modules", "")
-bind_args_completer(load_preset_cmd, { values_completer({"full", "fs", "execute", "sys", "rem"}) })
+local load_prebuild_cmd = command("load_prebuild", load_prebuild, "load full|fs|execute|sys|rem precompiled modules", "")
+bind_args_completer(load_prebuild_cmd, { values_completer({"full", "fs", "execute", "sys", "rem"}) })

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package mal`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`		`- "github.com/chainreactors/malice-network/client/plugin"`
`7`	`6`	`"github.com/chainreactors/tui"`
`8`	`7`	`"os"`
`9`	`8`	`"path/filepath"`
`@@ -39,13 +38,11 @@ func RemoveMal(name string, con *repl.Console) error {`
`39`	`38`	`return errors.New("mal name is required")`
`40`	`39`	`}`
`41`	`40`
`42`		`- malManager := plugin.GetGlobalMalManager()`
`43`		`-`
`44`		`- if _, exists := malManager.GetEmbedPlugin(name); exists {`
	`41`	`+ if _, exists := con.MalManager.GetEmbedPlugin(name); exists {`
`45`	`42`	`return errors.New("cannot remove embedded mal")`
`46`	`43`	`}`
`47`	`44`
`48`		`- plug, exists := malManager.GetExternalPlugin(name)`
	`45`	`+ plug, exists := con.MalManager.GetExternalPlugin(name)`
`49`	`46`	`if !exists {`
`50`	`47`	`return errors.New("mal not found")`
`51`	`48`	`}`
`@@ -55,7 +52,7 @@ func RemoveMal(name string, con *repl.Console) error {`
`55`	`52`	`implantMenu.RemoveCommand(cmd.Command)`
`56`	`53`	`}`
`57`	`54`
`58`		`- err := malManager.RemoveExternalMal(name)`
	`55`	`+ err := con.MalManager.RemoveExternalMal(name)`
`59`	`56`	`if err != nil {`
`60`	`57`	`return err`
`61`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ func NewEmbedPlugin(malPath, malName string, level MalLevel) (*EmbedPlugin, erro`
`90`	`90`	`// 创建LuaPlugin`
`91`	`91`	`luaPlugin := &LuaPlugin{`
`92`	`92`	`DefaultPlugin: defaultPlugin,`
`93`		`- vmFns: make(map[string]lua.LGFunction),`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`// 创建嵌入式插件`
`@@ -110,7 +109,7 @@ func (plug *EmbedPlugin) Run() error {`
`110`	`109`	`if err != nil {`
`111`	`110`	`return err`
`112`	`111`	`}`
`113`		`- plug.registerLuaFunction()`
	`112`	`+ plug.RegisterLuaFunction()`
`114`	`113`	`plug.setContext = func(vm *lua.LState) error {`
`115`	`114`	`return plug.addEmbedLoader(vm)`
`116`	`115`	`}`