v3.2.20-rc1

fixed issue with stat tracking for new socks/rpfwd ports
its-a-feature · Mar 8, 2024 · 23e5c2f · 23e5c2f
1 parent 5b67741
commit 23e5c2f
Show file tree

Hide file tree

Showing 15 changed files with 147 additions and 142 deletions.
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.20-rc1] - 2024-03-08
+
+### Changed
+
+- Fixed an issue where port usage wasn't getting tracked for new ports
+
 ## [3.2.19] - 2024-03-05
 
 ### Changed

diff --git a/MythicReactUI/CHANGELOG.MD b/MythicReactUI/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).
 
+## [0.1.80] - 2024-03-08
+
+### Changed
+
+- Updated callback select to be sorted descending
+
 ## [0.1.79] - 2024-03-06
 
 ### Changed

diff --git a/MythicReactUI/package-lock.json b/MythicReactUI/package-lock.json
diff --git a/MythicReactUI/src/components/pages/Callbacks/CallbacksTable.js b/MythicReactUI/src/components/pages/Callbacks/CallbacksTable.js
@@ -381,6 +381,32 @@ function CallbacksTablePreMemo(props){
     )
 }
 export const CallbacksTable = React.memo(CallbacksTablePreMemo);
+const accessorFn = (row, h) => {
+    if(h.type === "date"){
+        return new Date(row[h.key] || 0);
+    }
+    if(h.type === "number" || h.type === "size"){
+        try{
+            return Number(row[h.key] || NaN);
+        }catch(error){
+            return row[h.key] || 0;
+        }
+    }
+    if(h.name === "Groups"){
+        return row.mythictree_groups.join(", ");
+    }
+    if(h.name === "IP"){
+        try{
+            return JSON.parse(row[h.key])[0];
+        }catch(error){
+            return row[h.key];
+        }
+    }
+    if(h.name === "Agent"){
+        return row.payload.payloadtype.name;
+    }
+    return row[h.key] || "";
+};
 function CallbacksTableMaterialReactTablePreMemo(props){
     const callbacks = useContext(CallbacksContext);
     const theme = useTheme();
@@ -487,7 +513,49 @@ function CallbacksTableMaterialReactTablePreMemo(props){
         }
         localStorage.setItem("callbacks_table_columns", JSON.stringify(shown));
     }, [columnVisibility]);
