Merge pull request #702 from mozilla/ipDecorate

Ip decorate

meteor/app/client/alertdetails.html

@@ -34,7 +34,7 @@
                         </td>
                         <td>{{severity}}</td>
                         <td>{{category}}</td>
-                        <td class="alertsummary">{{summary}}</td>
+                        <td class="alertsummary">{{{ipDecorate summary}}}</td>
                     </tr>
                 </tbody>
             </table>
@@ -47,7 +47,11 @@
             {{/each}}
         </tbody>
     </table>
-
+    {{>whoismodal}}
+    {{>dshieldmodal}}
+    {{>cifmodal}}
+    {{>blockIPModal}}
+    {{>intelmodal}}
 
 </div>
 
@@ -61,7 +65,7 @@
             <td>{{documentindex}}</td>
             <td>{{documentid}}</td>
             <td>{{documenttype}}</td>
-            <td>{{documentsource.summary}}</td>
+            <td>{{{ ipDecorate documentsource.summary}}}</td>
             <td>{{>eventdetails}}</td>
         </tr>
 

meteor/app/client/alertdetails.js

@@ -12,25 +12,25 @@ if (Meteor.isClient) {
         thisalertevents: function () {
             return alerts.findOne({'esmetadata.id': Session.get('alertID')}).events;
         },
-    
+
         kibanaurl: function () {
             var esmetadata = alerts.findOne({'esmetadata.id': Session.get('alertID')}).esmetadata;
             url=getSetting('kibanaURL') + '/doc/alerts-*/' + esmetadata.index + '/alert?id=' + esmetadata.id;
             return url;
         }
     });
-    
+
     Template.alertdetails.events({
         "click .makeinvestigation": function(event, template) {
             event.preventDefault();
             //ack the alert
             //acknowledge the alert
             alerts.update(this._id , {$set: {'acknowledged':new Date()}});
-            alerts.update(this._id, {$set: {'acknowledgedby':Meteor.user().profile.email}});            
+            alerts.update(this._id, {$set: {'acknowledgedby':Meteor.user().profile.email}});
             //make an investigation
             newInvestigation=models.investigation();
             newInvestigation.summary= template.data.summary,
-            newInvestigation.dateOpened=dateOrNull(template.data.utctimestamp),            
+            newInvestigation.dateOpened=dateOrNull(template.data.utctimestamp),
             newid=investigations.insert(newInvestigation);
             //add a link to this alert in the references
             investigations.update(newid, {
@@ -46,11 +46,11 @@ if (Meteor.isClient) {
             //ack the alert
             //acknowledge the alert
             alerts.update(this._id , {$set: {'acknowledged':new Date()}});
-            alerts.update(this._id, {$set: {'acknowledgedby':Meteor.user().profile.email}});            
+            alerts.update(this._id, {$set: {'acknowledgedby':Meteor.user().profile.email}});
             //make an incident
             newIncident=models.incident();
             newIncident.summary= template.data.summary,
-            newIncident.dateOpened=dateOrNull(template.data.utctimestamp),            
+            newIncident.dateOpened=dateOrNull(template.data.utctimestamp),
             newid=incidents.insert(newIncident);
             //add a link to this alert in the references
             incidents.update(newid, {
@@ -59,9 +59,26 @@ if (Meteor.isClient) {
             //debugLog(template.firstNode.baseURI);
             //reroute to full blown edit form after this minimal input is complete
             Router.go('/incident/' + newid + '/edit');
+        },
+        "click .ipmenu-whois": function(e,t){
+            Session.set('ipwhoisipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalwhoiswindow').modal()
+        },
+        "click .ipmenu-dshield": function(e,t){
+            Session.set('ipdshieldipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modaldshieldwindow').modal()
+        },
+        "click .ipmenu-blockip": function(e,t){
+            Session.set('blockIPipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalBlockIPWindow').modal()
+        },
+        "click .ipmenu-cif": function(e,t){
+            Session.set('ipcifipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalcifwindow').modal()
+        },
+        "click .ipmenu-intel": function(e,t){
+            Session.set('ipintelipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalintelwindow').modal()
         }
     });
-
-
-
 }

meteor/app/client/attackerdetails.html

@@ -36,7 +36,7 @@
                         <option {{ isselected 'falsepositive' category }} value='falsepositive'>False Positive</option>
                     </select>
                 </td>
-                <td>{{summary}}</td>
+                <td>{{{ipDecorate summary}}}</td>
 			</tr>
                 </tbody>
             </table>
@@ -54,6 +54,11 @@
             </tbody>
         </table>
     </div>
+    {{>whoismodal}}
+    {{>dshieldmodal}}
+    {{>cifmodal}}
+    {{>blockIPModal}}
+    {{>intelmodal}}
 </div>
 
 </template>
@@ -67,7 +72,7 @@
             <td>{{utctimestamp}}</td>
             <td>{{severity}}</td>
             <td>{{category}}</td>
-            <td>{{summary}}</td>
+            <td>{{{ ipDecorate summary}}}</td>
         </tr>
 
 </template>

meteor/app/client/attackerdetails.js

@@ -10,6 +10,26 @@ if (Meteor.isClient) {
     Template.attackerdetails.events({
         "change #attackerCategory": function(e,t){
             attackers.update(Session.get('attackerID'), {$set: {'category':$('#attackerCategory').val()}});
+        },
+        "click .ipmenu-whois": function(e,t){
+            Session.set('ipwhoisipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalwhoiswindow').modal()
+        },
+        "click .ipmenu-dshield": function(e,t){
+            Session.set('ipdshieldipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modaldshieldwindow').modal()
+        },
+        "click .ipmenu-blockip": function(e,t){
+            Session.set('blockIPipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalBlockIPWindow').modal()
+        },
+        "click .ipmenu-cif": function(e,t){
+            Session.set('ipcifipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalcifwindow').modal()
+        },
+        "click .ipmenu-intel": function(e,t){
+            Session.set('ipintelipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalintelwindow').modal()
         }
     });
 
@@ -21,8 +41,8 @@ if (Meteor.isClient) {
                               {fields:{
                                         events:0}
                                 });
-    };    
-    
+    };
+
     Template.attackerdetails.rendered = function() {
         Deps.autorun(function(comp) {
             //subscribe to the alerts data we need
@@ -36,7 +56,7 @@ if (Meteor.isClient) {
                 });
             });
 
-        }); //end deps.autorun    
+        }); //end deps.autorun
     };
 
 };

