From b641b09c3470094051b875932112d09c2829b32c Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Wed, 3 Apr 2019 15:12:54 +0200
Subject: [PATCH] #175 Display responder type in definitions list

---
 .../components/analyzers/analyzers-list.html  |  2 +-
 .../responders/responders-list.html           | 36 +++++++++++++------
 .../app/pages/analyzers/analyzers.service.js  |  1 +
 .../pages/responders/responders.service.js    | 15 ++++++++
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/www/src/app/pages/admin/organizations/components/analyzers/analyzers-list.html b/www/src/app/pages/admin/organizations/components/analyzers/analyzers-list.html
index accedea6a..cc7177a42 100644
--- a/www/src/app/pages/admin/organizations/components/analyzers/analyzers-list.html
+++ b/www/src/app/pages/admin/organizations/components/analyzers/analyzers-list.html
@@ -69,7 +69,7 @@ <h4 class="media-heading">
               <strong>Author:</strong> {{definition.author}}</small>
             <small class="mr-xxs" ng-if="definition.license">
               <strong>License:</strong> {{definition.license}}</small>
-            <small class="mr-xxs">
+            <small class="mr-xxs" ng-if="definition.runners.length > 0">
               <strong>Type:</strong> {{definition.runners.join(', ')}}</small>
           </h4>
           <div class="mt-xs text-muted">{{definition.description}}</div>
diff --git a/www/src/app/pages/admin/organizations/components/responders/responders-list.html b/www/src/app/pages/admin/organizations/components/responders/responders-list.html
index 46b4c2933..5701d6a1b 100644
--- a/www/src/app/pages/admin/organizations/components/responders/responders-list.html
+++ b/www/src/app/pages/admin/organizations/components/responders/responders-list.html
@@ -3,7 +3,8 @@
   <div class="mb-s" ng-if="$ctrl.invalidResponders.length > 0">
     <div class="callout callout-warning">
       <h4>You have {{$ctrl.invalidResponders.length}} invalid
-        <ng-pluralize count="$ctrl.invalidResponders.length" when="{'1': 'responder', 'other': 'responders'}"></ng-pluralize>
+        <ng-pluralize count="$ctrl.invalidResponders.length" when="{'1': 'responder', 'other': 'responders'}">
+        </ng-pluralize>
       </h4>
       <p>Invalid responders have no definition and cannot be run on any observable. You have to remove them.</p>
     </div>
@@ -41,7 +42,8 @@ <h4 class="media-heading">
         <span class="input-group-addon">
           <i class="fa fa-search"></i>
         </span>
-        <input type="text" class="form-control input-lg" ng-model="$ctrl.state.filterAvailable" placeholder="Filter available responders">
+        <input type="text" class="form-control input-lg" ng-model="$ctrl.state.filterAvailable"
+          placeholder="Filter available responders">
       </div>
     </div>
     <div class="col-sm-12 flex-table">
@@ -49,11 +51,12 @@ <h4 class="media-heading">
         <div class="flex-col flex-1">Responders</div>
         <div class="flex-col flex-w-100 text-center">Max TLP</div>
         <div class="flex-col flex-w-100 text-center">Max PAP</div>
-        <div class="flex-col flex-w-100 text-center">Rate Limit</div>        
+        <div class="flex-col flex-w-100 text-center">Rate Limit</div>
         <div class="flex-col flex-w-100"></div>
         <div class="flex-col flex-w-100"></div>
       </div>
-      <div class="flex-row media" ng-repeat="def in $ctrl.definitionsIds | filter:$ctrl.state.filterAvailable" ng-init="definition = $ctrl.responderDefinitions[def];">
+      <div class="flex-row media" ng-repeat="def in $ctrl.definitionsIds | filter:$ctrl.state.filterAvailable"
+        ng-init="definition = $ctrl.responderDefinitions[def];">
         <!-- <div class="media-left">
                 <span class="label label-default" ng-class="{'Active': 'label-success'}[org.status]">{{org.status}}</span>
               </div> -->
@@ -68,30 +71,41 @@ <h4 class="media-heading">
               <strong>Author:</strong> {{definition.author}}</small>
             <small class="mr-xxs" ng-if="definition.license">
               <strong>License:</strong> {{definition.license}}</small>
+            <small class="mr-xxs" ng-if="definition.runners.length > 0">
+              <strong>Type:</strong> {{definition.runners.join(', ')}}</small>
           </h4>
           <div class="mt-xs text-muted">{{definition.description}}</div>
         </div>
         <div class="flex-col flex-w-100 text-center vertical centered" ng-if="$ctrl.activeResponders[def]">
