Skip to content

Commit

Permalink
fixing bug in UI for choosing commands
Browse files Browse the repository at this point in the history
  • Loading branch information
its-a-feature committed Feb 13, 2024
1 parent e7e00b4 commit d40e3a5
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 16 deletions.
6 changes: 6 additions & 0 deletions MythicReactUI/CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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.66] - 2024-02-13

### Changed

- Fixed a bug where if multiple commands were possible from a button in the UI, selecing one would close but not issue the task

## [0.1.65] - 2024-02-12

### Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export const TaskFromUIButton = ({callback_id, callback_ids, cmd, ui_feature, pa
}
});
const onSubmitSelectedCommand = (cmd) => {
setOpenSelectCommandDialog(false);
setSelectedCommand(cmd);
}
const onSubmitTasking = ({variables}) => {
Expand Down Expand Up @@ -268,7 +269,7 @@ export const TaskFromUIButton = ({callback_id, callback_ids, cmd, ui_feature, pa
onClose={()=>{setOpenSelectCommandDialog(false);onTasked({tasked: false});}}
innerDialog={<MythicSelectFromListDialog onClose={()=>{setOpenSelectCommandDialog(false);onTasked({tasked: false});}}
onSubmit={onSubmitSelectedCommand} options={fileBrowserCommands} title={"Select Command"}
action={"select"} identifier={"id"} display={"cmd"}/>}
action={"select"} identifier={"id"} display={"cmd"} dontCloseOnSubmit={true} />}
/>
}
{openParametersDialog &&
Expand Down
2 changes: 1 addition & 1 deletion MythicReactUI/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import jwt_decode from 'jwt-decode';
import {meState} from './cache';

export const mythicVersion = "3.2.18-rc4";
export const mythicUIVersion = "0.1.65";
export const mythicUIVersion = "0.1.66";

let fetchingNewToken = false;

Expand Down
6 changes: 6 additions & 0 deletions Mythic_CLI/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## 0.2.17 - 2024-02-13

### Changed

- Updated mythic_react to not use volumes since they keep old UI pieces around

## 0.2.16 - 2024-02-13

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Mythic_CLI/src/cmd/config/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ package config

var (
// Version Mythic CLI version
Version = "v0.2.16"
Version = "v0.2.17"
)
12 changes: 8 additions & 4 deletions Mythic_CLI/src/cmd/internal/serviceMetadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,14 @@ func AddMythicService(service string) {
"./mythic-react-docker/mythic/public:/mythic/new",
}
} else {
pStruct["volumes"] = []string{
"mythic_react_volume_config:/etc/nginx",
"mythic_react_volume_public:/mythic/new",
}
delete(pStruct, "volumes")
/*
pStruct["volumes"] = []string{
"mythic_react_volume_config:/etc/nginx",
"mythic_react_volume_public:/mythic/new",
}
*/
}
}
if _, ok := volumes["mythic_react"]; !ok {
Expand Down
2 changes: 1 addition & 1 deletion Mythic_CLI/src/cmd/manager/dockerComposeManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ func (d *DockerComposeManager) Status(verbose bool) {
}
}
if !foundMountInfo {
if container.Labels["name"] == "mythic_graphql" {
if container.Labels["name"] == "mythic_graphql" || container.Labels["name"] == "mythic_react" {
info += "N/A"
} else {
info += "local"
Expand Down
6 changes: 3 additions & 3 deletions mythic-react-docker/mythic/public/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/new/static/css/main.00d51b79.css",
"main.js": "/new/static/js/main.da214fd0.js",
"main.js": "/new/static/js/main.72c89999.js",
"static/media/[email protected]": "/new/static/media/[email protected]",
"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.da214fd0.js.map": "/new/static/js/main.da214fd0.js.map"
"main.72c89999.js.map": "/new/static/js/main.72c89999.js.map"
},
"entrypoints": [
"static/css/main.00d51b79.css",
"static/js/main.da214fd0.js"
"static/js/main.72c89999.js"
]
}
2 changes: 1 addition & 1 deletion mythic-react-docker/mythic/public/index.html
Original file line number Diff line number Diff line change
@@ -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.da214fd0.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.72c89999.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>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit d40e3a5

Please sign in to comment.