Skip to content

Commit

Permalink
#1319 Hide analyzer template admin page and menu if cortex is not ena…
Browse files Browse the repository at this point in the history
…bled
  • Loading branch information
nadouani committed May 24, 2020
1 parent 54fc4a4 commit 284e373
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 28 deletions.
19 changes: 18 additions & 1 deletion frontend/app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,24 @@ angular.module('thehive', [
controller: 'AdminAnalyzerTemplatesCtrl',
controllerAs: 'vm',
title: 'Analyzer templates administration',
permissions: ['manageAnalyzerTemplate']
permissions: ['manageAnalyzerTemplate'],
resolve: {
appConfig: function($q, VersionSrv) {
var defer = $q.defer();

VersionSrv.get()
.then(function(config) {
// Check if Cortex is enabled
if(VersionSrv.hasCortexConnector()) {
defer.resolve(config);
} else {
defer.reject();
}
});

return defer.promise;
},
}
})
.state('app.administration.custom-fields', {
url: '/custom-fields',
Expand Down
2 changes: 2 additions & 0 deletions frontend/app/scripts/controllers/RootCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ angular.module('theHiveControllers').controller('RootCtrl',

$rootScope.layoutSrv = AppLayoutSrv;
$scope.appConfig = appConfig;
$scope.hasCortexConnector = VersionSrv.hasCortexConnector();

$scope.querystring = '';
$scope.view = {
Expand Down Expand Up @@ -46,6 +47,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
});

$scope.appConfig = conf;
$scope.hasCortexConnector = VersionSrv.hasCortexConnector();
});

CaseTemplateSrv.list().then(function(templates) {
Expand Down
12 changes: 11 additions & 1 deletion frontend/app/scripts/services/api/VersionSrv.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
return deferred.promise;
},

hasCortexConnector: function() {
try {
var service = cache.connectors.cortex;

return service.enabled;
} catch (err) {
return false;
}
},

hasCortex: function() {
try {
var service = cache.connectors.cortex;
Expand All @@ -52,7 +62,7 @@

(misp.servers || []).forEach(function(item) {
urls[item.name] = item.url;
});
});
return urls;
}
};
Expand Down
27 changes: 1 addition & 26 deletions frontend/app/views/components/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,6 @@
<span class="hpad5">New Case</span>
</a>
</li>
<!-- <li class="dropdown" uib-dropdown>
<a class="dropdown-toggle" uib-dropdown-toggle href>
<i class="fa fa-plus"></i>
<span class="hpad5">New Case</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu scroll-dropdown-2x" uib-dropdown-menu>
<li>
<a href ng-click="createNewCase()">Empty Case</a>
</li>
<li class="divider" ng-if="templates && templates.length > 0"></li>
<li ng-repeat="template in templates">
<a href ng-click="createNewCase(template)">{{template.name}}</a>
</li>
<li ng-if="templates && templates.length > 0">
<a href ng-click="openTemplateSelector()">From a template...</a>
</li>
</ul>
</li> -->
<li ui-sref-active="active">
<a ui-sref="app.main({viewId: 'mytasks'})">My tasks
<span class="badge alert-danger">{{myCurrentTasks.count}}</span>
Expand Down Expand Up @@ -110,12 +91,6 @@
</a>
</li>
<li class="divider"></li>
<!-- <li>
<a ui-sref="app.administration.case-templates">
<i class="fa fa-file-text"></i>
<span class="hpad5">Case templates</span>
</a>
</li> -->
<li if-permission="manageCustomField">
<a ui-sref="app.administration.custom-fields">
<i class="fa fa-edit"></i>
Expand All @@ -128,7 +103,7 @@
<span class="hpad5">Observable types</span>
</a>
</li>
<li if-permission="manageAnalyzerTemplate">
<li if-permission="manageAnalyzerTemplate" ng-if="hasCortexConnector">
<a ui-sref="app.administration.analyzer-templates">
<i class="fa fa-file-text"></i>
<span class="hpad5">Analyzer templates</span>
Expand Down

0 comments on commit 284e373

Please sign in to comment.