-          <tlp value="$ctrl.activeResponders[def].configuration.check_tlp ? $ctrl.activeResponders[def].configuration.max_tlp : undefined"></tlp>
+          <tlp
+            value="$ctrl.activeResponders[def].configuration.check_tlp ? $ctrl.activeResponders[def].configuration.max_tlp : undefined">
+          </tlp>
         </div>
         <div class="flex-col flex-w-100 text-center vertical centered" ng-if="$ctrl.activeResponders[def]">
-          <tlp value="$ctrl.activeResponders[def].configuration.check_pap ? $ctrl.activeResponders[def].configuration.max_pap : undefined" namespace="PAP"></tlp>
+          <tlp
+            value="$ctrl.activeResponders[def].configuration.check_pap ? $ctrl.activeResponders[def].configuration.max_pap : undefined"
+            namespace="PAP"></tlp>
         </div>
         <div class="flex-col flex-w-100 text-center vertical centered" ng-if="$ctrl.activeResponders[def]">
-          <span ng-show="$ctrl.activeResponders[def].rate && $ctrl.activeResponders[def].rateUnit" class="label label-lg label-primary">
+          <span ng-show="$ctrl.activeResponders[def].rate && $ctrl.activeResponders[def].rateUnit"
+            class="label label-lg label-primary">
             {{$ctrl.activeResponders[def].rate}} per {{$ctrl.activeResponders[def].rateUnit}}
           </span>
-          <span ng-show="!$ctrl.activeResponders[def].rate || !$ctrl.activeResponders[def].rateUnit" class="label label-lg label-default">None</span>
+          <span ng-show="!$ctrl.activeResponders[def].rate || !$ctrl.activeResponders[def].rateUnit"
+            class="label label-lg label-default">None</span>
         </div>
-        <div class="flex-col flex-icon flex-w-100 text-center" ng-if="$ctrl.activeResponders[def]" ng-click="$ctrl.edit('edit', $ctrl.responderDefinitions[def], $ctrl.activeResponders[def])">
+        <div class="flex-col flex-icon flex-w-100 text-center" ng-if="$ctrl.activeResponders[def]"
+          ng-click="$ctrl.edit('edit', $ctrl.responderDefinitions[def], $ctrl.activeResponders[def])">
           <a href class="text-primary">
             <i class="fa fa-edit"></i>Edit</a>
         </div>
-        <div class="flex-col flex-icon flex-w-100 text-center" ng-if="$ctrl.activeResponders[def]" ng-click="$ctrl.disable($ctrl.activeResponders[def].id)">
+        <div class="flex-col flex-icon flex-w-100 text-center" ng-if="$ctrl.activeResponders[def]"
+          ng-click="$ctrl.disable($ctrl.activeResponders[def].id)">
           <a href class="text-danger">
             <i class="fa fa-ban"></i>Disable</a>
         </div>
-        <div class="flex-col flex-icon flex-w-100 text-center" ng-click="$ctrl.enable(def)" ng-if="!$ctrl.activeResponders[def]">
+        <div class="flex-col flex-icon flex-w-100 text-center" ng-click="$ctrl.enable(def)"
+          ng-if="!$ctrl.activeResponders[def]">
           <a href class="text-success">
             <i class="fa fa-plus"></i>Enable</a>
         </div>
diff --git a/www/src/app/pages/analyzers/analyzers.service.js b/www/src/app/pages/analyzers/analyzers.service.js
index 9e978343a..990988a50 100644
--- a/www/src/app/pages/analyzers/analyzers.service.js
+++ b/www/src/app/pages/analyzers/analyzers.service.js
@@ -31,6 +31,7 @@ export default class AnalyzerService {
         response => {
           this.analyzerDefinitions = _.keyBy(response.data, 'id');
 
+          // Compute type (process/docker)
           _.keys(this.analyzerDefinitions).forEach(key => {
             let def = this.analyzerDefinitions[key];
 
diff --git a/www/src/app/pages/responders/responders.service.js b/www/src/app/pages/responders/responders.service.js
index 6c24db94b..e31b2f64d 100644
--- a/www/src/app/pages/responders/responders.service.js
+++ b/www/src/app/pages/responders/responders.service.js
@@ -27,6 +27,21 @@ export default class ResponderService {
         response => {
           this.responderDefinitions = _.keyBy(response.data, 'id');
 
+          // Compute type (process/docker)
+          _.keys(this.responderDefinitions).forEach(key => {
+            let def = this.responderDefinitions[key];
+
+            def.runners = [];
+
+            if (def.command && def.command !== null) {
+              def.runners.push('Process');
+            }
+
+            if (def.image && def.image !== null) {
+              def.runners.push('Docker');
+            }
+          });
+
           defered.resolve(this.responderDefinitions);
         },
         response => {