62 Commits

Author SHA1 Message Date
Russel Van Tuyl df3230f4fb Updated Copyright year to 2024 2024-03-22 07:52:31 -04:00
Russel Van Tuyl 51dad96018 Fixed SOCKS issues 2024-03-21 07:56:50 -04:00
Russel Van Tuyl 0c10f6eef0 Fixed SOCKS data handling bugs 2024-03-07 07:24:43 -05:00
Russel Van Tuyl b61ae731f7 Updated go module to use "v2" 2023-11-04 06:07:50 -04:00
Russel Van Tuyl d0dda6f3c4 code quality and security fixes 2023-10-18 19:55:30 -04:00
Russel Van Tuyl 32b57695cf Updated for merlin-message package 2023-10-17 19:47:33 -04:00
Russel Van Tuyl 1365a6e189 Refactored cli and server to use gRPC 2023-10-17 08:13:43 -04:00
Russel Van Tuyl ed7d4eb3f4 wip: commands 2023-08-27 10:43:19 -04:00
Ne0nd0g 41dc2dbfcd Updated copyright year & added ability to list p2p links on the agent 2023-02-25 10:50:59 -05:00
Ne0nd0g d52ee6b256 DDD & SOLID restructure for TCP listeners 2022-12-24 11:48:45 -05:00
Ne0nd0g 8a2fda8da0 gosec & goreportcard updates 2022-07-20 07:35:30 -04:00
Ne0nd0g dab3338d91 SOCKS5 Functionality 2022-07-13 21:33:28 -04:00
Ne0nd0g 3cce31868e Update Copyright year 2022-01-10 19:37:03 -05:00
Ne0nd0g 0b6cf45359 Linting, gosec, and staticcheck updates 2021-08-03 12:05:54 -04:00
Ne0nd0g 5c43aa5ed4 Updated copyright and changelog date 2021-02-13 11:51:32 -05:00
Ne0nd0g 27e81800e4 Fixed linting, gosec, staticcheks, and tests 2021-01-16 13:11:32 -05:00
Ne0nd0g c68a308625 Updated go-donut package to use .NET auto detect 2020-12-31 15:07:04 -05:00
Ne0nd0g a83740ad89 Added SharpGen functionality 2020-12-12 17:43:21 -05:00
Ne0nd0g d7c47635fd Merge branch 'dev' into SharpGen 2020-12-12 10:50:16 -05:00
Ne0nd0g 1887cd00a0 Added go-donut functionality 2020-12-12 09:21:15 -05:00
Ne0nd0g 261496d50c Added CreateProcess with redirected STDOUT/STDERR over anonymous pipes 2020-11-25 08:56:15 -05:00
Ne0nd0g c5b32f9ff3 Base SharpGen module added 2020-11-20 07:58:40 -05:00
Ne0nd0g d7e27a3bf1 Created API for CLI to use
Made message queue to control writing to STDOUT
2020-07-18 16:14:40 -04:00
Ne0nd0g 4d4ef1e4fc Removed debug messages 2020-06-27 13:55:34 -04:00
Ne0nd0g bbe997bd68 Added regex to better fix #88 ;Updated modules README 2020-06-27 12:46:32 -04:00
Ne0nd0g 54d86aac57 Closes #71 allowing modules to run across all agents when the platform matches. Added unset command to modules 2020-05-03 13:19:25 -04:00
Ne0nd0g b5d57e1350 Closes #88 allowing module option values to contain spaces 2020-05-01 08:42:45 -04:00
Ne0nd0g bd21b9647b Fixes #77 2019-10-08 21:56:41 -04:00
Ne0nd0g 2c1146fa39 Fixed spelling errors. Added release date to changelog 2019-08-20 07:44:37 -04:00
Ne0nd0g a589180a28 merge payload-encryption with dev 2019-06-26 10:40:04 -04:00
Ne0nd0g 592167ac59 Updated Agent New() and Run() to return error. Update agent to correctly catch and report errors. Added check to make ensure incoming message agentID matches current agent's UUID. Added series of agent unit tests. Updated agent and server log file directory creation to 0750 and log files to 0640. Added check to validate module type is present. 2019-06-26 10:14:55 -04:00
Ne0nd0g aa20f5eb22 Fixed #69 2019-04-21 21:16:24 -04:00
Ne0nd0g 0004c97825 Added check for 'type' during module load 2019-04-21 21:10:35 -04:00
Ne0nd0g 4ce25cb1ca Fixed #70 2019-04-21 20:40:05 -04:00
Ne0nd0g 30ac2e2e27 gosec exclusion on srdi.go 2019-03-19 09:38:45 -04:00
Ne0nd0g 55ca887b50 staticcheck fixes on modules.go 2019-03-19 08:57:55 -04:00
Ne0nd0g ced970677c Removed MinidumpFile struct and replaced with map to preclude the need
for the agent to import the modules package. Added minidump package
inside of modules. Updated minidump.json file.
2019-03-05 08:30:00 -05:00
Ne0nd0g 285c3ceeea Updated shellcode module and added shellcodeinjection.json module file 2019-03-04 21:51:31 -05:00
Ne0nd0g 45f06608f3 Added shellcode and srdi packages to modules 2019-03-01 22:23:45 -05:00
Ne0nd0g 298a52bf6f Added sRDI module. Added GetAgentFieldValue and isAgent functions to
agents.go. Updated cli.go to process module run command based on module
type (i.e. standard or extended) instead of language. Updated Module
struct to include a Type. Added a check to make sure the Module's
platform and Agent's platform match. Added a getExtendedCommand
function and handling to modules.go. Added getMapFromOptions to
modules.go to convert an Options struct to a map.
2019-03-01 22:03:32 -05:00
c_sto 454bc528e6 add minidump structure to non-windows files 2019-02-19 07:18:06 +08:00
Ne0nd0g 17861d97f1 Updated gosec nosec to specific rule 2019-02-09 10:38:08 -05:00
Ne0nd0g bc76a96d7e Handled errors in modules.go and resolved gosec warnings. 2019-02-09 09:19:25 -05:00
Ne0nd0g 5579330765 gofmt -s updates 2019-01-01 13:21:48 -05:00
Ne0nd0g d5106ac919 Updated Copyright for 2019 2019-01-01 12:19:21 -05:00
Ne0nd0g 4d299811c1 Configured agent status check in to use a go routine;Fixed out of range
error when setting module options in Run function
2018-09-02 16:18:13 -04:00
Ne0nd0g 6bb30bb3c3 Added SafetyKatz, SharpDump, SharpRoast, Seatbelt, SharpUp, and Inveigh
modules. Added MerlinCheatSheet.pdf to docs directory. Updated Makefile
to extract version number from pkg/merlin.go
2018-08-11 16:25:01 -04:00
Ne0nd0g c0837dc26d Fixes #21 Where auto complete for modules names trimmed of the n. 2018-07-04 07:51:44 -04:00
Ne0nd0g 10e16ed471 Fixed error when setting module option so that it displayed the new
value instead of the original value.
2018-05-26 09:26:54 -04:00
Ne0nd0g 202c6a185d Updated module JSON structure to include Credits. Updated modules.go to
show credits. Added new exported Run function to the Agent DLL. Run
function takes URL as an argument.
2018-03-21 22:24:52 -04:00