Started rewriting JSON task to custom binary structure. Parsed and serialized task object into seq[byte]
This commit is contained in:
Jakob Friedl
0
src/common/crypto.nim
Normal file
0
src/common/crypto.nim
Normal file
66
src/common/serialize.nim
Normal file
66
src/common/serialize.nim
Normal file
@@ -0,0 +1,66 @@
|
||||
import streams, strutils
|
||||
import ./types
|
||||
|
||||
type
|
||||
Packer* = ref object
|
||||
headerStream: StringStream
|
||||
payloadStream: StringStream
|
||||
|
||||
proc initTaskPacker*(): Packer =
|
||||
result = new Packer
|
||||
result.headerStream = newStringStream()
|
||||
result.payloadStream = newStringStream()
|
||||
|
||||
proc addToHeader*[T: uint8 | uint16 | uint32 | uint64](packer: Packer, value: T): Packer {.discardable.} =
|
||||
packer.headerStream.write(value)
|
||||
return packer
|
||||
|
||||
proc addToPayload*[T: uint8 | uint16 | uint32 | uint64](packer: Packer, value: T): Packer {.discardable.} =
|
||||
packer.payloadStream.write(value)
|
||||
return packer
|
||||
|
||||
proc addDataToHeader*(packer: Packer, data: openArray[byte]): Packer {.discardable.} =
|
||||
packer.headerStream.writeData(data[0].unsafeAddr, data.len)
|
||||
return packer
|
||||
|
||||
proc addDataToPayload*(packer: Packer, data: openArray[byte]): Packer {.discardable.} =
|
||||
packer.payloadStream.writeData(data[0].unsafeAddr, data.len)
|
||||
return packer
|
||||
|
||||
proc addArgument*(packer: Packer, arg: TaskArg): Packer {.discardable.} =
|
||||
|
||||
if arg.data.len <= 0:
|
||||
# Optional argument was passed as "", ignore
|
||||
return
|
||||
|
||||
packer.addToPayload(arg.argType)
|
||||
|
||||
case arg.argType:
|
||||
of cast[uint8](STRING), cast[uint8](BINARY):
|
||||
# Add length for variable-length data types
|
||||
packer.addToPayload(cast[uint32](arg.data.len))
|
||||
packer.addDataToPayload(arg.data)
|
||||
else:
|
||||
packer.addDataToPayload(arg.data)
|
||||
return packer
|
||||
|
||||
proc packPayload*(packer: Packer): seq[byte] =
|
||||
packer.payloadStream.setPosition(0)
|
||||
let data = packer.payloadStream.readAll()
|
||||
|
||||
result = newSeq[byte](data.len)
|
||||
for i, c in data:
|
||||
result[i] = byte(c.ord)
|
||||
|
||||
packer.payloadStream.setPosition(0)
|
||||
|
||||
proc packHeader*(packer: Packer): seq[byte] =
|
||||
packer.headerStream.setPosition(0)
|
||||
let data = packer.headerStream.readAll()
|
||||
|
||||
# Convert string to seq[byte]
|
||||
result = newSeq[byte](data.len)
|
||||
for i, c in data:
|
||||
result[i] = byte(c.ord)
|
||||
|
||||
packer.headerStream.setPosition(0)
|
||||
149
src/common/types.nim
Normal file
149
src/common/types.nim
Normal file
@@ -0,0 +1,149 @@
|
||||
import prompt
|
||||
import tables
|
||||
import times
|
||||
import streams
|
||||
|
||||
# Custom Binary Task structure
|
||||
const
|
||||
MAGIC* = 0x514E3043'u32 # Magic value: C0NQ
|
||||
VERSION* = 1'u8 # Version 1l
|
||||
HEADER_SIZE* = 32'u8 # 32 bytes fixed packet header size
|
||||
|
||||
type
|
||||
PacketType* = enum
|
||||
MSG_TASK = 0'u8
|
||||
MSG_RESPONSE = 1'u8
|
||||
MSG_REGISTER = 100'u8
|
||||
|
||||
ArgType* = enum
|
||||
STRING = 0'u8
|
||||
INT = 1'u8
|
||||
LONG = 2'u8
|
||||
BOOL = 3'u8
|
||||
BINARY = 4'u8
|
||||
|
||||
HeaderFlags* = enum
|
||||
# Flags should be powers of 2 so they can be connected with or operators
|
||||
FLAG_PLAINTEXT = 0'u16
|
||||
FLAG_ENCRYPTED = 1'u16
|
||||
|
||||
CommandType* = enum
|
||||
CMD_SLEEP = 0'u16
|
||||
CMD_SHELL = 1'u16
|
||||
CMD_PWD = 2'u16
|
||||
CMD_CD = 3'u16
|
||||
CMD_LS = 4'u16
|
||||
CMD_RM = 5'u16
|
||||
CMD_RMDIR = 6'u16
|
||||
CMD_MOVE = 7'u16
|
||||
CMD_COPY = 8'u16
|
||||
|
||||
StatusType* = enum
|
||||
STATUS_COMPLETED = 0'u8
|
||||
STATUS_FAILED = 1'u8
|
||||
|
||||
ResultType* = enum
|
||||
RESULT_STRING = 0'u8
|
||||
RESULT_BINARY = 1'u8
|
||||
|
||||
Header* = object
|
||||
magic*: uint32 # [4 bytes ] magic value
|
||||
version*: uint8 # [1 byte ] protocol version
|
||||
packetType*: uint8 # [1 byte ] message type
|
||||
flags*: uint16 # [2 bytes ] message flags
|
||||
seqNr*: uint32 # [4 bytes ] sequence number / nonce
|
||||
size*: uint32 # [4 bytes ] size of the payload body
|
||||
hmac*: array[16, byte] # [16 bytes] hmac for message integrity
|
||||
|
||||
TaskArg* = object
|
||||
argType*: uint8 # [1 byte ] argument type
|
||||
data*: seq[byte] # variable length data (for variable data types (STRING, BINARY), the first 4 bytes indicate data length)
|
||||
|
||||
Task* = object
|
||||
header*: Header
|
||||
|
||||
taskId*: uint32 # [4 bytes ] task id
|
||||
agentId*: uint32 # [4 bytes ] agent id
|
||||
listenerId*: uint32 # [4 bytes ] listener id
|
||||
timestamp*: uint32 # [4 bytes ] unix timestamp
|
||||
command*: uint16 # [2 bytes ] command id
|
||||
argCount*: uint8 # [1 byte ] number of arguments
|
||||
args*: seq[TaskArg] # variable length arguments
|
||||
|
||||
TaskResult* = object
|
||||
header*: Header
|
||||
|
||||
taskId*: uint32 # [4 bytes ] task id
|
||||
agentId*: uint32 # [4 bytes ] agent id
|
||||
listenerId*: uint32 # [4 bytes ] listener id
|
||||
timestamp*: uint32 # [4 bytes ] unix timestamp
|
||||
command*: uint16 # [2 bytes ] command id
|
||||
status*: uint8 # [1 byte ] success flag
|
||||
resultType*: uint8 # [1 byte ] result data type (string, binary)
|
||||
length*: uint32 # [4 bytes ] result length
|
||||
data*: seq[byte] # variable length result
|
||||
|
||||
# Commands
|
||||
Argument* = object
|
||||
name*: string
|
||||
description*: string
|
||||
argumentType*: ArgType
|
||||
isRequired*: bool
|
||||
|
||||
Command* = object
|
||||
name*: string
|
||||
commandType*: CommandType
|
||||
description*: string
|
||||
example*: string
|
||||
arguments*: seq[Argument]
|
||||
dispatchMessage*: string
|
||||
|
||||
# Agent structure
|
||||
type
|
||||
AgentRegistrationData* = object
|
||||
username*: string
|
||||
hostname*: string
|
||||
domain*: string
|
||||
ip*: string
|
||||
os*: string
|
||||
process*: string
|
||||
pid*: int
|
||||
elevated*: bool
|
||||
sleep*: int
|
||||
|
||||
Agent* = ref object
|
||||
name*: string
|
||||
listener*: string
|
||||
username*: string
|
||||
hostname*: string
|
||||
domain*: string
|
||||
process*: string
|
||||
pid*: int
|
||||
ip*: string
|
||||
os*: string
|
||||
elevated*: bool
|
||||
sleep*: int
|
||||
jitter*: float
|
||||
tasks*: seq[seq[byte]]
|
||||
firstCheckin*: DateTime
|
||||
latestCheckin*: DateTime
|
||||
|
||||
# Listener structure
|
||||
type
|
||||
Protocol* = enum
|
||||
HTTP = "http"
|
||||
|
||||
Listener* = ref object
|
||||
name*: string
|
||||
address*: string
|
||||
port*: int
|
||||
protocol*: Protocol
|
||||
|
||||
# Server structure
|
||||
type
|
||||
Conquest* = ref object
|
||||
prompt*: Prompt
|
||||
dbPath*: string
|
||||
listeners*: Table[string, Listener]
|
||||
agents*: Table[string, Agent]
|
||||
interactAgent*: Agent
|
||||
Reference in New Issue
Block a user