Skip to content

Commit

Permalink
Updated go module to use "v2"
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ne0nd0g
Ne0nd0g committed Nov 4, 2023
1 parent 732c20d commit b61ae73
Show file tree
Hide file tree
Showing 43 changed files with 181 additions and 181 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DIR=data/temp/v${VERSION}/${BUILD}
$(shell mkdir -p ${DIR})

# Go build flags
LDFLAGS=-ldflags '-X github.com/Ne0nd0g/merlin/pkg.Build=${BUILD} -buildid='
LDFLAGS=-ldflags '-X github.com/Ne0nd0g/merlin/v2/pkg.Build=${BUILD} -buildid='

# Misc
# GOGARBLE contains a list of all the packages to obfuscate
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Ne0nd0g/merlin
module github.com/Ne0nd0g/merlin/v2

go 1.21

Expand Down
6 changes: 3 additions & 3 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"log"

// Internal
"github.com/Ne0nd0g/merlin/pkg"
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/pkg/services/rpc"
merlin "github.com/Ne0nd0g/merlin/v2/pkg"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/services/rpc"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/agents/agents.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/google/uuid"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/opaque"
)

// Agent is an aggregate structure that holds information about Agent's the server is communicating with
Expand Down
2 changes: 1 addition & 1 deletion pkg/agents/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/google/uuid"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/agents"
"github.com/Ne0nd0g/merlin/v2/pkg/agents"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/authenticators/none/none.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/agents"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/services/job"
"github.com/Ne0nd0g/merlin/v2/pkg/agents"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/services/job"
)

// Authenticator is a structure that holds an Agent service to add agents once they've completed authentication
Expand Down
12 changes: 6 additions & 6 deletions pkg/authenticators/opaque/opaque.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ import (
"github.com/Ne0nd0g/merlin-message/opaque"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/agents"
"github.com/Ne0nd0g/merlin/pkg/core"
"github.com/Ne0nd0g/merlin/pkg/logging"
opaque2 "github.com/Ne0nd0g/merlin/pkg/opaque"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/services/job"
"github.com/Ne0nd0g/merlin/v2/pkg/agents"
"github.com/Ne0nd0g/merlin/v2/pkg/core"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
opaque2 "github.com/Ne0nd0g/merlin/v2/pkg/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/services/job"
)

// key is the Opaque server-side key
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package memory

import (
"fmt"
"github.com/Ne0nd0g/merlin/pkg/client"
"github.com/Ne0nd0g/merlin/v2/pkg/client"
"github.com/google/uuid"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/message/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin/pkg/client/message"
"github.com/Ne0nd0g/merlin/v2/pkg/client/message"
)

// Repository is the in-memory data structure to store messages
Expand Down
2 changes: 1 addition & 1 deletion pkg/jobs/jobs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin/pkg/core"
"github.com/Ne0nd0g/merlin/v2/pkg/core"
)

type Status int
Expand Down
2 changes: 1 addition & 1 deletion pkg/jobs/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
jobs2 "github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin/pkg/jobs"
"github.com/Ne0nd0g/merlin/v2/pkg/jobs"
)

// Repository is the structure that implements the in-memory repository for interacting with Agent Jobs
Expand Down
30 changes: 15 additions & 15 deletions pkg/listeners/http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/authenticators"
"github.com/Ne0nd0g/merlin/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/pkg/listeners"
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/pkg/servers"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/transformer"
b64 "github.com/Ne0nd0g/merlin/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/xor"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/servers"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer"
b64 "github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/xor"
)

// Listener is an aggregate structure that implements the Listener interface used to listen for and handle Agent message traffic
Expand Down
2 changes: 1 addition & 1 deletion pkg/listeners/http/jwt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
)

// GetJWT returns a JSON Web Token for the provided agent using the interface JWT Key
Expand Down
2 changes: 1 addition & 1 deletion pkg/listeners/http/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/google/uuid"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/listeners/http"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners/http"
)

// Repository is a structure that implements the Repository interface
Expand Down
6 changes: 3 additions & 3 deletions pkg/listeners/listeners.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/authenticators"
"github.com/Ne0nd0g/merlin/pkg/servers"
"github.com/Ne0nd0g/merlin/pkg/transformer"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
"github.com/Ne0nd0g/merlin/v2/pkg/servers"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/listeners/smb/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin/pkg/listeners/smb"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners/smb"
)

// Repository is a structure that implements the Repository interface
Expand Down
28 changes: 14 additions & 14 deletions pkg/listeners/smb/smb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Internal
"github.com/Ne0nd0g/merlin/pkg/authenticators"
"github.com/Ne0nd0g/merlin/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/pkg/listeners"
"github.com/Ne0nd0g/merlin/pkg/servers"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/transformer"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/xor"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners"
"github.com/Ne0nd0g/merlin/v2/pkg/servers"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/xor"
)

