Bugzilla 224835, 367171: edit nicknames and sizepanel

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@262 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

5 files changed, 53 insertions, 9 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
index 034cfd6cd..b64ac4622 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
+++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
@@ -241,6 +241,12 @@ public class HttpInput
     {
         return getString(request, name);
     }
+
+    public static String getNickname(HttpServletRequest request, String name)
+        throws IOException
+    {
+        return getString(request, name);
+    }
                                                                                 
     public static String getHostname(HttpServletRequest request, String name)
         throws IOException
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
index 4de73d2da..88b13453f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
@@ -51,6 +51,10 @@ public class Cert {
         return mEnable;
     }
 
+    public void setNickname(String s) {
+        mNickname = s;
+    }
+
     public String getNickname() {
         return mNickname;
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 1767bdf84..427a662f3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
@@ -443,7 +443,9 @@ public class CertRequestPanel extends WizardPanelBase {
     private boolean findBootstrapServerCert() {
         IConfigStore cs = CMS.getConfigStore();
         try {
-            String nickname = cs.getString("preop.cert.sslserver.nickname", "");
+            String instanceID = cs.getString("instanceId", "");
+            String nickname = "Server-Cert cert-" + instanceID;
+
             CryptoManager cm = CryptoManager.getInstance();
             X509Certificate cert = cm.findCertByNickname(nickname);
             Principal issuerDN = cert.getIssuerDN();
@@ -460,7 +462,9 @@ public class CertRequestPanel extends WizardPanelBase {
     private void deleteBootstrapServerCert() {
         IConfigStore cs = CMS.getConfigStore();
         try {
-            String nickname = cs.getString("preop.cert.sslserver.nickname", "");
+            String instanceID = cs.getString("instanceId", "");
+            String nickname = "Server-Cert cert-" + instanceID;
+
             deleteCert("Internal Key Storage Token", nickname);
         } catch (Exception e) {
             CMS.debug("CertRequestPanel deleteBootstrapServerCert Exception="+e.toString());
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index 8eafdeac5..75a524e5a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
@@ -562,16 +562,29 @@ public class NamePanel extends WizardPanelBase {
    {
             CMS.debug("NamePanel: configCertWithTag start");
             Enumeration c = mCerts.elements();
-
+            IConfigStore config = CMS.getConfigStore();
+         
             while (c.hasMoreElements()) {
                 Cert cert = (Cert) c.nextElement();
                 String ct = cert.getCertTag(); 
                 CMS.debug("NamePanel: configCertWithTag ct=" + ct + 
                         " tag=" +tag);
                 if (ct.equals(tag)) {
-                  configCert(request, response, context, cert);
-                  CMS.debug("NamePanel: configCertWithTag done with tag=" + tag);
-                  return;
+                    try {
+                        String nickname = HttpInput.getNickname(request, ct + "_nick");
+                        if (nickname != null) {
+                            CMS.debug("configCertWithTag: Setting nickname for " + ct + " to " + nickname);
+                            config.putString(PCERT_PREFIX  + ct + ".nickname", nickname);
+                            cert.setNickname(nickname);
+                            config.commit(false);
+			}
+                    } catch (Exception e) {
+                        CMS.debug("NamePanel: configCertWithTag: Exception in setting nickname for " + ct + ": " + e.toString());
+                    }
+
+                    configCert(request, response, context, cert);
+                    CMS.debug("NamePanel: configCertWithTag done with tag=" + tag);
+                    return;
                 }
            }
             CMS.debug("NamePanel: configCertWithTag done");
@@ -598,6 +611,12 @@ public class NamePanel extends WizardPanelBase {
 
                 if (!olddn.equals(dn))
                     hasChanged = true;
+
+               String oldnick = config.getString(PCERT_PREFIX + ct + ".nickname");
+               String nick = HttpInput.getNickname(request, ct + "_nick");
+               if (!oldnick.equals(nick))
+                   hasChanged = true;
+
             }
         } catch (Exception e) {
         }
@@ -727,7 +746,6 @@ public class NamePanel extends WizardPanelBase {
             while (c.hasMoreElements()) {
                 Cert cert = (Cert) c.nextElement();
                 String ct = cert.getCertTag(); 
-                String nickname = cert.getNickname();
                 String tokenname = cert.getTokenname();
                 boolean enable = config.getBoolean(PCERT_PREFIX+ct+".enable", true);
                 if (!enable)
@@ -737,10 +755,20 @@ public class NamePanel extends WizardPanelBase {
                 if (certDone)
                     continue;
 
+                // get the nicknames and put in config
+                String nickname = HttpInput.getNickname(request, ct + "_nick");
+                if (nickname != null) {
+                    CMS.debug("NamePanel: update: Setting nickname for " + ct + " to " + nickname);
+                    config.putString(PCERT_PREFIX + ct + ".nickname", nickname);
+                    cert.setNickname(nickname);
+                } else {
+                    nickname = cert.getNickname();
+                }
+
                 // get the dn's and put in config
-                String dn = HttpInput.getDN(request, cert.getCertTag());
+                String dn = HttpInput.getDN(request, ct);
 
-                config.putString(PCERT_PREFIX + cert.getCertTag() + ".dn", dn);
+                config.putString(PCERT_PREFIX + ct + ".dn", dn);
                 // commit here in case it changes
                 config.commit(false);
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
index 131eebd22..d5b6f7d1b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
@@ -170,6 +170,7 @@ public class SizePanel extends WizardPanelBase {
         context.put("certs", mCerts);
         context.put("errorString", errorString);
         context.put("default_keysize", DEFAULT_RSA_KEY_SIZE);
+        context.put("default_ecc_keysize", DEFAULT_ECC_KEY_SIZE);
         context.put("panel", "admin/console/config/sizepanel.vm");
     }
 
@@ -474,6 +475,7 @@ public class SizePanel extends WizardPanelBase {
         context.put("title", "Key Pairs");
         context.put("certs", mCerts);
         context.put("default_keysize", DEFAULT_RSA_KEY_SIZE);
+        context.put("default_ecc_keysize", DEFAULT_ECC_KEY_SIZE);
         context.put("panel", "admin/console/config/sizepanel.vm");
     }
 }