From e5b27d7a57361296c4b8ea8c46b1c7818dd5e5d1 Mon Sep 17 00:00:00 2001
From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com>
Date: Tue, 9 Aug 2022 17:19:32 +1200
Subject: [PATCH] fix(ldap/tls): allow to upload tls ca certificate [EE-3654]
 (#7340)

---
 .gitignore                                                      | 1 +
 .../settings/authentication/ldap/ldap-settings/index.js         | 1 +
 .../ldap/ldap-settings/ldap-settings.controller.js              | 2 +-
 .../settings/authentication/settingsAuthenticationController.js | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4dbf5787f..adc29e311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ storybook-static
 .tmp
 **/.vscode/settings.json
 **/.vscode/tasks.json
+.vscode
 *.DS_Store
 
 .eslintcache
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings/index.js b/app/portainer/settings/authentication/ldap/ldap-settings/index.js
index 9b1c9789e..f0072f13a 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings/index.js
+++ b/app/portainer/settings/authentication/ldap/ldap-settings/index.js
@@ -5,6 +5,7 @@ export const ldapSettings = {
   controller,
   bindings: {
     settings: '=',
+    tlscaCert: '=',
     state: '<',
     connectivityCheck: '<',
     onSaveSettings: '<',
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js
index e1fb002d2..390faa4d5 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js
+++ b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.controller.js
@@ -31,7 +31,7 @@ export default class LdapSettingsController {
   }
 
   $onInit() {
-    this.tlscaCert = this.settings.TLSCACert;
+    this.tlscaCert = this.settings.TLSConfig.TLSCACert;
   }
 
   onChangeServerType(serverType) {
diff --git a/app/portainer/views/settings/authentication/settingsAuthenticationController.js b/app/portainer/views/settings/authentication/settingsAuthenticationController.js
index f0a6f881a..dc6297fc6 100644
--- a/app/portainer/views/settings/authentication/settingsAuthenticationController.js
+++ b/app/portainer/views/settings/authentication/settingsAuthenticationController.js
@@ -187,7 +187,7 @@ function SettingsAuthenticationController($q, $scope, $state, Notifications, Set
     return (
       _.compact(ldapSettings.URLs).length &&
       (ldapSettings.AnonymousMode || (ldapSettings.ReaderDN && ldapSettings.Password)) &&
-      (!isTLSMode || $scope.formValues.TLSCACert || ldapSettings.TLSConfig.TLSSkipVerify) &&
+      (!isTLSMode || (isTLSMode && $scope.formValues.TLSCACert) || ldapSettings.TLSConfig.TLSSkipVerify) &&
       (!$scope.settings.LDAPSettings.AdminAutoPopulate || ($scope.settings.LDAPSettings.AdminAutoPopulate && $scope.formValues.selectedAdminGroups.length > 0))
     );
   }