meteor/app/client/eventdetails.html

@@ -6,15 +6,15 @@
                 {{#with value}}
                     {{#each objKeyValue this}}
                         <span>{{key}}:</span>
-                        <span>{{value}}</span>                    
+                        <span>{{value}}</span>
                     {{/each}}
                 {{/with}}
                 </div>
             {{else}}
                 <div>
                     <span>{{key}}:</span>
-                    <span>{{value}}</span>
-                </div>            
+                    <span>{{{ ipDecorate value }}}</span>
+                </div>
             {{/if}}
-        {{/each}}    
+        {{/each}}
 </template>

meteor/app/client/ipBlocklistTable.html

@@ -28,8 +28,12 @@
                 {{/each}}
                 </tbody>
             </table>
-            </div>
-            {{>blockIPModal}}
+        </div>
+        {{>whoismodal}}
+        {{>dshieldmodal}}
+        {{>cifmodal}}
+        {{>blockIPModal}}
+        {{>intelmodal}}
     </div>
 </template>
 
@@ -38,7 +42,7 @@
 
     <tr class="tooltip-wrapper info-row" title="{{creator}} at {{dateAdded}}" data-toggle="tooltip">
         <td></td>
-        <td>{{address}}</td>
+        <td>{{{ipDecorate address}}}</td>
         <td>{{dateAdded}}</td>
         <td>{{dateExpiring}}</td>
         <td>{{comment}}</td>

meteor/app/client/ipBlocklistTable.js

@@ -27,6 +27,26 @@ if (Meteor.isClient) {
         "click .ipblockdelete": function(e,t){
             ipblocklist.remove(this._id);
             Session.set('displayMessage','Deleted ipblock for & ' + this.address);
+        },
+        "click .ipmenu-whois": function(e,t){
+            Session.set('ipwhoisipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalwhoiswindow').modal()
+        },
+        "click .ipmenu-dshield": function(e,t){
+            Session.set('ipdshieldipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modaldshieldwindow').modal()
+        },
+        "click .ipmenu-blockip": function(e,t){
+            Session.set('blockIPipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalBlockIPWindow').modal()
+        },
+        "click .ipmenu-cif": function(e,t){
+            Session.set('ipcifipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalcifwindow').modal()
+        },
+        "click .ipmenu-intel": function(e,t){
+            Session.set('ipintelipaddress',($(e.target).attr('data-ipaddress')));
+            $('#modalintelwindow').modal()
         }
     });
 

rest/plugins/banhammer.conf

@@ -3,4 +3,4 @@ banhammerdbhost=<add_banhammerdbhost>
 banhammerdbuser=<add_banhammerdbuser>
 banhammerdbpasswd=<add_banhammerdbpasswd>
 banhammerdbdb=<add_banhammerdbdb>
-network_list_file=/opt/mozdef/envs/mozdef/static/iplist.txt
+network_list_file=/dev/null