Skip to content

Commit 5daf79c

Browse files
committed
fix: update build 、profile
1 parent 56bd3f2 commit 5daf79c

2 files changed

Lines changed: 29 additions & 11 deletions

File tree

helper/types/profile.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@ func LoadProfile(content []byte) (*ProfileConfig, error) {
2222
}
2323

2424
type BasicProfile struct {
25-
Name string `yaml:"name" config:"name" default:"malefic"`
26-
Targets []string `yaml:"targets" config:"targets" default:"[]"`
27-
Protocol string `yaml:"protocol" config:"protocol" default:"tcp"`
28-
TLS bool `yaml:"tls" config:"tls" default:"false"`
29-
Proxy string `yaml:"proxy" config:"proxy" default:""`
30-
Interval int `yaml:"interval" config:"interval" default:"5"`
31-
Jitter float64 `yaml:"jitter" config:"jitter" default:"0.2"`
32-
CA string `yaml:"ca" config:"ca" default:""`
33-
Encryption string `yaml:"encryption" config:"encryption" default:"aes"`
34-
Key string `yaml:"key" config:"key" default:"maliceofinternal"`
25+
Name string `yaml:"name" config:"name" default:"malefic"`
26+
Targets []string `yaml:"targets" config:"targets" default:"[]"`
27+
Protocol string `yaml:"protocol" config:"protocol" default:"tcp"`
28+
TLS bool `yaml:"tls" config:"tls" default:"false"`
29+
Proxy string `yaml:"proxy" config:"proxy" default:""`
30+
Interval int `yaml:"interval" config:"interval" default:"5"`
31+
Jitter float64 `yaml:"jitter" config:"jitter" default:"0.2"`
32+
CA string `yaml:"ca" config:"ca" default:""`
33+
Encryption string `yaml:"encryption" config:"encryption" default:"aes"`
34+
Key string `yaml:"key" config:"key" default:"maliceofinternal"`
35+
Extras map[string]interface{} `yaml:",inline"`
3536
}
3637

3738
type PulseProfile struct {

server/internal/build/build.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ var (
5151
CargoGitCacheVolume = fmt.Sprintf("%s:%s", filepath.ToSlash(gitPath), ContainerCargoGitCache)
5252
BinPathVolume = fmt.Sprintf("%s:%s", filepath.ToSlash(binPath), ContainerBinPath)
5353
//Volumes = []string{SourceCodeVolume, CargoRegistryCacheVolume, CargoGitCacheVolume, BinPathVolume}
54-
Volumes = []string{SourceCodeVolume}
54+
Volumes = []string{SourceCodeVolume, BinPathVolume}
55+
PATH_ENV = ContainerBinPath + ":/root/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/osxcross/bin:/usr/bin/mingw-w64"
5556
)
5657

5758
var dockerClient *client.Client
@@ -75,12 +76,16 @@ func BuildBeacon(cli *client.Client, req *clientpb.Generate) error {
7576
timeout := 20 * time.Minute
7677
ctx, cancel := context.WithTimeout(context.Background(), timeout)
7778
defer cancel()
79+
7880
buildBeaconCommand := fmt.Sprintf(
7981
"malefic-mutant generate beacon && malefic-mutant build malefic -t %s",
8082
req.Target,
8183
)
8284
containerName := "malefic_" + cryptography.RandomString(8)
8385
resp, err := cli.ContainerCreate(ctx, &container.Config{
86+
Env: []string{
87+
"PATH=" + PATH_ENV,
88+
},
8489
Image: DefaultImage,
8590
Cmd: []string{"sh", "-c", buildBeaconCommand},
8691
//"cargo run -p malefic-mutant stage0 professional x86_64 source && cargo build --release -p malefic-pulse"},
@@ -130,6 +135,9 @@ func BuildBind(cli *client.Client, req *clientpb.Generate) error {
130135
resp, err := cli.ContainerCreate(ctx, &container.Config{
131136
Image: DefaultImage,
132137
Cmd: []string{"sh", "-c", BuildBindCommand},
138+
Env: []string{
139+
"PATH=" + PATH_ENV,
140+
},
133141
}, &container.HostConfig{
134142
AutoRemove: true,
135143
Binds: Volumes,
@@ -181,6 +189,9 @@ func BuildPrelude(cli *client.Client, req *clientpb.Generate) error {
181189
resp, err := cli.ContainerCreate(ctx, &container.Config{
182190
Image: DefaultImage,
183191
Cmd: []string{"sh", "-c", BuildPreludeCommand},
192+
Env: []string{
193+
"PATH=" + PATH_ENV,
194+
},
184195
}, &container.HostConfig{
185196
AutoRemove: true,
186197
Binds: Volumes,
@@ -229,6 +240,9 @@ func BuildPulse(cli *client.Client, req *clientpb.Generate) error {
229240
resp, err := cli.ContainerCreate(ctx, &container.Config{
230241
Image: DefaultImage,
231242
Cmd: []string{"sh", "-c", BuildBindCommand},
243+
Env: []string{
244+
"PATH=" + PATH_ENV,
245+
},
232246
}, &container.HostConfig{
233247
AutoRemove: true,
234248
Binds: Volumes,
@@ -278,6 +292,9 @@ func BuildModules(cli *client.Client, req *clientpb.Generate) error {
278292
resp, err := cli.ContainerCreate(ctx, &container.Config{
279293
Image: DefaultImage,
280294
Cmd: []string{"sh", "-c", buildModulesCommand},
295+
Env: []string{
296+
"PATH=" + PATH_ENV,
297+
},
281298
}, &container.HostConfig{
282299
AutoRemove: true,
283300
Binds: Volumes,

0 commit comments

Comments
 (0)