Skip to content

Commit

Permalink
Fix module semantic versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ne0nd0g
Ne0nd0g committed Nov 3, 2023
1 parent 66b5cd2 commit 3afb90d
Show file tree
Hide file tree
Showing 55 changed files with 158 additions and 159 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ BUILD=$(shell git rev-parse HEAD)
DIR=bin/v${VERSION}/${BUILD}

# Merlin Agent Variables
XBUILD=-X "github.com/Ne0nd0g/merlin-agent/core.Build=${BUILD}"
XBUILD=-X "github.com/Ne0nd0g/merlin-agent/v2/core.Build=${BUILD}"
URL ?= https://127.0.0.1:443
XURL=-X "main.url=${URL}"
PSK ?= merlin
Expand Down
4 changes: 2 additions & 2 deletions agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
merlinOS "github.com/Ne0nd0g/merlin-agent/os"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
merlinOS "github.com/Ne0nd0g/merlin-agent/v2/os"
)

// Agent is an aggregate structure that represents a Merlin Agent
Expand Down
2 changes: 1 addition & 1 deletion agent/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"time"

// Internal
"github.com/Ne0nd0g/merlin-agent/agent"
"github.com/Ne0nd0g/merlin-agent/v2/agent"
)

// Repository is the structure that implements the in-memory repository for interacting with the Agent's C2 client
Expand Down
4 changes: 2 additions & 2 deletions authenticators/opaque/opaque.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"github.com/Ne0nd0g/merlin-message/opaque"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
)

// Authenticator is a structure used for OPAQUE authentication
Expand Down
2 changes: 1 addition & 1 deletion cli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/fatih/color"

// Internal
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/v2/core"
)

const (
Expand Down
32 changes: 16 additions & 16 deletions clients/http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Internal
"github.com/Ne0nd0g/merlin-agent/authenticators"
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
oAuth "github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/clients/memory"
"github.com/Ne0nd0g/merlin-agent/clients/utls"
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/services/p2p"
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
oAuth "github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/clients/memory"
"github.com/Ne0nd0g/merlin-agent/v2/clients/utls"
"github.com/Ne0nd0g/merlin-agent/v2/core"
"github.com/Ne0nd0g/merlin-agent/v2/services/p2p"
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
)

// Client is a type of MerlinClient that is used to send and receive Merlin messages from the Merlin server
Expand Down
2 changes: 1 addition & 1 deletion clients/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"sync"

// Internal
"github.com/Ne0nd0g/merlin-agent/clients"
"github.com/Ne0nd0g/merlin-agent/v2/clients"
)

// Repository is the structure that implements the in-memory repository for interacting with the Agent's C2 client
Expand Down
8 changes: 4 additions & 4 deletions clients/mythic/mythic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/clients"
"github.com/Ne0nd0g/merlin-agent/clients/utls"
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/clients"
"github.com/Ne0nd0g/merlin-agent/v2/clients/utls"
"github.com/Ne0nd0g/merlin-agent/v2/core"
)

// socksConnection is used to map the Mythic incremental integer used for tracking connections to a UUID leveraged by the agent
Expand Down
4 changes: 2 additions & 2 deletions clients/smb/smb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Internal
"github.com/Ne0nd0g/merlin-agent/authenticators"
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
)

// Client is a type of MerlinClient that is used to send and receive Merlin messages from the Merlin server
Expand Down
26 changes: 13 additions & 13 deletions clients/smb/smb_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Internal
"github.com/Ne0nd0g/merlin-agent/authenticators"
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
)

const (
Expand Down
26 changes: 13 additions & 13 deletions clients/tcp/tcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Internal
"github.com/Ne0nd0g/merlin-agent/authenticators"
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
)

