Skip to content

Commit

Permalink
Merge pull request #1616 from BishopFox/v1.5.x/fix-msf-stager
Browse files Browse the repository at this point in the history
V1.5.x/fix msf stager
  • Loading branch information
moloch-- authored Mar 27, 2024
2 parents 122fb03 + 0f27efe commit 954b502
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autorelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Go 1.20
uses: actions/setup-go@v4
with:
go-version: "^1.20"
go-version: "1.20.7"

- name: Mingw
run: brew install mingw-w64
Expand Down
16 changes: 8 additions & 8 deletions server/msf/msf.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ func VenomPayload(config VenomConfig) ([]byte, error) {
func venomCmd(args []string) ([]byte, error) {
msfLog.Printf("%s %v", venomBin, args)
cmd := exec.Command(venomBin, args...)
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
stdout := new(bytes.Buffer)
stderr := new(bytes.Buffer)
cmd.Stdout = stdout
cmd.Stderr = stderr
err := cmd.Run()
msfLog.Println(cmd.String())
if err != nil {
Expand All @@ -218,10 +218,10 @@ func venomCmd(args []string) ([]byte, error) {
// consoleCmd - Execute a msfvenom command
func consoleCmd(args []string) ([]byte, error) {
cmd := exec.Command(consoleBin, args...)
var stdout bytes.Buffer
var stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
stdout := new(bytes.Buffer)
stderr := new(bytes.Buffer)
cmd.Stdout = stdout
cmd.Stderr = stderr
err := cmd.Run()
if err != nil {
msfLog.Printf("--- stdout ---\n%s\n", stdout.String())
Expand Down

0 comments on commit 954b502

Please sign in to comment.