Skip to content

Commit

Permalink
Fixed #1 - Added job.Token to Minidump command response message
Browse files Browse the repository at this point in the history
  • Loading branch information
Ne0nd0g committed May 29, 2021
1 parent 716aaf9 commit 70c07d5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ all: windows linux darwin
windows:
export GOOS=windows GOARCH=amd64;go build -trimpath ${WINAGENTLDFLAGS} ${GCFLAGS} ${ASMFLAGS} -o ${DIR}/${MAGENT}-${W}.exe ./main.go

# Compile Agent - Windows x64 Debug (Can view STDOUT)
windows-debug:
export GOOS=windows GOARCH=amd64;go build -trimpath ${LDFLAGS} ${GCFLAGS} ${ASMFLAGS} -o ${DIR}/${MAGENT}-Debug-${W}.exe ./main.go

# Compile Agent - Linux mips
mips:
export GOOS=linux;export GOARCH=mips;go build -trimpath ${LDFLAGS} ${GCFLAGS} ${ASMFLAGS} -o ${DIR}/${MAGENT}-${M} ./main.go
Expand Down
1 change: 1 addition & 0 deletions agent/jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func executeJob() {
jobsOut <- jobs.Job{
AgentID: job.AgentID,
ID: job.ID,
Token: job.Token,
Type: jobs.FILETRANSFER,
Payload: ft,
}
Expand Down
2 changes: 1 addition & 1 deletion core/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var Verbose = false
var Debug = false

// Version is the Merlin Agent's version number
var Version = "1.0.0"
var Version = "1.0.1"

// Mutex is used to ensure exclusive access to STDOUT & STDERR
var Mutex = &sync.Mutex{}
10 changes: 10 additions & 0 deletions docs/CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## 1.0.1 - May 29, 2021

### Fixed

- [Issue 1](https://github.com/Ne0nd0g/merlin-agent/issues/1) - Added `job.Token` for Minidump command response message

### Added

- `windows-debug` build to Make file; Removes hidden window attribute to view STDOUT/STDERR when troubleshooting

## 1.0.0 - April 17, 2021

- Initial commit
Expand Down

0 comments on commit 70c07d5

Please sign in to comment.