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

Reinforce2019 merge #1353

Merged
merged 52 commits into from Jul 10, 2019

Conversation

Projects
None yet
4 participants
@gdestuynder
Copy link
Contributor

commented Jul 3, 2019

Features added to cloudymozdef for the aws re:inforce workshop

gene1wood and others added some commits May 24, 2019

Initial capture of the CodeBuild configuration and role in CloudForma…
…tion

This likely still requires the one time binding action to link the CodeBuild project with the GitHub project and webhook. But this may get us a large part of the way there before that manual step.
add ALBBasicAuthSecret as parameter similar to OIDCClientSecret
this commit does not ingest the secret in the proxy, only setup the
parameters
Merge pull request #1277 from gdestuynder/reinforce2019
Basic auth password should be randomized
use non-relative path again
not great, but other things would need to change otherwise
use non-relative path again
not great, but other things would need to change otherwise
condition no longer needed
makefile fi
Merge pull request #1302 from gdestuynder/reinforce2019
fix stack update and noecho params
Remove CICD build trigger constraints
I've manually created these constraints in CodeBuild Filtergroups, similar to what can be
seen in #1285
Replace "unset" with empty string
Clarify that "unset" isn't a reserved word
Use an empty string as a default to make it easier to understand
Add Rules which validate
* that the user is either choosing basic auth or OIDC but not both.
* that all OIDC parameters are filled out if choosing OIDC.
* that ACM cert is filled out if choosing OIDC
Removing VPC Subnet check as it triggers a CloudFormation bug
I've reported the bug to AWS and we can add this back in if it's fixed

gdestuynder and others added some commits Jun 12, 2019

Merge pull request #1326 from gdestuynder/reinforce2019
Add alerts-* index mapping for docker environment
Merge pull request #1327 from gdestuynder/reinforce2019
Add survey + contact (same as labs)

@gdestuynder gdestuynder requested a review from pwnbus Jul 3, 2019

@gene1wood

This comment has been minimized.

Copy link
Member

commented Jul 10, 2019

What remains to be done for this PR to be merged?

@pwnbus

This comment has been minimized.

Copy link
Collaborator

commented Jul 10, 2019

@gene1wood I believe you'll want to git merge origin/master (which now includes the python3 update) and then try and resolve any conflicts.

Merge branch 'master' into reinforce2019
# Conflicts:
#	README.md
#	cloudy_mozdef/cloudformation/mozdef-alert-developer.yml
#	docker/compose/mozdef_bootstrap/files/index_mappings/alerts-star.json

@gene1wood gene1wood marked this pull request as ready for review Jul 10, 2019

@gene1wood

This comment has been minimized.

Copy link
Member

commented Jul 10, 2019

@pwnbus I've merged master into reinforce2019

pwnbus added some commits Jul 10, 2019

@pwnbus pwnbus dismissed their stale review via 49317ec Jul 10, 2019

@pwnbus

pwnbus approved these changes Jul 10, 2019

@pwnbus pwnbus merged commit 693d7ea into master Jul 10, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pwnbus pwnbus deleted the reinforce2019 branch Jul 10, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.