Merge branch 'issue_25' into dev

Author: Ne0nd0g

clients/mythic/mythic.go

@@ -274,7 +274,7 @@ func (client *Client) Initial(agent messages.AgentInfo) (messages.Base, error) {
 		OS:            agent.SysInfo.Platform,
 		User:          agent.SysInfo.UserName,
 		Host:          agent.SysInfo.HostName,
-		PID:           strconv.Itoa(agent.SysInfo.Pid),
+		PID:           agent.SysInfo.Pid,
 		PayloadID:     client.MythicID.String(), // Need to set now because it will be changed to tempUUID from RSA key exchange
 		Arch:          agent.SysInfo.Architecture,
 		Domain:        agent.SysInfo.Domain,

clients/mythic/structs.go

@@ -53,7 +53,7 @@ type CheckIn struct {
 	OS            string `json:"os"`                        // "os": "macOS 10.15", // os version - required
 	User          string `json:"user"`                      // "user": "its-a-feature", // username of current user - required
 	Host          string `json:"host"`                      // "host": "spooky.local", // hostname of the computer - required
-	PID           string `json:"pid"`                       // "pid": 4444, // pid of the current process - required
+	PID           int    `json:"pid"`                       // "pid": 4444, // pid of the current process - required
 	PayloadID     string `json:"uuid"`                      // "uuid": "payload uuid", //uuid of the payload - required
 	Arch          string `json:"architecture,omitempty"`    //  "architecture": "x64", // platform arch - optional
 	Domain        string `json:"domain,omitempty"`          // "domain": "test", // domain of the host - optional

core/core.go

@@ -28,7 +28,7 @@ var Verbose = false
 var Debug = false
 
 // Version is the Merlin Agent's version number
-var Version = "1.6.2"
+var Version = "1.6.3"
 
 // Mutex is used to ensure exclusive access to STDOUT & STDERR
 var Mutex = &sync.Mutex{}

docs/CHANGELOG.MD

@@ -4,6 +4,12 @@ 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.6.3 - 2023-03-15
+
+### Fixed
+
+- [Issue 25](https://github.com/Ne0nd0g/merlin-agent/issues/25) - Updated Mythic CheckIn structure's PID to integer
+
 ## 1.6.2 - 2023-03-08
 
 ### Fixed