// Listener is an aggregate structure that implements the Listener interface
Expand Down
2 changes: 1 addition & 1 deletion pkg/listeners/tcp/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/google/uuid"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/listeners/tcp"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners/tcp"
)

// Repository is a structure that implements the Repository interface
Expand Down
30 changes: 15 additions & 15 deletions pkg/listeners/tcp/tcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ import (
"github.com/Ne0nd0g/merlin-message"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/authenticators"
"github.com/Ne0nd0g/merlin/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/pkg/listeners"
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/pkg/servers"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/transformer"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/xor"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/servers"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/xor"
)

// Listener is an aggregate structure that implements the Listener interface
Expand Down
2 changes: 1 addition & 1 deletion pkg/listeners/udp/memory/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/google/uuid"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/listeners/udp"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners/udp"
)

// Repository is a structure that implements the Repository interface
Expand Down
28 changes: 14 additions & 14 deletions pkg/listeners/udp/udp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ import (

// Merlin

"github.com/Ne0nd0g/merlin/pkg/authenticators"
"github.com/Ne0nd0g/merlin/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/pkg/listeners"
"github.com/Ne0nd0g/merlin/pkg/servers"
"github.com/Ne0nd0g/merlin/pkg/services/agent"
"github.com/Ne0nd0g/merlin/pkg/transformer"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/pkg/transformer/encrypters/xor"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/none"
"github.com/Ne0nd0g/merlin/v2/pkg/authenticators/opaque"
"github.com/Ne0nd0g/merlin/v2/pkg/listeners"
"github.com/Ne0nd0g/merlin/v2/pkg/servers"
"github.com/Ne0nd0g/merlin/v2/pkg/services/agent"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/base64"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/gob"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encoders/hex"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/aes"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/jwe"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/rc4"
"github.com/Ne0nd0g/merlin/v2/pkg/transformer/encrypters/xor"
)

// Listener is an aggregate structure that implements the Listener interface
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/sharpgen/sharpgen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"path/filepath"
"strings"

"github.com/Ne0nd0g/merlin/pkg/modules/donut"
"github.com/Ne0nd0g/merlin/v2/pkg/modules/donut"
)

// Parse is the initial entry point for all extended modules. All validation checks and processing will be performed here
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/socks/socks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
merlinJob "github.com/Ne0nd0g/merlin-message/jobs"

// Internal
"github.com/Ne0nd0g/merlin/pkg/core"
"github.com/Ne0nd0g/merlin/v2/pkg/core"
)

// listeners is a map of single TCP bound interfaces associated keyed to a specific agent ID
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/srdi/srdi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"strings"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/modules/shellcode"
"github.com/Ne0nd0g/merlin/v2/pkg/modules/shellcode"
)

// Parse is the initial entry point for all extended modules. All validation checks and processing will be performed here
Expand Down
2 changes: 1 addition & 1 deletion pkg/modules/winapi/createprocess/createProcess.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"fmt"

// Merlin
"github.com/Ne0nd0g/merlin/pkg/modules/shellcode"
"github.com/Ne0nd0g/merlin/v2/pkg/modules/shellcode"
)

// Parse is the initial entry point for all extended modules. All validation checks and processing will be performed here
Expand Down
2 changes: 1 addition & 1 deletion pkg/opaque/opaque.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/Ne0nd0g/merlin-message/opaque"

// Internal
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
)

// Server is the structure that holds information for the various steps of the OPAQUE protocol as the server
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/rpc.proto
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";

option go_package = "github.com/Ne0nd0g/merlin/pkg/rpc";
option go_package = "github.com/Ne0nd0g/merlin/v2/pkg/rpc";
import "google/protobuf/empty.proto";
//import "google/protobuf/struct.proto";
package rpc;
Expand Down
10 changes: 5 additions & 5 deletions pkg/servers/http/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
// Standard
"crypto/sha256"
"fmt"
"github.com/Ne0nd0g/merlin/pkg/logging"
"github.com/Ne0nd0g/merlin/v2/pkg/logging"
"io"
"log/slog"
"net/http"
Expand All @@ -36,10 +36,10 @@ import (
"github.com/google/uuid"

// Internal
"github.com/Ne0nd0g/merlin/pkg/client/message"
"github.com/Ne0nd0g/merlin/pkg/client/message/memory"
"github.com/Ne0nd0g/merlin/pkg/core"
message2 "github.com/Ne0nd0g/merlin/pkg/services/message"
"github.com/Ne0nd0g/merlin/v2/pkg/client/message"
"github.com/Ne0nd0g/merlin/v2/pkg/client/message/memory"
"github.com/Ne0nd0g/merlin/v2/pkg/core"
message2 "github.com/Ne0nd0g/merlin/v2/pkg/services/message"
)

// Handler contains contextual information and methods to process HTTP traffic for Agents
Expand Down
Loading

0 comments on commit b61ae73

Please sign in to comment.