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.

Sign up for GitHub

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

Jump to bottom

Magma #2874

Merged
merged 69 commits into from
Feb 14, 2024
Merged

Magma #2874

merged 69 commits into from
Feb 14, 2024

Conversation

elegantmoose
Copy link
Contributor

@elegantmoose elegantmoose commented Feb 11, 2024 •
edited
Loading

Description

Corresponding Magma changes to core.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works

@elegantmoose elegantmoose self-assigned this Feb 11, 2024
argaudreau and others added 29 commits February 11, 2024 10:18
@argaudreau @elegantmoose
Add tactic breakdown to adversary profiles
0abc5bc
@argaudreau @elegantmoose
Rename tactic breakdown var
0b757d6
@argaudreau @elegantmoose
Serve bundled VueJS app
8670720
@argaudreau @elegantmoose
Add flag to run VueJS server alongside main server
3f6b938
@argaudreau @elegantmoose
Update README, front-end folder
995e993
@argaudreau @elegantmoose
Move front end template to magma repo
bddc056
@argaudreau @elegantmoose
Remove submodule for magma
a860ab5
@ZacharyLPalmer @argaudreau
@JamieScottC @elegantmoose
Adding Log In/Out and CORS functionality for the Vue dev Server (#2617)
91edc4a 
* Enable cors in server

* cors now working with login api

* return status 401 on wrong credentials

* cleaning up the app_svc file a bit

* change logout endpoint to stop serving template

* CORS now working on localhost:3000

* Add aiohttp-cors to requirements file

* Removing magma as a submodule in order to pass git tests

* Remove magma submodule

* Add back optional param for requirements

* Add compiled front-end dist directory

Co-authored-by: Adam Gaudreau <agaudreau@mitre.org>
Co-authored-by: Palmer <zpalmer@mm273285-pc.lan>
Co-authored-by: JamieScottC <scott.jams@gmail.com>
@argaudreau @elegantmoose
Fix tox test errors
b7dc0fc
@argaudreau @elegantmoose
Modify server to accomodate magma as a plugin
8b7941b
@argaudreau @elegantmoose
Enable CORS for POST, PATCH, PUT, and DELETE
fe41c46
@argaudreau @elegantmoose
Add host option to uidev flag
9d717df
@argaudreau @elegantmoose
Add CORS for plugin endpoints
8ff7a15
@morinjmit @elegantmoose
add magma to .gitmodules
6fad322
@morinjmit @elegantmoose
fix magma submodule
cd96ec1
@JamieScottC @elegantmoose
add endpoint for contact list
aa98fb0
@JamieScottC @elegantmoose
add health info for red or blue info
a81ff21
@JamieScottC @elegantmoose
add catch all route for prod
9028ac9
@JamieScottC @elegantmoose
fix: add static route for legacy support
53add9f
@JamieScottC @elegantmoose
fix: stop docs from redirecting to 404
085327c
@JamieScottC @elegantmoose
feat: add build flag when starting server
d958605
@JamieScottC @elegantmoose
add subprocess
4ef44da
@JamieScottC @elegantmoose
check if dist directory exists when starting dev server
ef3c3d2
@JamieScottC @elegantmoose
add subprocess to run npm install with --build
ae49f56
@JamieScottC @elegantmoose
add operations summary endpoint
8be3f70
@JamieScottC @elegantmoose
temp payloads endpoint
9a10eb7
@clenk @elegantmoose
Make fact traits for reachable hosts configurable
eeb3063
@clenk @elegantmoose
(WIP) Add payload api handler
cb8c28f
@clenk @elegantmoose
Fix payload api handler
d02ba1d
@elegantmoose elegantmoose changed the title Draft: Magma Magma Feb 13, 2024
elegantmoose
elegantmoose commented Feb 14, 2024
View reviewed changes
Copy link
Contributor Author

@elegantmoose elegantmoose left a comment

Choose a reason for hiding this comment

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

Good for merge.

Continue to work on issues:

  • pytest asyncio bug for certain GET requests
  • Operation graph edge display

@elegantmoose elegantmoose merged commit 9ceb72d into master Feb 14, 2024
5 of 10 checks passed
@elegantmoose elegantmoose deleted the magma branch February 14, 2024 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@elegantmoose elegantmoose

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@elegantmoose @thegreatpayload @argaudreau @ZacharyLPalmer @morinjmit @JamieScottC @clenk