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

Updating my Local Fork #6

Merged
merged 57 commits into from
May 3, 2020
Merged

Updating my Local Fork #6

merged 57 commits into from
May 3, 2020

Conversation

shivank1234
Copy link
Owner

What is this?

Fixes #put issue number here.

Add any further explanations here.

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

If applicable, add screenshots or log transcripts of the feature working

Changes

Are the commit messages enough? If not, elaborate.

ShayNehmad and others added 30 commits October 13, 2019 12:38
@ShayNehmad
Merge pull request #465 from guardicore/463/hotfix/exception-on-aws-n…
5540007 
…etwork-error

463/hotfix/exception on aws network error -> master
@VakarisZ
Refactoring current tests
303dda1
@ShayNehmad
bump duckerfile version
8e04cf2
@ShayNehmad
Updated python version to 3.7
7bab9a0
@VakarisZ
Further improving and refactoring performance test code
0fc5615
@ShayNehmad
No need for bson package in requirements
c72ed36 
Installed with pymongo in a maintained project
@VakarisZ
Refactored and further improved performance test code structure
367017a
@ShayNehmad
Added build-essential to deps, to install packages without precompile…
5c6b9c4 
…d whl

like netifaces
@ShayNehmad
Updating pip and added more messages to the postinstall script
ef5694e
@ShayNehmad
Fixed comment format
7488dea
@ShayNehmad
Trying to change to comments format, since it's messing with dpkg
41f4f3f
@ShayNehmad
Moved comments. For some reason, dpkg-deb can't read them
bd2edee 
moved to postinst
@VakarisZ
Merge remote-tracking branch 'upstream/develop' into map_generation_test
0e2a3a5 
# Conflicts:
#	envs/monkey_zoo/blackbox/test_blackbox.py
@VakarisZ
UI remote monkey run button fix
f922111
@VakarisZ
Minor style changes
e78a8d4
@ShayNehmad
Merge pull request #610 from VakarisZ/1_8_fixes
d8c1407 
1.8 release fixes
@ShayNehmad
Merge branch 'release/1.8.0' into bugfix/1.8.0-fix-deb-python-version
8907a01
@ShayNehmad
Added some more output to the postinst script
90f9f69
@ShayNehmad
Added random seed data to .rnd for openssl to work
305d15c 
This is a known issue with openssl and once ubuntu 18 gets a new version we can delete this
@ShayNehmad
Added a comment which explains the new dd
b95646c
@ShayNehmad
openssl needs to be able to read the .rnd file
f1de8e8
@ShayNehmad
Fix create cert paths in postinst and added debug messages
9d889aa
Brute force fix for #613
fcfbef9
@ShayNehmad
Add some safety check for the .rnd file nonsense
9687b22 
I added more comments, so it must be fine 🔥 🐶 🔥
@ShayNehmad
No need to qualify python since we sourced activate
592fd88 
Added which python it to the debug prints to compensate
Renamed display to log
c00958d
@ShayNehmad
Merge pull request #609 from guardicore/bugfix/1.8.0-fix-deb-python-v…
9d1e163 
…ersion

Bugfix/1.8.0 fix deb python version
@ShayNehmad
Merge pull request #614 from acepace/bugfix/leak_info_when_sending_telem
9aaa84e 
Brute force fix for #613
@VakarisZ
VSFTPD byte string mixup fixes
892caad
@ShayNehmad
Merge pull request #617 from VakarisZ/vsftpd_fix
cbbc158 
VSFTPD byte string mixup fixes
VakarisZ and others added 27 commits April 14, 2020 13:24
@VakarisZ
Added and updated screenshots on readme
3730889
@VakarisZ
Fixing dropdown
22a0bc2
@VakarisZ
Fixed the rest of dropdowns and picture dimensions
b802d83
@VakarisZ
Another mitre attack report picture dimension adjust
2bf7ea5
@VakarisZ
Changed dropdowns to headers in readme
f270f62
@VakarisZ
Bugfixes and debugging comments removed
5fa27c1
@VakarisZ
Merge pull request #618 from VakarisZ/release/1.8.0
34e64f5 
Readme update
@ShayNehmad
Added hidden import and upx exclude
b8fd7c9
@ShayNehmad
Fix bad inport path
d50c339
@ShayNehmad
Added the attack_data folder to the datas
ef3a71a
@ShayNehmad
Default value for positional argument
cb9d493 
Since this is the enrty point for pyinstaller island
@ShayNehmad
Remove the stix2 internals reference
7ef3c3b 
v20
@ShayNehmad
Added pyinstaller hook for stix2 module
fb34584
@ShayNehmad
Trying to disable UPX to make it work on 2012 R2
ca505f4
@ShayNehmad
Merge pull request #622 from guardicore/bugfix/fix-win-installation
ab4977f 
Bugfix/fix win installation
@VakarisZ
Removed mitre cti submodule
61bd40e
@VakarisZ
Added our fork of mitre cti
b51bef1
@VakarisZ
Merge pull request #625 from VakarisZ/mitre_cti_retarget
8a3d4a5 
Mitre cti retarget
@ShayNehmad
Lock WMI version to one that works
b5668c4
@ShayNehmad
Merge pull request #626 from guardicore/bugfix/lock-wmi-version-package
3f00cbb 
Bugfix/lock wmi version package
@ShayNehmad
Merge pull request #599 from guardicore/release/1.8.0
9b7d797 
Release/1.8.0
Changelog will be published soon-ish.
@ShayNehmad
Merge pull request #628 from guardicore/release/1.8.0
aa21e86 
Release/1.8.0 to develop
@ShayNehmad
Python 3 hashing requires bytes, not string
e321220 
Also moved to standard lib implementation with hashlib instead of Crypto, and added UT to the problematic function
@ShayNehmad
Update patch version
d03ee3d 
Bugfix change to master == new patch ㊗️
@ShayNehmad
Merge pull request #630 from guardicore/hotfix/fix-monkey-password-en…
98636a5 
…coding

Python 3 hashing requires bytes, not string
@ShayNehmad
Merge pull request #631 from guardicore/master
ac740d3 
Backmerge hotfix from Master
@VakarisZ
Merge pull request #619 from VakarisZ/map_generation_test
67c8b48 
Map generation test
@shivank1234 shivank1234 merged commit db04abc into shivank1234:develop May 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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