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

Bugfix/fix win installation #622

Merged
merged 7 commits into from
Apr 20, 2020
Merged

Bugfix/fix win installation #622

merged 7 commits into from
Apr 20, 2020

Conversation

ShayNehmad
Copy link
Contributor

@ShayNehmad ShayNehmad commented Apr 16, 2020 •
edited
Loading

What is this?

Fixes the MSI installer.

Checklist

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Have you successfully tested your changes locally?
  • Is the TravisCI build passing?

Proof that it works

2012

✅

2012 R2

✅

2016

✅

2019

✅
image

Changes

See commit messages.

@ShayNehmad ShayNehmad added Bug An error, flaw, misbehavior or failure in the Monkey or Monkey Island. Island labels Apr 16, 2020
@ShayNehmad ShayNehmad added this to the 1.8.0 milestone Apr 16, 2020
@ShayNehmad ShayNehmad requested a review from VakarisZ April 16, 2020 20:04
@ShayNehmad ShayNehmad self-assigned this Apr 16, 2020
@ShayNehmad ShayNehmad changed the base branch from develop to release/1.8.0 April 16, 2020 20:04
@ShayNehmad ShayNehmad marked this pull request as draft April 16, 2020 20:04
@codecov
Copy link

codecov bot commented Apr 16, 2020

Codecov Report

Merging #622 into release/1.8.0 will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@              Coverage Diff               @@
##           release/1.8.0     #622   +/-   ##
==============================================
  Coverage          56.73%   56.73%           
==============================================
  Files                115      115           
  Lines               3874     3874           
==============================================
  Hits                2198     2198           
  Misses              1676     1676
Impacted Files Coverage Δ
...y_island/cc/services/attack/mitre_api_interface.py 52.77% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 34e64f5...7ef3c3b. Read the comment docs.

@codecov
Copy link

codecov bot commented Apr 16, 2020 •
edited
Loading

Codecov Report

Merging #622 into release/1.8.0 will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@              Coverage Diff               @@
##           release/1.8.0     #622   +/-   ##
==============================================
  Coverage          56.73%   56.73%           
==============================================
  Files                115      115           
  Lines               3874     3874           
==============================================
  Hits                2198     2198           
  Misses              1676     1676
Impacted Files Coverage Δ
...y_island/cc/services/attack/mitre_api_interface.py 52.77% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 34e64f5...ca505f4. Read the comment docs.

@ShayNehmad ShayNehmad changed the title [WIP] Bugfix/fix win installation Bugfix/fix win installation Apr 16, 2020
@ShayNehmad ShayNehmad marked this pull request as ready for review April 16, 2020 21:06
VakarisZ
VakarisZ reviewed Apr 17, 2020
View reviewed changes
monkey/monkey_island/cc/services/attack/mitre_api_interface.py
@@ -1,6 +1,6 @@
from typing import List, Dict

from stix2 import FileSystemSource, Filter, CourseOfAction, AttackPattern, v20
Copy link
Contributor

Choose a reason for hiding this comment

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

We can rollback these changes since this is was not the problem

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I actually prefer to keep it this way, since v20._* feels like a pretty internal-y thing

@ShayNehmad ShayNehmad merged commit ab4977f into release/1.8.0 Apr 20, 2020
@ShayNehmad ShayNehmad deleted the bugfix/fix-win-installation branch April 27, 2020 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VakarisZ VakarisZ VakarisZ left review comments

Assignees

@ShayNehmad ShayNehmad

Labels
Bug An error, flaw, misbehavior or failure in the Monkey or Monkey Island.
Projects
None yet
Milestone
1.8.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ShayNehmad @VakarisZ