From 0cddeff2158eda57fb2a35b59aa05eb59b44b2da Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Thu, 12 Nov 2020 06:01:29 +0100
Subject: [PATCH] #1633 Add tlp to observable flags component and use it in
 report observables import section

---
 .../common/observable-flags.component.js         |  1 +
 .../app/scripts/directives/report-observables.js |  4 +++-
 .../alert/observable-list.component.html         |  6 ++----
 .../common/observable-flags.component.html       | 16 ++++++++++++++++
 .../app/views/directives/report-observables.html | 14 ++++++++++----
 .../partials/observables/details/summary.html    | 13 +++----------
 .../partials/observables/list/observables.html   |  2 +-
 7 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/frontend/app/scripts/components/common/observable-flags.component.js b/frontend/app/scripts/components/common/observable-flags.component.js
index 4c02c4941b..b8e90936cb 100644
--- a/frontend/app/scripts/components/common/observable-flags.component.js
+++ b/frontend/app/scripts/components/common/observable-flags.component.js
@@ -18,6 +18,7 @@
                 inline: '<',
                 hideSimilarity: '<',
                 hideSeen: '<',
+                hideTlp: '<',
                 onFilter: '&'
             }
         });
diff --git a/frontend/app/scripts/directives/report-observables.js b/frontend/app/scripts/directives/report-observables.js
index 4f7a73abd0..12c6cc9cf1 100644
--- a/frontend/app/scripts/directives/report-observables.js
+++ b/frontend/app/scripts/directives/report-observables.js
@@ -49,7 +49,8 @@
                 $scope.selectAll = function() {
                     var type = $scope.pagination.filter;
                     _.each(type === '' ? $scope.observables : $scope.groups[type], function(item) {
-                        if(!item.id && !item.selected) {
+                        //if(!item.id && !item.selected) {
+                        if(!item.stats.observableId && !item.selected) {
                             item.selected = true;
                             $scope.selected++;
                         }
@@ -80,6 +81,7 @@
                             single: list.length === 1,
                             ioc: false,
                             sighted: false,
+                            ignoreSimilarity: false,
                             tlp: 2,
                             message: message,
                             tags: [{text: 'src:' + $scope.analyzer}]
diff --git a/frontend/app/views/components/alert/observable-list.component.html b/frontend/app/views/components/alert/observable-list.component.html
index c9776b6ee3..2f88854b66 100644
--- a/frontend/app/views/components/alert/observable-list.component.html
+++ b/frontend/app/views/components/alert/observable-list.component.html
@@ -22,8 +22,7 @@
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th style="width: 10px;" class="p-0"></th>
-                        <th style="width:50px;"></th>
+                        <th style="width:50px;">Flags</th>
                         <th style="width:100px;">Type</th>
                         <th>Data</th>
                         <th style="width: 120px">Date Added</th>
@@ -31,9 +30,8 @@
                 </thead>
                 <tbody>
                     <tr ng-repeat="observable in $cmp.list.values" class="clickable">
-                        <td class="p-0 bg-tlp-{{observable.tlp}} clickable" ng-click="$cmp.filterBy('tlp', observable.tlp)"></td>
                         <td class="nowrap">
-                            <observable-flags observable="observable" inline="true"></observable-flags>
+                            <observable-flags observable="observable" inline="true" on-filter="$cmp.filterBy(fieldName, value)"></observable-flags>
                         </td>
                         <td>
                             <a href ng-click="$cmp.filterBy('dataType', observable.dataType)">{{observable.dataType}}</a>
diff --git a/frontend/app/views/components/common/observable-flags.component.html b/frontend/app/views/components/common/observable-flags.component.html
index 45d1c6a45a..5eca732365 100644
--- a/frontend/app/views/components/common/observable-flags.component.html
+++ b/frontend/app/views/components/common/observable-flags.component.html
@@ -1,4 +1,20 @@
 <div class="observable-flags" ng-class="{'inline': $ctrl.inline}">
+    <!-- TLP -->
+    <div ng-if="!!!$ctrl.hideTlp" class="observable-tlp clickable" uib-tooltip="{{ {
+        0: 'TLP:WHITE',
+        1: 'TLP:GREEN',
+        2: 'TLP:AMBER',
+        3: 'TLP:RED',
+    }[$ctrl.observable.tlp] }}" tooltip-popup-delay="500" tooltip-placement="tlp"
+        ng-click="$ctrl.filterBy('tlp', $ctrl.observable.tlp)">
+        <i class="fa fa-circle" ng-class="{
+            0: 'text-tlp-default fa-circle-o',
+            1: 'text-tlp-green',
+            2: 'text-tlp-amber',
+            3: 'text-tlp-red',
+        }[$ctrl.observable.tlp]"></i>
+    </div>
+
     <!-- IOC flag -->
     <div ng-if="!!$ctrl.observable.ioc" class="observable-ioc clickable" uib-tooltip="is an IOC" tooltip-popup-delay="500" tooltip-placement="bottom"
         ng-click="$ctrl.filterBy('ioc', true)">
