Skip to content

Commit afaf0d7

Browse files
MB-51770: return warning about self-signed certs
Change-Id: I890d3fad4b8e4239a2d76c11e32614daa8dfc173 Reviewed-on: https://review.couchbase.org/c/ns_server/+/176100 Tested-by: Pavel Blagodov <[email protected]> Well-Formed: Build Bot <[email protected]> Well-Formed: Restriction Checker Reviewed-by: Matthew Dawber <[email protected]>
1 parent 6349068 commit afaf0d7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

priv/public/ui/app/mn_admin/mn_servers_add_dialog.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ <h2>Add Server Node</h2>
2222
<div class="error error-form">
2323
Warning: Adding a server to this cluster means any previous Couchbase Server data on that server will be removed.
2424
</div>
25-
<!-- <div class="error error-form"
26-
ng-show="serversAddDialogCtl.certificate.cert.type == 'generated'">
27-
This cluster is using self-signed certificates. No peer verification between nodes will be done.
28-
</div> -->
25+
<div class="error error-form"
26+
ng-show="serversAddDialogCtl.certificatesByNode[serversAddDialogCtl.selfConfig.selfConfig.configuredHostname].type === 'generated'">
27+
This cluster is using self-signed certificates. No peer verification between nodes will be done.
28+
</div>
2929
<div class="error error-form" ng-if="('isString' | lodash:serversAddDialogCtl.errors)">
3030
Attention: {{serversAddDialogCtl.errors}}</div>
3131
<div class="error error-form" ng-if="('isArray' | lodash:serversAddDialogCtl.errors)">

priv/public/ui/app/mn_admin/mn_servers_add_dialog_controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ function mnServersAddDialogController($scope, $rootScope, $q, $uibModal, mnServe
5151

5252
function activate() {
5353
reset();
54-
if ($scope.poolDefault.isEnterprise) {
55-
mnPromiseHelper(vm, mnCertificatesService.getPoolsDefaultTrustedCAs())
56-
.applyToScope("certificate");
54+
if ($scope.rbac.cluster.admin.security.read) {
55+
mnPromiseHelper(vm, mnCertificatesService.getNodeCertificateSettingsByNode())
56+
.applyToScope("certificatesByNode");
5757
}
5858
mnClusterConfigurationService.getSelfConfig().then(function (selfConfig) {
5959
var rv = {};

0 commit comments

Comments
 (0)