const (
Expand Down
26 changes: 13 additions & 13 deletions clients/udp/udp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ import (
// Merlin
"github.com/Ne0nd0g/merlin-message"
// Internal
"github.com/Ne0nd0g/merlin-agent/authenticators"
"github.com/Ne0nd0g/merlin-agent/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
transformer "github.com/Ne0nd0g/merlin-agent/transformers"
b64 "github.com/Ne0nd0g/merlin-agent/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/transformers/encrypters/xor"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/none"
"github.com/Ne0nd0g/merlin-agent/v2/authenticators/opaque"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
transformer "github.com/Ne0nd0g/merlin-agent/v2/transformers"
b64 "github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/base64"
gob2 "github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/gob"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encoders/hex"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/aes"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/jwe"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/rc4"
"github.com/Ne0nd0g/merlin-agent/v2/transformers/encrypters/xor"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion commands/clr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// CLR is the entrypoint for Jobs that are processed to determine which CLR function should be executed
Expand Down
6 changes: 3 additions & 3 deletions commands/clr_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/os/windows/pkg/evasion"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/pkg/evasion"
)

// runtimeHost is the main object used to interact with the CLR to load and invoke assemblies
Expand Down
2 changes: 1 addition & 1 deletion commands/download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// Download receives a job from the server to download a file to host where the Agent is running
Expand Down
2 changes: 1 addition & 1 deletion commands/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strings"

// Merlin
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// env is used to view or modify a host's environment variables
Expand Down
8 changes: 4 additions & 4 deletions commands/exec_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"golang.org/x/sys/windows"

// Sub Repositories
"github.com/Ne0nd0g/merlin-agent/os/windows/api/kernel32"
"github.com/Ne0nd0g/merlin-agent/os/windows/api/ntdll"
"github.com/Ne0nd0g/merlin-agent/os/windows/pkg/pipes"
"github.com/Ne0nd0g/merlin-agent/os/windows/pkg/tokens"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/api/kernel32"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/api/ntdll"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/pkg/pipes"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/pkg/tokens"
)

// executeCommand instruct an agent to execute a program on the host operating system
Expand Down
2 changes: 1 addition & 1 deletion commands/execute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// ExecuteCommand runs the provided input program and arguments, returning results in a message base
Expand Down
8 changes: 4 additions & 4 deletions commands/link.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/core"
"github.com/Ne0nd0g/merlin-agent/p2p"
p2pService "github.com/Ne0nd0g/merlin-agent/services/p2p"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/core"
"github.com/Ne0nd0g/merlin-agent/v2/p2p"
p2pService "github.com/Ne0nd0g/merlin-agent/v2/services/p2p"
)

// peerToPeerService is used to work with peer-to-peer Agent connections/link to include handling or getting Delegate messages
Expand Down
4 changes: 2 additions & 2 deletions commands/listener.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/p2p"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/p2p"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion commands/memfd_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// Memfd places a linux executable file in-memory, executes it, and returns the results
Expand Down
4 changes: 2 additions & 2 deletions commands/memory_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/os/windows/pkg/evasion"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/pkg/evasion"
)

// Memory is a handler for working with virtual memory on the host operating system
Expand Down
2 changes: 1 addition & 1 deletion commands/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// CreateProcess spawns a child process with anonymous pipes, executes shellcode in it, and returns the output from the executed shellcode
Expand Down
2 changes: 1 addition & 1 deletion commands/native.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
)

// Native executes a golang native command that does not use any executables on the host
Expand Down
2 changes: 1 addition & 1 deletion commands/netstat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"fmt"

// Merlin
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-message/jobs"
)

Expand Down
2 changes: 1 addition & 1 deletion commands/netstat_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"unsafe"

// Merlin
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-message/jobs"
)

Expand Down
2 changes: 1 addition & 1 deletion commands/os.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ along with Merlin. If not, see <http://www.gnu.org/licenses/>.

package commands

import "github.com/Ne0nd0g/merlin-agent/cli"
import "github.com/Ne0nd0g/merlin-agent/v2/cli"

// Setup is used to prepare the environment or context for subsequent commands and is specific to each operating system
func Setup() error {
Expand Down
4 changes: 2 additions & 2 deletions commands/os_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"golang.org/x/sys/windows"

// Internal
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/os/windows/pkg/tokens"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-agent/v2/os/windows/pkg/tokens"
)

// Setup is used to prepare the environment or context for subsequent commands and is specific to each operating system
Expand Down
2 changes: 1 addition & 1 deletion commands/pipes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package commands
import (

// Merlin
"github.com/Ne0nd0g/merlin-agent/cli"
"github.com/Ne0nd0g/merlin-agent/v2/cli"
"github.com/Ne0nd0g/merlin-message/jobs"
)

Expand Down
Loading

0 comments on commit 3afb90d

Please sign in to comment.