-
+    const localCellRender = React.useCallback( ({cell, h}) => {
+        let row = cell.row?.original;
+        switch(h.name){
+            case "Interact":
+                return <CallbacksTableIDCell
+                    rowData={row}
+                    //onOpenTab={props.onOpenTab}
+                    updateDescription={updateDescriptionSubmit}
+                    setOpenHideMultipleDialog={setOpenHideMultipleDialog}
+                    setOpenTaskMultipleDialog={setOpenTaskMultipleDialog}
+                />;
+            case "Groups":
+                return <CallbacksTableStringCell cellData={row.mythictree_groups.join(", ")} />;
+            case "IP":
+                return <CallbacksTableIPCell  cellData={row.ip} rowData={row} callback_id={row.id} />;
+            case "External IP":
+                return <CallbacksTableStringCell  cellData={row.external_ip} rowData={row} />;
+            case "Host":
+                return <CallbacksTableStringCell cellData={row.host} rowData={row} />;
+            case "User":
+                return <CallbacksTableStringCell  cellData={row.user} rowData={row} />;
+            case "Domain":
+                return <CallbacksTableStringCell  cellData={row.domain} rowData={row} />;
+            case "OS":
+                return <CallbacksTableOSCell rowData={row} cellData={row.os} />;
+            case "Arch":
+                return <CallbacksTableStringCell  rowData={row} cellData={row.architecture} />;
+            case "PID":
+                return <CallbacksTableStringCell  cellData={row.pid} rowData={row} />;
+            case "Last Checkin":
+                return <CallbacksTableLastCheckinCell  rowData={row} cellData={row.last_checkin} />;
+            case "Description":
+                return <CallbacksTableStringCell  cellData={row.description} rowData={row} />;
+            case "Sleep":
+                return <CallbacksTableSleepCell rowData={row} cellData={row.sleep_info} updateSleepInfo={updateSleepInfo} />;
+            case "Agent":
+                return <CallbacksTablePayloadTypeCell  rowData={row} cellData={row.payload.payloadtype.name}/>;
+            case "C2":
+                return <CallbacksTableC2Cell  rowData={row} />
+            case "Process Name":
+                return <CallbacksTableStringCell  cellData={row.process_name} rowData={row} />;
+        }
+    }, []);
     const columns = React.useMemo( () => columnFields.map( h => {
         return {
             accessorKey: h.key,
@@ -501,75 +569,8 @@ function CallbacksTableMaterialReactTablePreMemo(props){
             enableSorting: !h.disableSort,
             enableColumnFilter: true,
             grow: h.fillWidth,
-            accessorFn: (row) => {
-                if(h.type === "date"){
-                    return new Date(row[h.key] || 0);
-                }
-                if(h.type === "number" || h.type === "size"){
-                    try{
-                        return Number(row[h.key] || NaN);
-                    }catch(error){
-                        return row[h.key] || 0;
-                    }
-                }
-                if(h.name === "Groups"){
-                    return row.mythictree_groups.join(", ");
-                }
-                if(h.name === "IP"){
-                    try{
-                        return JSON.parse(row[h.key])[0];
-                    }catch(error){
-                        return row[h.key];
-                    }
-                }
-                if(h.name === "Agent"){
-                    return row.payload.payloadtype.name;
-                }
-                return row[h.key] || "";
-            },
-            Cell: ({cell, renderedCellValue}) => {
-                let row = cell.row?.original;
-                switch(h.name){
-                    case "Interact":
-                        return <CallbacksTableIDCell
-                            rowData={row}
-                            //onOpenTab={props.onOpenTab}
-                            updateDescription={updateDescriptionSubmit}
-                            setOpenHideMultipleDialog={setOpenHideMultipleDialog}
-                            setOpenTaskMultipleDialog={setOpenTaskMultipleDialog}
-                        />;
-                    case "Groups":
-                        return <CallbacksTableStringCell cellData={row.mythictree_groups.join(", ")} />;
-                    case "IP":
-                        return <CallbacksTableIPCell  cellData={row.ip} rowData={row} callback_id={row.id} />;
-                    case "External IP":
-                        return <CallbacksTableStringCell  cellData={row.external_ip} rowData={row} />;
-                    case "Host":
-                        return <CallbacksTableStringCell cellData={row.host} rowData={row} />;
-                    case "User":
-                        return <CallbacksTableStringCell  cellData={row.user} rowData={row} />;
-                    case "Domain":
-                        return <CallbacksTableStringCell  cellData={row.domain} rowData={row} />;
-                    case "OS":
-                        return <CallbacksTableOSCell rowData={row} cellData={row.os} />;
-                    case "Arch":
-                        return <CallbacksTableStringCell  rowData={row} cellData={row.architecture} />;
-                    case "PID":
-                        return <CallbacksTableStringCell  cellData={row.pid} rowData={row} />;
-                    case "Last Checkin":
-                        return <CallbacksTableLastCheckinCell  rowData={row} cellData={row.last_checkin} />;
-                    case "Description":
-                        return <CallbacksTableStringCell  cellData={row.description} rowData={row} />;
-                    case "Sleep":
-                        return <CallbacksTableSleepCell rowData={row} cellData={row.sleep_info} updateSleepInfo={updateSleepInfo} />;
-                    case "Agent":
-                        return <CallbacksTablePayloadTypeCell  rowData={row} cellData={row.payload.payloadtype.name}/>;
-                    case "C2":
-                        return <CallbacksTableC2Cell  rowData={row} />
-                    case "Process Name":
-                        return <CallbacksTableStringCell  cellData={row.process_name} rowData={row} />;
-                }
-            }
+            accessorFn: (row) => accessorFn(row, h),
+            Cell: ({cell}) => localCellRender({cell, h})
         }
     }), [columnFields])
     const materialReactTable = useMaterialReactTable({

diff --git a/MythicReactUI/src/components/pages/Callbacks/CallbacksTableRow.js b/MythicReactUI/src/components/pages/Callbacks/CallbacksTableRow.js
@@ -369,11 +369,11 @@ export const CallbacksTableLastCheckinCell = React.memo( ({rowData, cellData}) =
         return newTime;
     }
     if(rowData?.payload?.payloadtype?.agent_type !== "agent"){
-        return "Streaming Now..."
+        return ""
     }
     return (
         <div>
-                <Moment filter={adjustOutput} interval={500} parse={"YYYY-MM-DDTHH:mm:ss.SSSSSSZ"}
+                <Moment filter={adjustOutput} interval={1000} parse={"YYYY-MM-DDTHH:mm:ss.SSSSSSZ"}
                     withTitle
                     titleFormat={"YYYY-MM-DD HH:mm:ss"}
                     fromNow ago
@@ -383,7 +383,7 @@ export const CallbacksTableLastCheckinCell = React.memo( ({rowData, cellData}) =
         </div>
 
     )
-});
+}, areEqual);
 export const CallbacksTablePayloadTypeCell = React.memo( ({rowData}) => {
     return (
         <MythicStyledTooltip title={rowData?.payload?.payloadtype?.name}>
@@ -630,7 +630,7 @@ export const CallbacksTableOSCell = React.memo( ({rowData, cellData}) => {
 
 
     )
-});
+}, areEqual);
 export const CallbacksTableSleepCell = React.memo( ({rowData, cellData, updateSleepInfo}) => {
     const theme = useTheme();
     const [openSleepDialog, setOpenSleepDialog] = React.useState(false);

diff --git a/MythicReactUI/src/components/pages/Callbacks/TaskFromUIButton.js b/MythicReactUI/src/components/pages/Callbacks/TaskFromUIButton.js
@@ -173,6 +173,7 @@ export const TaskFromUIButton = ({callback_id, callback_ids, cmd, ui_feature, pa
                 onTasked({tasked: false});
                 return;
             }
+            callbackOpts.sort( (a, b) => a.id < b.id ? 1 : -1);
             setCallbackOptions(callbackOpts);
             setOpenSelectCallback(true);
         }

diff --git a/MythicReactUI/src/index.js b/MythicReactUI/src/index.js
@@ -14,8 +14,8 @@ import {snackActions} from './components/utilities/Snackbar';
 import jwt_decode from 'jwt-decode';
 import {meState} from './cache';
 
-export const mythicVersion = "3.2.19";
-export const mythicUIVersion = "0.1.79";
+export const mythicVersion = "3.2.20-rc1";
+export const mythicUIVersion = "0.1.80";
 
 let fetchingNewToken = false;
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.19
+3.2.20-rc1