few UI CLI tweaks

its-a-feature · Nov 6, 2024 · fe59952 · fe59952
1 parent 96fe2e8
commit fe59952
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 29 deletions.
diff --git a/MythicReactUI/CHANGELOG.MD b/MythicReactUI/CHANGELOG.MD
@@ -4,7 +4,14 @@ 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.2.52] - 2024-11-
+## [0.2.53] - 2024-11-6
+
+### Changed
+
+- Removed File as a tab-completable parameter on the CLI
+- Updated tab-completes to use local choices over dynamic query parameters on CLI
+
+## [0.2.52] - 2024-11-5
 
 ### Changed
 

diff --git a/MythicReactUI/src/components/pages/Callbacks/CallbacksTabsTaskingInput.js b/MythicReactUI/src/components/pages/Callbacks/CallbacksTabsTaskingInput.js
@@ -134,7 +134,6 @@ const IsCLIPossibleParameterType = (parameter_type) => {
         case "TypedArray":
         case "ChooseMultiple":
         case "String":
-        case "File":
             return true;
         default:
             return false;
@@ -454,7 +453,15 @@ export function CallbacksTabsTaskingInputPreMemo(props){
                         console.log("lastSuppliedParameter", lastSuppliedParameter, "has_value", lastSuppliedParameterHasValue);
                         lastValueTypedBeforeDynamicParamsRef.current = lastSuppliedParameterHasValue;
                         if (lastSuppliedParameter !== undefined && parsed[lastSuppliedParameter.cli_name] !== undefined && lastSuppliedParameterHasValue === ""){
-                            if(lastSuppliedParameter.dynamic_query_function !== ""){
+                            if (lastSuppliedParameter.choices.length > 0){
+                                tabOptions.current = lastSuppliedParameter.choices;
+                                tabOptionsIndex.current = 0;
+                                tabOptionsType.current = "param_value";
+                                let newChoice = lastSuppliedParameter.choices[0].includes(" ") ? "\"" + lastSuppliedParameter.choices[0] + "\"" : lastSuppliedParameter.choices[0];
+                                let newMsg = message + newChoice;
+                                setMessage(newMsg);
+                                return;
+                            } else if(lastSuppliedParameter.dynamic_query_function !== ""){
                                 setBackdropOpen(true);
                                 //snackActions.info("Querying payload type container for options...",   snackMessageStyles);
                                 getDynamicParams({variables:{
@@ -464,14 +471,6 @@ export function CallbacksTabsTaskingInputPreMemo(props){
                                         payload_type: cmd.payloadtype.name
                                     }});
                                 return;
-                            } else if (lastSuppliedParameter.choices.length > 0){
-                                tabOptions.current = lastSuppliedParameter.choices;
-                                tabOptionsIndex.current = 0;
-                                tabOptionsType.current = "param_value";
-                                let newChoice = lastSuppliedParameter.choices[0].includes(" ") ? "\"" + lastSuppliedParameter.choices[0] + "\"" : lastSuppliedParameter.choices[0];
-                                let newMsg = message + newChoice;
-                                setMessage(newMsg);
-                                return;
                             }
                         }
                         console.log("cmdGroupNames in tab", cmdGroupNames);
@@ -604,7 +603,15 @@ export function CallbacksTabsTaskingInputPreMemo(props){
                             console.log("lastSuppliedParameter", lastSuppliedParameter)
                             lastValueTypedBeforeDynamicParamsRef.current = lastSuppliedParameterHasValue;
                             if (lastSuppliedParameter !== undefined && parsed[lastSuppliedParameter.cli_name] !== undefined){
-                                if(lastSuppliedParameter.dynamic_query_function !== ""){
+                                if (lastSuppliedParameter.choices.length > 0){
+                                    tabOptions.current = lastSuppliedParameter.choices;
+                                    tabOptionsIndex.current = 0;
+                                    tabOptionsType.current = "param_value";
+                                    let newChoice = lastSuppliedParameter.choices[0].includes(" ") ? "\"" + lastSuppliedParameter.choices[0] + "\"" : lastSuppliedParameter.choices[0];
+                                    let newMsg = message + newChoice;
+                                    setMessage(newMsg);
+                                    return;
+                                } else if(lastSuppliedParameter.dynamic_query_function !== ""){
                                     setBackdropOpen(true);
                                     //snackActions.info("Querying payload type container for options...",   snackMessageStyles);
                                     getDynamicParams({variables:{
@@ -614,14 +621,6 @@ export function CallbacksTabsTaskingInputPreMemo(props){
                                             payload_type: cmd.payloadtype.name
                                         }});
                                     return;
-                                } else if (lastSuppliedParameter.choices.length > 0){
-                                    tabOptions.current = lastSuppliedParameter.choices;
-                                    tabOptionsIndex.current = 0;
-                                    tabOptionsType.current = "param_value";
-                                    let newChoice = lastSuppliedParameter.choices[0].includes(" ") ? "\"" + lastSuppliedParameter.choices[0] + "\"" : lastSuppliedParameter.choices[0];
-                                    let newMsg = message + newChoice;
-                                    setMessage(newMsg);
-                                    return;
                                 }
                             }
                             return;

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 mythicUIVersion = "0.2.52";
+export const mythicUIVersion = "0.2.53";
 
 let fetchingNewToken = false;
 

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.602591e6.css",
-    "main.js": "/new/static/js/main.9978d25f.js",
+    "main.js": "/new/static/js/main.add1b9f4.js",
     "static/media/mythic-red.png": "/new/static/media/mythic-red.203468a4e5240d239aa0.png",
     "static/media/mythic_red_small.svg": "/new/static/media/mythic_red_small.793b41cc7135cdede246661ec232976b.svg",
     "index.html": "/new/index.html",
     "main.602591e6.css.map": "/new/static/css/main.602591e6.css.map",
-    "main.9978d25f.js.map": "/new/static/js/main.9978d25f.js.map"
+    "main.add1b9f4.js.map": "/new/static/js/main.add1b9f4.js.map"
   },
   "entrypoints": [
     "static/css/main.602591e6.css",
-    "static/js/main.9978d25f.js"
+    "static/js/main.add1b9f4.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.9978d25f.js"></script><link href="/new/static/css/main.602591e6.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.add1b9f4.js"></script><link href="/new/static/css/main.602591e6.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/public/static/js/main.9978d25f.js → .../mythic/public/static/js/main.add1b9f4.js b/.../mythic/public/static/js/main.9978d25f.js → .../mythic/public/static/js/main.add1b9f4.js
diff --git a/...ic/static/js/main.9978d25f.js.LICENSE.txt → ...ic/static/js/main.add1b9f4.js.LICENSE.txt b/...ic/static/js/main.9978d25f.js.LICENSE.txt → ...ic/static/js/main.add1b9f4.js.LICENSE.txt
diff --git a/...hic/public/static/js/main.9978d25f.js.map → ...hic/public/static/js/main.add1b9f4.js.map b/...hic/public/static/js/main.9978d25f.js.map → ...hic/public/static/js/main.add1b9f4.js.map