diff --git a/README.md b/README.md
index 1452e54b5..ce0a83c88 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,20 @@
# MozDef: Mozilla Enterprise Defense Platform
+## Documentation:
+
+http://mozdef.readthedocs.org/en/latest/
+
+
+## Give MozDef a Try in AWS:
+
+The following button will launch the Mozilla Enterprise Defense Platform in your AWS account.
+
+**Warning:** Pressing the "Launch Stack" button and following through with the deployment will incur charges to your AWS account.
+
+[][1]
+
+
## Why?
The inspiration for MozDef comes from the large arsenal of tools available to attackers. Suites like metasploit, armitage, lair, dradis and others are readily available to help attackers coordinate, share intelligence and finely tune their attacks in real time. Defenders are usually limited to wikis, ticketing systems and manual tracking databases attached to the end of a Security Information Event Management (SIEM) system.
@@ -22,12 +36,4 @@ The Mozilla Enterprise Defense Platform (MozDef) seeks to automate the security
MozDef is in production at Mozilla where we are using it to process over 300 million events per day.
-## Give MozDef a Try in AWS:
-
-[][1]
-
-## Documentation:
-
-http://mozdef.readthedocs.org/en/latest/
-
-[1]: https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=mozdef-for-aws&templateURL=https://s3-us-west-2.amazonaws.com/public.us-west-2.infosec.mozilla.org/mozdef/cf/v1.38.5/mozdef-parent.yml
+[1]: https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=mozdef-for-aws&templateURL=https://s3-us-west-2.amazonaws.com/public.us-west-2.infosec.mozilla.org/mozdef/cf/v1.38.5/mozdef-parent.yml
\ No newline at end of file
diff --git a/alerts/cloudtrail_public_bucket.py b/alerts/cloudtrail_public_bucket.py
new file mode 100644
index 000000000..50e29d097
--- /dev/null
+++ b/alerts/cloudtrail_public_bucket.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) 2014 Mozilla Corporation
+
+
+from lib.alerttask import AlertTask
+from mozdef_util.query_models import SearchQuery, TermMatch, ExistsMatch
+
+
+class AlertCloudtrailPublicBucket(AlertTask):
+ def main(self):
+ search_query = SearchQuery(minutes=20)
+
+ search_query.add_must([
+ TermMatch('source', 'cloudtrail'),
+ TermMatch('details.eventname', 'PutBucketPolicy'),
+ ExistsMatch('details.requestparameters.bucketpolicy.statement.principal')
+ ])
+
+ self.filtersManual(search_query)
+ self.searchEventsSimple()
+ self.walkEvents()
+
+ # Set alert properties
+ def onEvent(self, event):
+ request_parameters = event['_source']['details']['requestparameters']
+ for statement in request_parameters['bucketpolicy']['statement']:
+ if statement['principal'] != '*':
+ return
+ category = 'access'
+ tags = ['cloudtrail']
+ severity = 'INFO'
+
+ bucket_name = 'Unknown'
+ if 'bucketname' in request_parameters:
+ bucket_name = request_parameters['bucketname']
+
+ summary = "The s3 bucket {0} is listed as public".format(bucket_name)
+ return self.createAlertDict(summary, category, tags, [event], severity)
diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions
index 8857b1942..12dd02602 100644
--- a/meteor/.meteor/versions
+++ b/meteor/.meteor/versions
@@ -98,7 +98,7 @@ templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tracker@1.2.0
-twbs:bootstrap@3.3.6
+twbs:bootstrap@3.3.5
ui@1.0.13
underscore@1.0.10
url@1.2.0
diff --git a/meteor/client/greeting.html b/meteor/client/greeting.html
new file mode 100644
index 000000000..5e72d714e
--- /dev/null
+++ b/meteor/client/greeting.html
@@ -0,0 +1,8 @@
+
+
+
diff --git a/meteor/client/menu.js b/meteor/client/menu.js
index 02d688c7b..5ad611a7e 100644
--- a/meteor/client/menu.js
+++ b/meteor/client/menu.js
@@ -2,31 +2,36 @@ import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Tracker } from 'meteor/tracker'
-Template.menu.rendered = function () {
- Tracker.autorun(function() {
- Meteor.subscribe("features");
- });
+Template.menu.rendered = function() {
+ Tracker.autorun( function() {
+ Meteor.subscribe( "features" );
+ } );
};
-Template.menu.helpers({
- haveFeatures: function(){
+Template.menu.helpers( {
+ haveFeatures: function() {
//subscription has records?
- return features.find().count() >0;
+ return features.find().count() > 0;
},
- resolveKibanaURL: function(url){
+ resolveKibanaURL: function( url ) {
// special function just for the menu
// to adjust the kibana URL if we are told to make it 'relative'
// to whatever DNS name we are running on
// i.e. pass in http://relative:9090/app/kibana
// when the running dns is something.com
// and we will set the hostname to something.com instead of 'relative'
- var kibanaURL = new URL(url);
- if ( kibanaURL.hostname == 'relative' ){
+ var kibanaURL = new URL( url );
+ if ( kibanaURL.hostname == 'relative' ) {
// we were passed something like OPTIONS_METEOR_KIBANAURL=http://relative:9090/app/kibana
// so lets figure out where we should be
- dnsURL=new URL(document.URL);
+ dnsURL = new URL( document.URL );
kibanaURL.hostname = dnsURL.hostname;
}
return kibanaURL;
+ },
+ // loads kibana dashboards
+ kibanadashboards: function() {
+ Meteor.call( 'loadKibanaDashboards' );
+ return kibanadashboards.find();
}
- });
+} );
diff --git a/meteor/client/mozdef.html b/meteor/client/mozdef.html
index 1812b1628..83833e66e 100644
--- a/meteor/client/mozdef.html
+++ b/meteor/client/mozdef.html
@@ -8,7 +8,7 @@
- mozdef::mozilla defense platform
+ mozdef::mozilla enterprise defense platform
@@ -17,52 +17,27 @@
- {{> menu}}
-
{{#if loggingIn}}