diff --git a/frontend/app/views/directives/report-observables.html b/frontend/app/views/directives/report-observables.html
index 53c6f4e103..7b3bf5754e 100644
--- a/frontend/app/views/directives/report-observables.html
+++ b/frontend/app/views/directives/report-observables.html
@@ -26,8 +26,9 @@
         <table class="table table-striped">
             <thead>
                 <tr>
-                    <th style="width:20px;"></th>
-                    <th style="width:20px;"></th>
+                    <th style="width:10px;"></th>
+                    <th style="width:80px;">Flags</th>
+                    <th style="width:80px;">Imported</th>
                     <th style="width:150px;">Type</th>
                     <th>Data</th>
                     <th style="width:80px;"></th>
@@ -37,9 +38,14 @@
                 <tr ng-repeat="observable in pagination.data | orderBy:'id':true |
                         offset: (pagination.currentPage-1)*pagination.pageSize |
                         limitTo: pagination.pageSize ">
-                    <td><input type="checkbox" ng-model="observable.selected" ng-change="selectObservable(observable)" ng-disabled="!!observable.stats.observableId"></td>
                     <td>
-                        <span uib-tooltip="Observable already imported" tooltip-popup-delay="500" tooltip-placement="right" ng-if="!!observable.stats.observableId" class="glyphicon glyphicon-eye-open"></span>
+                        <input type="checkbox" ng-model="observable.selected" ng-change="selectObservable(observable)" ng-disabled="!!observable.stats.observableId">
+                    </td>
+                    <td>
+                        <observable-flags observable="observable" inline="true" hide-seen="true" hide-similarity="true"></observable-flags>
+                    </td>
+                    <td align="center">
+                        <span uib-tooltip="Observable already imported" tooltip-popup-delay="500" tooltip-placement="right" ng-if="!!observable.stats.observableId" class="fa fa-check"></span>
                     </td>
                     <td>{{observable.dataType}}</td>
                     <td class="wrap">
diff --git a/frontend/app/views/partials/observables/details/summary.html b/frontend/app/views/partials/observables/details/summary.html
index ffaef9822b..741319e11a 100644
--- a/frontend/app/views/partials/observables/details/summary.html
+++ b/frontend/app/views/partials/observables/details/summary.html
@@ -127,22 +127,15 @@ <h4 class="vpad10 text-primary">Links</h4>
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th width="10">IOC</th>
-                        <th>TLP</th>
+                        <th width="80">Flags</th>
                         <th>Case</th>
-                        <th>Date added</th>
+                        <th width="120">Date added</th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr ng-repeat="a in similarArtifacts | limitTo:similarArtifactsLimit" style="cursor: pointer;" ng-click="openArtifact(a)" uib-tooltip="{{a.message}}" tooltip-popup-delay="500" tooltip-placement="bottom">
-                        <td align="center">
-                            <span class="clickable fa"
-                              ng-class="{true: 'fa-star', false: 'fa-star-o'}[a.ioc]"
-                              tooltip-popup-delay="500"
-                              tooltip-placement="bottom"></span>
-                        </td>
                         <td>
-                            <tlp value="a.tlp"></tlp>
+                            <observable-flags observable="a" inline="true" hide-seen="true" hide-similarity="true"></observable-flags>
                         </td>
                         <td>
                           <!-- [{{a.dataType}}]: {{a.data || a.attachment.name}}<br> -->
diff --git a/frontend/app/views/partials/observables/list/observables.html b/frontend/app/views/partials/observables/list/observables.html
index b13bbfa2d2..c649bea501 100644
--- a/frontend/app/views/partials/observables/list/observables.html
+++ b/frontend/app/views/partials/observables/list/observables.html
@@ -64,7 +64,7 @@ <h4>
                     <input type="checkbox" ng-model="artifact.selected" ng-change="selectArtifact(artifact)" if-permission="manageObservable" allowed="{{artifact.extraData.permissions.join(',')}}">
                 </td>
                 <td>
-                    <observable-flags observable="artifact" on-filter="addFilterValue(fieldName, value)"></observable-flags>
+                    <observable-flags observable="artifact" on-filter="addFilterValue(fieldName, value)" hide-tlp="true"></observable-flags>
                 </td>
                 <td>
                     <a href ng-click="addFilterValue('dataType', artifact.dataType)"><span ng-bind="artifact.dataType"></span></a>