Fix Bugzilla Bug 630121 - OCSP responder lacking option to delete or disable a CA that it serves

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

3 files changed, 103 insertions, 8 deletions

diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 0af07f8e8..e6199278b 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -16,7 +16,7 @@ BuildRequires:  jpackage-utils
 BuildRequires:  jss >= 4.2.6
 BuildRequires:  ldapjdk
 BuildRequires:  osutil
-BuildRequires:  pki-symkey
+#BuildRequires:  pki-symkey
 BuildRequires:  pki-util
 BuildRequires:  velocity
 BuildRequires:  xalan-j2
@@ -28,7 +28,7 @@ Requires:       osutil
 Requires:       pki-common-ui
 Requires:       pki-java-tools
 Requires:       pki-setup
-Requires:       pki-symkey
+#Requires:       pki-symkey
 Requires:       tomcatjss
 Requires:       %{_javadir}/ldapjdk.jar
 Requires:       %{_javadir}/velocity.jar
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
index 1cccf9e08..494df1d58 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
@@ -55,7 +55,7 @@ List Certificate Authorities
     document.writeln('<tr>');
     document.writeln('<td align="left" width="5%">');
     document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-    document.writeln('<li>Number of pending updates:' + header.stateCount);
+    document.writeln('&bull;&nbsp;Number of pending updates:' + header.stateCount);
     document.writeln('</font></td>');
     document.writeln('</tr>');
 
@@ -78,36 +78,66 @@ List Certificate Authorities
 	    document.writeln('<tr>');
 	    document.writeln('<td align="left" width="5%">');
 	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-	    document.writeln('<li>CRL Number:' + result.recordSet[i].CRLNumber);
+	    document.writeln('&bull;&nbsp;CRL Number:' + result.recordSet[i].CRLNumber);
 	    document.writeln('</font></td>');
 	    document.writeln('</tr>');
 	    document.writeln('<tr>');
 	    document.writeln('<td align="left" width="5%">');
 	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-	    document.writeln('<li>This Update:' + result.recordSet[i].ThisUpdate);
+	    document.writeln('&bull;&nbsp;This Update:' + result.recordSet[i].ThisUpdate);
 	    document.writeln('</font></td>');
 	    document.writeln('</tr>');
 	    document.writeln('<tr>');
 	    document.writeln('<td align="left" width="5%">');
 	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Next Update:' + result.recordSet[i].NextUpdate);
+            document.writeln('&bull;&nbsp;Next Update:' + result.recordSet[i].NextUpdate);
 	    document.writeln('</font></td>');
 	    document.writeln('</tr>');
 	    document.writeln('<tr>');
 	    document.writeln('<td align="left" width="5%">');
 	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Number of Revoked Certificates:' + result.recordSet[i].NumRevoked);
+            document.writeln('&bull;&nbsp;Number of Revoked Certificates:' + result.recordSet[i].NumRevoked);
 	    document.writeln('</font></td>');
 	    document.writeln('</tr>');
 	    document.writeln('<tr>');
 	    document.writeln('<td align="left" width="5%">');
 	    document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
-            document.writeln('<li>Requests Served Since Startup:' + result.recordSet[i].ReqCount);
+            document.writeln('&bull;&nbsp;Requests Served Since Startup:' + result.recordSet[i].ReqCount);
 	    document.writeln('</font></td>');
 	    document.writeln('</tr>');
+	    document.writeln('<tr>');
+       	    document.writeln('<td align="left" width="5%"><b>');
+            document.writeln('<font size=-1 face="PrimaSans BT, Verdana, sans-serif">');
+            document.writeln('&bull;&nbsp; Remove this CA from the list -');
+            document.writeln('</font></b></td>');
+            document.writeln('</tr>');
+            document.writeln('<tr>');
+            document.writeln('<td align ="left" width="5%">');
+            document.writeln('<button  onClick="removeCertificateAuthority( ' + i  + ')" VALUE="removeca">Remove CA </button>');
+            document.writeln('</td>');
+            document.writeln('</tr>');
+            document.writeln('<tr><td><br></td></tr>');
       }
     document.writeln('</table>');
     document.writeln('</td></tr></table>');
+
+    function removeCertificateAuthority(caIndex)
+    {
+        var id = result.recordSet[caIndex].Id;
+        var url = null;
+        var sure = true;
+
+        if(id)
+           url = "/ocsp/agent/ocsp/removeCA?caID="+id;
+
+        if(url) {
+           if(caIndex == 0)
+              sure = confirm("Are you sure you want to remove the initial CA?\n" + id);
+           if(sure) 
+              document.location=url;    
+        }
+    }
+
 //-->
 </SCRIPT>
 
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
new file mode 100755
index 000000000..e8903ea18
--- /dev/null
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
@@ -0,0 +1,65 @@
+<!-- --- BEGIN COPYRIGHT BLOCK ---
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; version 2 of the License.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     with this program; if not, write to the Free Software Foundation, Inc.,
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+     Copyright (C) 2007 Red Hat, Inc.
+     All rights reserved.
+     --- END COPYRIGHT BLOCK --- -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+   <title>Removing Certificate Authority</title>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<SCRIPT LANGUAGE="JavaScript"></SCRIPT>
+<SCRIPT LANGUAGE="JavaScript" SRC="/helpfun.js"></SCRIPT>
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+if (navigator.appName == "Microsoft Internet Explorer") {
+    document.writeln('<META HTTP-EQUIV="Pragma" CONTENT="no-cache">');
+}
+//-->
+</SCRIPT>
+</head>
+
+<CMS_TEMPLATE>
+
+<body bgcolor="#FFFFFF" link="#6666CC" vlink="#6666CC" alink="#333399">
+<font face="PrimaSans BT, Verdana, sans-serif" size="+1">
+Removing Certificate Authority
+</font><br>
+<table border="0" cellspacing="0" cellpadding="0" background="/graphics/hr.gif" width="100%">
+  <tr> 
+    <td>&nbsp;</td>
+  </tr>
+</table>
+<br>
+
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+    document.writeln('Certificate authority has been removed');
+    setTimeout ( goBackToList, 2000 );
+
+    if (result.header.error != null) {
+        document.write('\nAdditional information:\n    ');
+        document.writeln(result.header.error);
+    }
+
+    function goBackToList() {
+       document.location="/ocsp/agent/ocsp/listCAs";
+    }
+//-->
+</SCRIPT>
+
+</BODY>
+</HTML>
+