Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new micro plans #125

Merged
merged 25 commits into from
Apr 17, 2023
Merged

add new micro plans #125

merged 25 commits into from
Apr 17, 2023

Conversation

mticmtic
Copy link
Contributor

No description provided.

Copy link
Contributor

@mehaase mehaase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a review focusing on the documentation; didn't review/comment heavily on code except to note places where we've checked in binary files that should be removed, gitignored, and built in the github action instead.

.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Show resolved Hide resolved
micro_emulation_plans/README.md Outdated Show resolved Hide resolved
micro_emulation_plans/README.md Outdated Show resolved Hide resolved
micro_emulation_plans/README.md Outdated Show resolved Hide resolved
micro_emulation_plans/src/user_execution/README.md Outdated Show resolved Hide resolved
- Application: Microsoft Visual Studio

1. Use [this cyberchef link](https://gchq.github.io/CyberChef/#recipe=Encode_text('UTF-16LE%20(1200)')To_Base64('A-Za-z0-9%2B/%3D')&input=c2NodGFza3MgL0NyZWF0ZSAvRiAvU0MgTUlOVVRFIC9NTyAzIC9TVCAwNzowMCAvVE4gQ01EVGVzdFRhc2sgL1RSICJjbWQgL2MgZGF0ZSAvVCA%2BIEM6XFdpbmRvd3NcVGVtcFxjdXJyZW50X2RhdGUudHh0Ig), replacing the `input` with the desired PowerShell commands
2. Paste the `output` from CyberChef into a new file `README.md`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double checking the instructions here. A "new" README.md will overwrite the existing one. Might be easier to explain that you edit README.md and replace the contents with the new b64 string?

Also is it really necessary (I'm not sure how VS handles resources) to edit Resource1.resx if the new README has the same name as the oldone?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed phrasing to make a little more clear. I haven't tested just replacing the file or overwriting it in the folder and then building but afaik that should not post any issues

@mehaase
Copy link
Contributor

mehaase commented Apr 14, 2023

Added some comments above; also note that the windows build is failing with several errors like this:

Error: error: unable to create file wizard_spider/Resources/TrickBot/TrickBotClientExe/packages/Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.4/Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.4.nupkg: Filename too long

We had the same issue with the last transfer from private repo to public. The added path component /micro_emulation_plans pushes some of these strings over the limit. Solving this error may vary from case to case. In this particular case, we probably don't need to check in .nupkg if the github action is going to run nuget, right?

zoee-gif and others added 6 commits April 14, 2023 10:10
removed codev badge, changed 'micro emulation plans' to h2 header, fixed 'emulate/s' mismatch, removed errant backtick, fixed relative url,
Fixed TA008 link
@mticmtic
Copy link
Contributor Author

mticmtic commented Apr 14, 2023

Added some comments above; also note that the windows build is failing with several errors like this:

Error: error: unable to create file wizard_spider/Resources/TrickBot/TrickBotClientExe/packages/Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.4/Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.4.nupkg: Filename too long

We had the same issue with the last transfer from private repo to public. The added path component /micro_emulation_plans pushes some of these strings over the limit. Solving this error may vary from case to case. In this particular case, we probably don't need to check in .nupkg if the github action is going to run nuget, right?

These resources are not part of micro plans so i'm not sure how the micro_emulation_plan strings affect, but i added lines to .gitignore to omit certain nuget files which didn't seem to fix the issue. I also tried to override the length limit with git config --system core.longpaths true but was unsuccessful

@mehaase i could use some extra help on this

@mehaase
Copy link
Contributor

mehaase commented Apr 14, 2023

These resources are not part of micro plans

Oh, good point. Maybe when we run nuget restore, it’s running for all the plans? I’m on mobile atm but we could look at the build logs to find out.

@mehaase
Copy link
Contributor

mehaase commented Apr 14, 2023

I checked the build logs and its failing while checking out our repo. That's weird because this same repo was running fine recently, right? I don't know what changed. We should nuke this whole packages/ directory: https://github.com/center-for-threat-informed-defense/adversary_emulation_library/tree/master/wizard_spider/Resources/TrickBot/TrickBotClientExe/packages (and any others like it).

@mehaase mehaase merged commit ee05f95 into master Apr 17, 2023
@mehaase mehaase deleted the update_micro branch April 17, 2023 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants