Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions implants/imix/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ async fn main_loop(config_path: String, loop_count_max: Option<i32>) -> Result<(
let imix_config: imix::Config = serde_json::from_reader(config_file)?;

// This hashmap tracks all tasks by their ID (key) and a tuple value: (future, channel_reciever)
let mut all_exec_futures: HashMap<i32, AsyncTask> = HashMap::new();
let mut all_exec_futures: HashMap<i64, AsyncTask> = HashMap::new();
// This hashmap tracks all tasks output
let mut all_task_res_map: HashMap<i32, Vec<TaskOutput>> = HashMap::new();
let mut all_task_res_map: HashMap<i64, Vec<TaskOutput>> = HashMap::new();

let principal = match get_principal() {
Ok(username) => username,
Expand Down Expand Up @@ -402,8 +402,8 @@ async fn main_loop(config_path: String, loop_count_max: Option<i32>) -> Result<(
std::thread::sleep(std::time::Duration::new(time_to_sleep as u64, 24601)); // This just sleeps our thread.

// :clap: :clap: make new map!
let mut running_exec_futures: HashMap<i32, AsyncTask> = HashMap::new();
let mut running_task_res_map: HashMap<i32, Vec<TaskOutput>> = all_task_res_map.clone();
let mut running_exec_futures: HashMap<i64, AsyncTask> = HashMap::new();
let mut running_task_res_map: HashMap<i64, Vec<TaskOutput>> = all_task_res_map.clone();

if debug {
println!(
Expand Down
4 changes: 2 additions & 2 deletions tavern/internal/c2/c2.proto
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ message Beacon {

// Task instructions for the beacon to execute.
message Task {
int32 id = 1;
int64 id = 1;
string eldritch = 2;
map<string, string> parameters = 3;
}
Expand All @@ -56,7 +56,7 @@ message TaskError {

// TaskOutput provides information about a running task.
message TaskOutput {
int32 id = 1;
int64 id = 1;
string output = 2;
TaskError error = 3;

Expand Down
12 changes: 6 additions & 6 deletions tavern/internal/c2/c2pb/c2.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tavern/internal/c2/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (srv *Server) ClaimTasks(ctx context.Context, req *c2pb.ClaimTasksRequest)
}
}
resp.Tasks = append(resp.Tasks, &c2pb.Task{
Id: int32(claimedTask.ID),
Id: int64(claimedTask.ID),
Eldritch: claimedTome.Eldritch,
Parameters: params,
})
Expand Down