categorize attackers, closes #59

mozilla · Aug 4, 2014 · 99444d6 · 99444d6
1 parent 2e7b7e6
commit 99444d6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/meteor/app/client/alertsummary.js b/meteor/app/client/alertsummary.js
@@ -261,18 +261,13 @@ if (Meteor.isClient) {
             Meteor.subscribe("alerts-summary", onReady=function(){
                 refreshAlertsData();
             });
-            cnt=alertsCount.findOne();
+            var cnt=alertsCount.findOne();
             $('#alertsearchtext').val(Session.get('alertsearchtext'));
             if ( cnt ){
                 //debugLog('cnt exists alertsCount changed..updating text.')
                 $('#totalAlerts').text(cnt.count);
-            }
-            Deps.onInvalidate(function () {
-                //debugLog('alertsCount changed..refreshing alerts data.')
                 refreshAlertsData();
-            });              
-
-
+            }
         }); //end deps.autorun    
     };
 

diff --git a/meteor/app/client/attackerdetails.html b/meteor/app/client/attackerdetails.html
@@ -30,7 +30,15 @@
                 <td>{{dateCreated}}</td>
                 <td>{{eventscount}}</td>
 				<td>{{alertscount}}</td>
-				<td>{{category}}</td>
+                <td>
+                    <select id="attackerCategory" name="category" class="input-medium" title="category of this attacker">
+                        <option {{ isselected 'unknown' category }} value='unknown'>Unknown</option>
+                        <option {{ isselected 'skiddie' category }} value='skiddie'>Script Kiddie</option>
+                        <option {{ isselected 'bruteforcer' category }} value='bruteforcer'>Brute Forcer</option>
+                        <option {{ isselected 'bountyhunter' category }} value='bountyhunter'>Bounty Hunter</option>
+                        <option {{ isselected 'APT' category }} value='apt'>APT</option>
+                    </select>
+                </td>
                 <td>{{summary}}</td>
 			</tr>
                 </tbody>

diff --git a/meteor/app/client/attackerdetails.js b/meteor/app/client/attackerdetails.js
@@ -10,6 +10,12 @@ Jeff Bryner jbryner@mozilla.com
 
 if (Meteor.isClient) {
 
+    Template.attackerdetails.events({
+        "change #attackerCategory": function(e,t){
+            attackers.update(Session.get('attackerID'), {$set: {'category':$('#attackerCategory').val()}});
+        }
+    });
+
    //details helpers
     Template.attackerdetails.thisalert = function (mongoalertid) {
         //attackers store a ref mongo id to alerts attacker.alerts.alertid

diff --git a/meteor/app/client/attackers.js b/meteor/app/client/attackers.js
@@ -82,7 +82,6 @@ if (Meteor.isClient) {
         },
         "change #attackerLimit": function(e,t){
             Session.set('attackerlimit', $('#attackerLimit').val());
-            debugLog('should change dep' + Session.get('attackerlimit'));
         },         
         "mousedown": function(event,template){
         //if mouse is over a character
@@ -534,7 +533,8 @@ if (Meteor.isClient) {
                     .group(categoryDim.group())
                     .label(function(d) {return d.key; })
                     .innerRadius(30)
-                    .expireCache();
+                    .expireCache()
+                    .on('filtered',filterCharacters);
                 ringChartLastSeen
                     .width(150).height(150)
                     .dimension(agoDim)

diff --git a/meteor/app/lib/collections.js b/meteor/app/lib/collections.js
@@ -179,22 +179,27 @@ if (Meteor.isServer) {
    //the only rule is that the incident creator is the only one who can delete an incident.
     incidents.allow({
       insert: function (userId, doc) {
-        // the user must be logged in to create an incident
+        // the user must be logged in
         return (userId);
       },
       update: function (userId, doc, fields, modifier) {
-        // the user must be logged in to create an incident
+        // the user must be logged in
         return (userId);
       },
       remove: function (userId, doc) {
         // can only remove one's own indicents
         return doc.creator === Meteor.user().profile.email;
       },
       fetch: ['creator']
-    });   
-
-
+    });
 
+    attackers.allow({
+      update: function (userId, doc, fields, modifier) {
+        // the user must be logged in 
+        return (userId);
+      }
+    });
+
 };
 
 if (Meteor.isClient) {