v3.2.2

its-a-feature · its-a-feature · commit 3adbcd0e435f · 2023-11-17T10:11:50.000-06:00
bug fix
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.2] - 2023-11-17
+
+### Changed
+
+- Adjusted channel size to help with TOCTTOU issue
+
 ## [3.2.1] - 2023-11-17
 
 ### Changed
diff --git a/MythicReactUI/src/index.js b/MythicReactUI/src/index.js
@@ -14,7 +14,7 @@ import {snackActions} from './components/utilities/Snackbar';
 import jwt_decode from 'jwt-decode';
 import {meState} from './cache';
 
-export const mythicVersion = "3.2.0";
+export const mythicVersion = "3.2.2";
 export const mythicUIVersion = "0.1.31";
 
 let fetchingNewToken = false;
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/mythic-docker/src/rabbitmq/util_agent_message_actions_post_response.go b/mythic-docker/src/rabbitmq/util_agent_message_actions_post_response.go
@@ -205,7 +205,7 @@ type writeDownloadChunkToDisk struct {
 	ChunksWritten   chan int
 }
 
-var writeDownloadChunkToDiskChan = make(chan writeDownloadChunkToDisk, 1)
+var writeDownloadChunkToDiskChan = make(chan writeDownloadChunkToDisk)
 
 func handleAgentMessagePostResponse(incoming *map[string]interface{}, uUIDInfo *cachedUUIDInfo) (map[string]interface{}, error) {
 	// got message:
@@ -897,6 +897,7 @@ func handleAgentMessagePostResponseDownload(task databaseStructs.Task, agentResp
 					//base64DecodedFileData := make([]byte, base64.StdEncoding.DecodedLen(len(*agentResponse.Download.ChunkData)))
 					//totalBase64Bytes, err := base64.StdEncoding.Decode(base64DecodedFileData, []byte(*agentResponse.Download.ChunkData))
 					if err != nil {
+						logging.LogError(err, "Failed to base64 decode data to write to disk, bailing out")
 						return "", err
 					}
 					//logging.LogDebug("0. about to have mythic write to disk", "chunk num", *agentResponse.Download.ChunkNum, "byte sample", string(base64DecodedFileData[:10]))
diff --git a/mythic-react-docker/mythic/public/asset-manifest.json b/mythic-react-docker/mythic/public/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/new/static/css/main.00d51b79.css",
-    "main.js": "/new/static/js/main.23a6754b.js",
+    "main.js": "/new/static/js/main.5660a092.js",
     "static/media/mythic@2x.png": "/new/static/media/mythic@2x.7c5b62b471ac779fd706.png",
     "static/media/mythic_red_small.svg": "/new/static/media/mythic_red_small.793b41cc7135cdede246661ec232976b.svg",
     "index.html": "/new/index.html",
     "main.00d51b79.css.map": "/new/static/css/main.00d51b79.css.map",
-    "main.23a6754b.js.map": "/new/static/js/main.23a6754b.js.map"
+    "main.5660a092.js.map": "/new/static/js/main.5660a092.js.map"
   },
   "entrypoints": [
     "static/css/main.00d51b79.css",
-    "static/js/main.23a6754b.js"
+    "static/js/main.5660a092.js"
   ]
 }
diff --git a/mythic-react-docker/mythic/public/index.html b/mythic-react-docker/mythic/public/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.23a6754b.js"></script><link href="/new/static/css/main.00d51b79.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.5660a092.js"></script><link href="/new/static/css/main.00d51b79.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/mythic-react-docker/mythic/public/static/js/main.5660a092.js b/mythic-react-docker/mythic/public/static/js/main.5660a092.js
diff --git a/mythic-react-docker/mythic/public/static/js/main.5660a092.js.LICENSE.txt b/mythic-react-docker/mythic/public/static/js/main.5660a092.js.LICENSE.txt
diff --git a/mythic-react-docker/mythic/public/static/js/main.5660a092.js.map b/mythic-react-docker/mythic/public/static/js/main.5660a092.js.map

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ type writeDownloadChunkToDisk struct {`
`205`	`205`	`ChunksWritten chan int`
`206`	`206`	`}`
`207`	`207`
`208`		`-var writeDownloadChunkToDiskChan = make(chan writeDownloadChunkToDisk, 1)`
	`208`	`+var writeDownloadChunkToDiskChan = make(chan writeDownloadChunkToDisk)`
`209`	`209`
`210`	`210`	`func handleAgentMessagePostResponse(incoming map[string]interface{}, uUIDInfo cachedUUIDInfo) (map[string]interface{}, error) {`
`211`	`211`	`// got message:`
`@@ -897,6 +897,7 @@ func handleAgentMessagePostResponseDownload(task databaseStructs.Task, agentResp`
`897`	`897`	`//base64DecodedFileData := make([]byte, base64.StdEncoding.DecodedLen(len(*agentResponse.Download.ChunkData)))`
`898`	`898`	`//totalBase64Bytes, err := base64.StdEncoding.Decode(base64DecodedFileData, []byte(*agentResponse.Download.ChunkData))`
`899`	`899`	`if err != nil {`
	`900`	`+ logging.LogError(err, "Failed to base64 decode data to write to disk, bailing out")`
`900`	`901`	`return "", err`
`901`	`902`	`}`
`902`	`903`	`//logging.LogDebug("0. about to have mythic write to disk", "chunk num", *agentResponse.Download.ChunkNum, "byte sample", string(base64DecodedFileData[:10]))`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"files": {`
`3`	`3`	`"main.css": "/new/static/css/main.00d51b79.css",`
`4`		`- "main.js": "/new/static/js/main.23a6754b.js",`
	`4`	`+ "main.js": "/new/static/js/main.5660a092.js",`
`5`	`5`	`"static/media/[email protected]": "/new/static/media/[email protected]",`
`6`	`6`	`"static/media/mythic_red_small.svg": "/new/static/media/mythic_red_small.793b41cc7135cdede246661ec232976b.svg",`
`7`	`7`	`"index.html": "/new/index.html",`
`8`	`8`	`"main.00d51b79.css.map": "/new/static/css/main.00d51b79.css.map",`
`9`		`- "main.23a6754b.js.map": "/new/static/js/main.23a6754b.js.map"`
	`9`	`+ "main.5660a092.js.map": "/new/static/js/main.5660a092.js.map"`
`10`	`10`	`},`
`11`	`11`	`"entrypoints": [`
`12`	`12`	`"static/css/main.00d51b79.css",`
`13`		`- "static/js/main.23a6754b.js"`
	`13`	`+ "static/js/main.5660a092.js"`
`14`	`14`	`]`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.23a6754b.js"></script><link href="/new/static/css/main.00d51b79.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
	`1`	+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/new/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="apple-touch-icon" href="/new/logo192.png"/><link rel="manifest" href="/new/manifest.json"/><title>Mythic</title><script defer="defer" src="/new/static/js/main.5660a092.js"></script><link href="/new/static/css/main.00d51b79.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>