From ad1b78ea157fba69b48471558cedde8bf899cee6 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Dec 21 2018 15:08:02 +0000
Subject: Ticket 50056 - Fix UI bugs (part 2)


Description: Fix issues with deleting SASL mappings, loading the
             replicated suffix dropdown select lists, improve root
             dn password change validation, improved docs in dscreate
             template for suffixes, hide password values in console
             logging, remove ssca directory whenremoivnign the last
             instance, and issues with audit fail logging in UI.

https://pagure.io/389-ds-base/issue/50056

Reviewed by: vashirov(Thanks!)

---

diff --git a/src/cockpit/389-console/src/ds.js b/src/cockpit/389-console/src/ds.js
index b5f091a..c735a86 100644
--- a/src/cockpit/389-console/src/ds.js
+++ b/src/cockpit/389-console/src/ds.js
@@ -29,13 +29,6 @@ var DSCTL = "dsctl";
 var DSCREATE = "dscreate";
 var ENV = "";
 
-/*
-// Used for local development testing
-var DSCONF = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dsconf';
-var DSCTL = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dsctl';
-var DSCREATE = '/home/mareynol/source/ds389/389-ds-base/src/lib389/cli/dscreate';
-var ENV = 'PYTHONPATH=/home/mareynol/source/ds389/389-ds-base/src/lib389';
-*/
 
 /*
  * Console logging function for CLI commands
@@ -46,12 +39,12 @@ var ENV = 'PYTHONPATH=/home/mareynol/source/ds389/389-ds-base/src/lib389';
  */
 function log_cmd(js_func, desc, cmd_array) {
   if (window.console) {
-    var pw_args = ['--passwd', '--bind-pw'];
+    var pw_args = ['--passwd', '--bind-pw', '--bind-passwd', '--nsslapd-rootpw'];
     var cmd_list = [];
     var converted_pw = false;
 
     for (var idx in cmd_array) {
-      var cmd = cmd_array[idx];
+      var cmd = cmd_array[idx].toString();
       converted_pw = false;
       for (var arg_idx in pw_args) {
         if ( cmd.startsWith(pw_args[arg_idx]) ) {
@@ -316,11 +309,48 @@ function save_all () {
   //   save_security();
 }
 
+function load_repl_suffix_dropdowns() {
+  // Update replication drop downs (agmts mainly)
+  var repl_dropdowns = ['select-repl-agmt-suffix', 'select-repl-winsync-suffix',
+                        'cleanallruv-suffix', 'monitor-repl-backend-list'];
+  var repl_cmd = [DSCONF, '-j', 'ldapi://%2fvar%2frun%2f' + server_id + '.socket','replication', 'list'];
+  log_cmd('load_repl_suffix_dropdowns', 'get replicated suffix list', repl_cmd);
+  cockpit.spawn(repl_cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
+    // Update dropdowns
+    for (var idx in repl_dropdowns) {
+      $("#" + repl_dropdowns[idx]).find('option').remove();
+    }
+    var obj = JSON.parse(data);
+    for (var idx in obj['items']) {
+      for (var list in repl_dropdowns){
+        $("#" + repl_dropdowns[list]).append('<option value="' + obj['items'][idx] + '" selected="selected">' + obj['items'][idx] +'</option>');
+      }
+    }
+    if (obj['items'].length == 0){
+      // Disable create agmt buttons
+      $("#create-agmt").prop("disabled", true);
+      $("#winsync-create-agmt").prop("disabled", true);
+      $("#create-cleanallruv-btn").prop("disabled", true);
+    } else {
+      // Enable repl agmt buttons
+      $("#create-agmt").prop("disabled", false);
+      $("#winsync-create-agmt").prop("disabled", false);
+      $("#create-cleanallruv-btn").prop("disabled", false);
+    }
+  });
+}
+
+var loading_cfg = 0;
+
 function load_config (){
+  // If we are currently loading config don't do it twice
+  if (loading_cfg == 1){
+    return;
+  }
+  loading_cfg = 1;
+
   // Load the configuration for all the pages.
-  var dropdowns = ['local-pwp-suffix', 'select_repl_suffix', 'select-repl-cfg-suffix',
-                   'select-repl-agmt-suffix', 'select-repl-winsync-suffix',
-                   'cleanallruv-suffix', 'monitor-repl-backend-list'];
+  var dropdowns = ['local-pwp-suffix', 'select-repl-cfg-suffix'];
 
   // Show the spinner, and reset the pages
   $("#loading-msg").html("Loading Directory Server configuration for <i><b>" + server_id + "</b></i>...");
@@ -338,7 +368,7 @@ function load_config (){
   cockpit.spawn(cmd, { superuser: true, "err": "message", "environ": [ENV]}).done(function(data) {
     // Update dropdowns
     for (var idx in dropdowns) {
-      $("#" + dropdowns[idx]).empty();
+      $("#" + dropdowns[idx]).find('option').remove();
     }
     var obj = JSON.parse(data);
     for (var idx in obj['items']) {
@@ -378,6 +408,7 @@ function load_config (){
         $("#server-content").show();
         $("#server-config").show();
         clearInterval(loading_config);
+        loading_cfg = 0;
         console.log("Completed configuration initialization.");
       }
     }, 300);
@@ -386,6 +417,7 @@ function load_config (){
     popup_err("Failed To Contact Server",data.message);
     $("#everything").show();
     check_inst_alive(1);
+    loading_cfg = 0;
   });
 }
 
diff --git a/src/cockpit/389-console/src/replication.html b/src/cockpit/389-console/src/replication.html
index 9307fff..06a26e8 100644
--- a/src/cockpit/389-console/src/replication.html
+++ b/src/cockpit/389-console/src/replication.html
@@ -5,8 +5,6 @@
 
   <label class="ds-config-label-med" for="select-repl-role">Database Suffix</Label><select
     class="btn btn-default dropdown" id="select-repl-cfg-suffix">
-    <option>dc=example,dc=com</option>
-    <option>o=ipaca</option>
   </select>
 
   <div id="ds-repl-enabled" hidden>
@@ -151,8 +149,6 @@ Replication Agreements
 <div id="repl-agmts" class="all-pages" hidden>
   <h3 class="ds-config-header">Replication Agreements for <select
     class="btn btn-default dropdown" id="select-repl-agmt-suffix">
-    <option>dc=example,dc=com</option>
-    <option>o=ipaca</option>
   </select></h3>
 
   <div class="ds-page-content">
diff --git a/src/cockpit/389-console/src/replication.js b/src/cockpit/389-console/src/replication.js
index 62215ac..3aa3136 100644
--- a/src/cockpit/389-console/src/replication.js
+++ b/src/cockpit/389-console/src/replication.js
@@ -456,6 +456,7 @@ function get_and_set_repl_config () {
       // Show the page (in case it was hidden)
       $("#ds-repl-enabled").hide();
       $("#repl-config-content").show();
+      load_repl_suffix_dropdowns();
 
       console.log("Finished loading replication configuration.");
     }).fail(function(data) {
@@ -463,6 +464,7 @@ function get_and_set_repl_config () {
       current_role = "Disabled";
       $("#repl-config-content").hide();
       $("#ds-repl-enabled").show();
+      load_repl_suffix_dropdowns();
     });
   } else {
     // No Suffix
diff --git a/src/cockpit/389-console/src/servers.html b/src/cockpit/389-console/src/servers.html
index 5dcb4f2..ef647fe 100644
--- a/src/cockpit/389-console/src/servers.html
+++ b/src/cockpit/389-console/src/servers.html
@@ -154,7 +154,6 @@
                <option>SSHA384</option>
                <option>SSHA256</option>
                <option>SSHA</option>
-               <option>NS-MTA-MD5</option>
                <option>MD5</option>
                <option>SMD5</option>
                <option>CRYPT-MD5</option>
@@ -493,7 +492,7 @@
   <!-- Access logging -->
   <div id="server-access-log" class="all-pages" hidden>
     <h3 class="ds-config-header">Access Log Settings</h3>
-      <input type="checkbox" class="ds-config-checkbox" id="nsslapd-accesslog-logging-enabled" checked><label
+      <input type="checkbox" class="ds-config-checkbox" id="nsslapd-accesslog-logging-enabled"><label
         for="nsslapd-accesslog-logging-enabled" class="ds-label" title="Enable access logging (nsslapd-accesslog-logging-enabled)."> Enable Access Logging</label>
       <div class="ds-expired-div" id="accesslog-attrs">
         <div class="ds-inline">
@@ -586,7 +585,7 @@
 
   <div id="server-audit-log" class="all-pages" hidden>
     <h3 class="ds-config-header">Audit Log Settings</h3>
-    <input type="checkbox" class="ds-config-checkbox" id="nsslapd-auditlog-logging-enabled" checked><label
+    <input type="checkbox" class="ds-config-checkbox" id="nsslapd-auditlog-logging-enabled"><label
       for="nsslapd-auditlog-logging-enabled" class="ds-label" title="Enable audit logging (nsslapd-auditlog-logging-enabled)."> Enable Audit Logging</label>
     <div class="ds-expired-div" id="auditlog-attrs">
       <div class="ds-inline">
@@ -594,11 +593,6 @@
           <label for="nsslapd-auditlog" class="ds-config-label" title="The audit log location and name (nsslapd-auditlog).">Audit Log Location</label><input
             class="ds-input" type="text" id="nsslapd-auditlog" size="40"/>
         </div>
-        <div>
-          <input type="checkbox" class="ds-server-checkbox" id="nsslapd-auditfaillog-logging-enabled"><label
-            for="nsslapd-auditfaillog-logging-enabled" class="ds-label" title="Log failed operations in the audit log (nsslapd-auditfaillog-logging-enabled).">
-            Log Failed Operations</label>
-        </div>
       </div>
       <p></p>
       <h4 class="ds-sub-header">Rotation Policy</h4>
@@ -654,7 +648,7 @@
     <!-- Auditfail logging -->
   <div id="server-auditfail-log" class="all-pages" hidden>
     <h3 class="ds-config-header">Audit Failure Log Settings</h3>
-    <input type="checkbox" class="ds-config-checkbox" id="nsslapd-auditfaillog-logging-enabled" checked><label
+    <input type="checkbox" class="ds-config-checkbox" id="nsslapd-auditfaillog-logging-enabled"><label
       for="nsslapd-auditfaillog-logging-enabled" class="ds-label" title="Enable audit failure logging (nsslapd-auditfaillog-logging-enabled)."> Enable Audit Failure Logging</label>
     <div class="ds-expired-div" id="auditfaillog-attrs">
       <label for="nsslapd-auditfaillog" class="ds-config-label" title="The audit failure log location and name (nsslapd-auditfaillog).">Audit Failure Log Location</label><input
diff --git a/src/cockpit/389-console/src/servers.js b/src/cockpit/389-console/src/servers.js
index 3543349..204a14d 100644
--- a/src/cockpit/389-console/src/servers.js
+++ b/src/cockpit/389-console/src/servers.js
@@ -180,6 +180,11 @@ function get_and_set_config () {
           $("#" + attr).trigger('change');
         }
         config_values[attr] = val;
+
+        // Handle password confirm inputs
+        if (attr == "nsslapd-rootpw"){
+          $("#nsslapd-rootpw-confirm").val(val);
+        }
       }
 
       // Do the log level tables
@@ -320,7 +325,7 @@ function apply_mods(mods) {
      for (remaining in mods) {
        $("#" + remaining.attr).val(config_values[remaining.attr]);
      }
-     check_inst_alive(1);
+     check_inst_alive(0);
      return;  // Stop on error
   });
 }
@@ -352,7 +357,7 @@ function save_config() {
       var val = $("#" + attr).val();
 
       // But first check for rootdn-pw changes and check confirm input matches
-      if (attr == "nsslapd-rootpw" && val != config_values[attr]) {
+      if (attr == "nsslapd-rootpw" && (val != config_values[attr] || val != $("#nsslapd-rootpw-confirm").val())) {
         // Password change, make sure passwords match
         if (val != $("#nsslapd-rootpw-confirm").val()){
           popup_msg("Passwords do not match!", "The Directory Manager passwords do not match, please correct before saving again.");
diff --git a/src/lib389/lib389/cli_conf/replication.py b/src/lib389/lib389/cli_conf/replication.py
index 590ac2f..96e7c02 100644
--- a/src/lib389/lib389/cli_conf/replication.py
+++ b/src/lib389/lib389/cli_conf/replication.py
@@ -243,6 +243,22 @@ def demote_replica(inst, basedn, log, args):
     print("Successfully demoted replica to \"{}\"".format(role))
 
 
+def list_suffixes(inst, basedn, log, args):
+    suffixes = []
+    replicas = Replicas(inst).list()
+    for replica in replicas:
+        suffixes.append(replica.get_suffix())
+
+    if args.json:
+        print(json.dumps({"type": "list", "items": suffixes}))
+    else:
+        if len(suffixes) == 0:
+            print("There are no replicated suffixes")
+        else:
+            for suffix in suffixes:
+                print(suffix)
+
+
 def get_repl_config(inst, basedn, log, args):
     replicas = Replicas(inst)
     replica = replicas.get(args.suffix)
@@ -841,6 +857,9 @@ def create_parser(subparsers):
     repl_disable_parser.set_defaults(func=disable_replication)
     repl_disable_parser.add_argument('--suffix', required=True, help='The DN of the suffix to have replication disabled')
 
+    repl_list_parser = repl_subcommands.add_parser('list', help='List all the replicated suffixes')
+    repl_list_parser.set_defaults(func=list_suffixes)
+
     repl_promote_parser = repl_subcommands.add_parser('promote', help='Promte replica to a Hub or Master')
     repl_promote_parser.set_defaults(func=promote_replica)
     repl_promote_parser.add_argument('--suffix', required=True, help="The DN of the replication suffix to promote")
diff --git a/src/lib389/lib389/instance/options.py b/src/lib389/lib389/instance/options.py
index c41586c..a32ec8a 100644
--- a/src/lib389/lib389/instance/options.py
+++ b/src/lib389/lib389/instance/options.py
@@ -286,7 +286,9 @@ class Backend2Base(Options2):
 
         self._options['suffix'] = 'dc=example,dc=com'
         self._type['suffix'] = str
-        self._helptext['suffix'] = "Sets the root suffix stored in this database."
+        self._helptext['suffix'] = ("Sets the root suffix stored in this database.  If you do not uncomment the suffix " +
+                                    "attribute the install process will NOT create the backend/suffix.  You can also " +
+                                    "create multiple backends/suffixes by duplicating this section.")
 
         self._options['sample_entries'] = "no"
         self._type['sample_entries'] = str
diff --git a/src/lib389/lib389/instance/remove.py b/src/lib389/lib389/instance/remove.py
index 70ebfcc..2d8ce99 100644
--- a/src/lib389/lib389/instance/remove.py
+++ b/src/lib389/lib389/instance/remove.py
@@ -40,6 +40,8 @@ def remove_ds_instance(dirsrv, force=False):
     remove_paths['inst_dir'] = dirsrv.ds_paths.inst_dir
 
     marker_path = "%s/sysconfig/dirsrv-%s" % (dirsrv.ds_paths.sysconf_dir, dirsrv.serverid)
+    etc_dirsrv_path = os.path.join(dirsrv.ds_paths.sysconf_dir, 'dirsrv/')
+    ssca_path = os.path.join(etc_dirsrv_path, 'ssca/')
 
     # Check the marker exists. If it *does not* warn about this, and say that to
     # force removal you should touch this file.
@@ -93,6 +95,15 @@ def remove_ds_instance(dirsrv, force=False):
     if dirsrv.sslport is not None:
         selinux_label_port(dirsrv.sslport, remove_label=True)
 
+    # If this was the last instance, remove the ssca directory
+    insts = dirsrv.list(all=True)
+    if len(insts) == 0:
+        # Remove /etc/dirsrv/ssca
+        try:
+            shutil.rmtree(ssca_path)
+        except FileNotFoundError:
+            pass
+
     # Done!
     _log.debug("Complete")
 
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 1a25a4e..1b3bf0d 100644
--- a/src/lib389/lib389/instance/setup.py
+++ b/src/lib389/lib389/instance/setup.py
@@ -42,9 +42,9 @@ def get_port(port, default_port, secure=False):
     # Get the port number for the interactive installer and validate it
     while 1:
         if secure:
-            val = input('\nEnter secure port number [{}]: '.format(default_port))
+            val = input('\nEnter secure port number [{}]: '.format(default_port)).rstrip()
         else:
-            val = input('\nEnter port number [{}]: '.format(default_port))
+            val = input('\nEnter port number [{}]: '.format(default_port)).rstrip()
 
         if val != "" or default_port == "":
             # Validate port is number and in a valid range
@@ -224,7 +224,7 @@ class SetupDs(object):
         """Check if instance name is already taken
         :param serverid - name of the server instance
         :param prefix - name of prefix build location
-        :return True - if the serfver id is already in use
+        :return True - if the server id is already in use
                 False - if the server id is available
         """
         if prefix != "/usr":
@@ -275,19 +275,19 @@ class SetupDs(object):
                  'schema_dir': ds_paths.schema_dir}
 
         # Start asking questions, beginning with the hostname...
-        val = input('\nEnter system\'s hostname [{}]: '.format(general['full_machine_name']))
+        val = input('\nEnter system\'s hostname [{}]: '.format(general['full_machine_name'])).rstrip()
         if val != "":
             general['full_machine_name'] = val
 
         # Strict host name checking
         msg = ("\nUse strict hostname verification (set to \"no\" if using GSSAPI behind a load balancer) [yes]: ")
         while 1:
-            val = input(msg)
+            val = input(msg).rstrip().lower()
             if val != "":
-                if val.lower() == "no" or val.lower() == "n":
+                if val == "no" or val == "n":
                     slapd['strict_host_checking'] = False
                     break
-                if val.lower() == "yes" or val.lower() == "y":
+                if val == "yes" or val == "y":
                     # Use default
                     break
 
@@ -305,7 +305,7 @@ class SetupDs(object):
             if self._server_id_taken(slapd['instance_name'], prefix=slapd['prefix']):
                 slapd['instance_name'] = ""
 
-            val = input('\nEnter the instance name [{}]: '.format(slapd['instance_name']))
+            val = input('\nEnter the instance name [{}]: '.format(slapd['instance_name'])).rstrip()
             if val != "":
                 if not all(ord(c) < 128 for c in val):
                     print("Server identifier can not contain non ascii characters")
@@ -355,12 +355,12 @@ class SetupDs(object):
 
         # Self-Signed Cert DB
         while 1:
-            val = input('\nCreate self-signed certificate database [yes]: ')
+            val = input('\nCreate self-signed certificate database [yes]: ').rstrip().lower()
             if val != "":
-                if val.lower() == 'no' or val.lower() == "n":
+                if val== 'no' or val == "n":
                     slapd['self_sign_cert'] = False
                     break
-                elif val.lower() == "yes" or val.lower() == "y":
+                elif val == "yes" or val == "y":
                     # Default value is already yes
                     break
                 else:
@@ -383,7 +383,7 @@ class SetupDs(object):
 
         # Root DN
         while 1:
-            val = input('\nEnter Directory Manager DN [{}]: '.format(slapd['root_dn']))
+            val = input('\nEnter Directory Manager DN [{}]: '.format(slapd['root_dn'])).rstrip()
             if val != '':
                 # Validate value is a DN
                 if is_a_dn(val, allow_anon=False):
@@ -398,12 +398,12 @@ class SetupDs(object):
 
         # Root DN Password
         while 1:
-            rootpw1 = getpass.getpass('\nEnter the Directory Manager password: ')
+            rootpw1 = getpass.getpass('\nEnter the Directory Manager password: ').rstrip()
             if rootpw1 == '':
                 print('Password can not be empty')
                 continue
 
-            rootpw2 = getpass.getpass('Confirm the Directory Manager Password: ')
+            rootpw2 = getpass.getpass('Confirm the Directory Manager Password: ').rstrip()
             if rootpw1 != rootpw2:
                 print('Passwords do not match')
                 continue
@@ -424,7 +424,7 @@ class SetupDs(object):
                 suffix += ",dc=" + comp
 
         while 1:
-            val = input("\nEnter the database suffix (or enter \"none\" to skip) [{}]: ".format(suffix))
+            val = input("\nEnter the database suffix (or enter \"none\" to skip) [{}]: ".format(suffix)).rstrip()
             if val != '':
                 if val.lower() == "none":
                     # No database, no problem
@@ -443,11 +443,11 @@ class SetupDs(object):
         # Add sample entries?
         if len(backends) > 0:
             while 1:
-                val = input("\nCreate sample entries in the suffix [no]: ".format(suffix))
+                val = input("\nCreate sample entries in the suffix [no]: ".format(suffix)).rstrip().lower()
                 if val != "":
-                    if val.lower() == "no" or val.lower() == "n":
+                    if val == "no" or val == "n":
                         break
-                    if val.lower() == "yes" or val.lower() == "y":
+                    if val == "yes" or val == "y":
                         backend['sample_entries'] = INSTALL_LATEST_CONFIG
                         break
 
@@ -459,11 +459,11 @@ class SetupDs(object):
 
         # Are you ready?
         while 1:
-            val = input('\nAre you ready to install? [no]: ')
-            if val == '' or val.lower() == "no" or val.lower() == 'n':
+            val = input('\nAre you ready to install? [no]: ').rstrip().lower()
+            if val == '' or val == "no" or val == 'n':
                 print('Aborting installation...')
                 sys.exit(0)
-            elif val.lower() == 'yes' or val.lower() == 'y':
+            elif val == 'yes' or val == 'y':
                 # lets do it!
                 break
             else:
diff --git a/src/lib389/lib389/replica.py b/src/lib389/lib389/replica.py
index 7d23c8d..ca18374 100644
--- a/src/lib389/lib389/replica.py
+++ b/src/lib389/lib389/replica.py
@@ -1242,6 +1242,14 @@ class Replica(DSLdapObject):
         """
         self.replace('nsds5task', 'cl2ldif')
 
+    def get_suffix(self):
+        """Return the suffix
+        """
+        if self._suffix is None:
+            self._populate_suffix()
+
+        return self._suffix
+
 
 class Replicas(DSLdapObjects):
     """Replica DSLdapObjects for all replicas