diff options
author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-16 20:44:44 +0000 |
---|---|---|
committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-16 20:44:44 +0000 |
commit | bd05b7010070d3e8b66218227045e48ad38fb761 (patch) | |
tree | f477696784d5db6475cfd371c250204c1d715257 /pki | |
parent | 8c0b3a5cd9b30c4e2bf818bab016ce293c7ad290 (diff) | |
download | pki-bd05b7010070d3e8b66218227045e48ad38fb761.tar.gz pki-bd05b7010070d3e8b66218227045e48ad38fb761.tar.xz pki-bd05b7010070d3e8b66218227045e48ad38fb761.zip |
Fixed bugzilla bugs: 607373 and 607374.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1193 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
5 files changed, 265 insertions, 16 deletions
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template index 3a9d6a607..d49a69b61 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template @@ -111,21 +111,21 @@ document.write("</tr></table>"); <td><i>Tokens</i></td> </tr> <tr> - <td><li><a href="tus?op=search">List/Search Tokens</a></td> + <td>• <a href="tus?op=search">List/Search Tokens</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Certificates</i></td> </tr> <tr> - <td><li><a href="tus?op=search_certificate">List/Search Certificates</a></td> + <td>• <a href="tus?op=search_certificate">List/Search Certificates</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Activities</i></td> </tr> <tr> - <td><li><a href="tus?op=search_activity">List/Search Activities</a></td> + <td>• <a href="tus?op=search_activity">List/Search Activities</a></td> </tr> <tr> <td></td> @@ -138,7 +138,7 @@ document.write("</tr></table>"); <!-- var target_array = agent_target_list.split(","); for (var i=0; i< target_array.length ; i++) { - document.write("<tr><td><li><a href=\"tus?op=agent_select_config&type=" + target_array[i] + "\">" + + document.write("<tr><td>• <a href=\"tus?op=agent_select_config&type=" + target_array[i] + "\">" + target_array[i].replace(/_/g, " ") + "</a></td> </tr>"); } //--> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template index 702d11d9b..9164dd748 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template @@ -109,37 +109,44 @@ document.write("</tr></table>"); <td><i>Tokens</i></td> </tr> <tr> - <td><li><a href="tus?op=search_admin">List/Search Tokens</a></td> + <td>• <a href="tus?op=search_admin">List/Search Tokens</a></td> </tr> <tr> - <td><li><a href="tus?op=new">Add New Token</a></td> + <td>• <a href="tus?op=new">Add New Token</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Users</i></td> </tr> <tr> - <td><li><a href="tus?op=add_user?tid=&uid=">Add User</a></td> + <td>• <a href="tus?op=add_user?tid=&uid=">Add User</a></td> </tr> <tr> - <td><li><a href="tus?op=view_users">List Users</a></td> + <td>• <a href="tus?op=view_users">List Users</a></td> </tr> <tr> - <td><li><a href="tus?op=search_users">Search Users</a></td> + <td>• <a href="tus?op=search_users">Search Users</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Activities</i></td> </tr> <tr> - <td><li><a href="tus?op=search_activity_admin">List/Search Activities</a></td> + <td>• <a href="tus?op=search_activity_admin">List/Search Activities</a></td> + </tr> + <tr><td> </td></tr> + <tr> + <td><i>Self Tests</i></td> + </tr> + <tr> + <td>• <a href="tus?op=self_test">Run Self Tests</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Auditing</i></td> </tr> <tr> - <td><li><a href="tus?op=audit_admin">Configure Signed Audit</a></td> + <td>• <a href="tus?op=audit_admin">Configure Signed Audit</a></td> </tr> <tr><td> </td></tr> <tr> @@ -149,7 +156,7 @@ document.write("</tr></table>"); <!-- var target_array = target_list.split(","); for (var i=0; i< target_array.length ; i++) { - document.write("<tr><td><li><a href=\"tus?op=select_config_parameter&type=" + target_array[i] + "\">" + + document.write("<tr><td>• <a href=\"tus?op=select_config_parameter&type=" + target_array[i] + "\">" + target_array[i].replace(/_/g, " ") + "</a></td> </tr>"); } //--> @@ -159,7 +166,7 @@ document.write("</tr></table>"); <input TYPE=hidden NAME=query VALUE="op=edit_config_parameter"> <input TYPE=HIDDEN NAME=ptype VALUE="Generals"> <input TYPE=HIDDEN NAME=pname VALUE="General"> - <td><li><a href="javascript:submitEditForm(this)">General</a></td> + <td>• <a href="javascript:submitEditForm(this)">General</a></td> </form> </tr> </table> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template index 184939c4c..27b25c08a 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template @@ -103,21 +103,21 @@ document.write("</tr></table>"); <td><i>Tokens</i></td> </tr> <tr> - <td><li><a href="tus?op=search&top=operator">List/Search Tokens</a></td> + <td>• <a href="tus?op=search&top=operator">List/Search Tokens</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Certificates</i></td> </tr> <tr> - <td><li><a href="tus?op=search_certificate&top=operator">List/Search Certificates</a></td> + <td>• <a href="tus?op=search_certificate&top=operator">List/Search Certificates</a></td> </tr> <tr><td> </td></tr> <tr> <td><i>Activities</i></td> </tr> <tr> - <td><li><a href="tus?op=search_activity&top=operator">List/Search Activities</a></td> + <td>• <a href="tus?op=search_activity&top=operator">List/Search Activities</a></td> </tr> <tr> <td></td> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template new file mode 100644 index 000000000..22002f52d --- /dev/null +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template @@ -0,0 +1,129 @@ +<!-- --- 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> +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> +<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" /> +<HEAD> +<TITLE>TPS</Title> +</HEAD> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <td> + <table border="0" cellspacing="12" cellpadding="0"> + <tr> + <td><img src="/tps/admin/console/img/logo_header.gif"></td> + <td> </td> + <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">®</font></sup> TPS Services</b></font></td> + </tr> + </table> + </td> + </tr> +</table> +<p> + +<BODY> + +<CMS_TEMPLATE> + +<SCRIPT type="text/JavaScript"> +<!-- +var uri0 = ""; +if (typeof(uriBase) == "undefined") { + uri0 += "/tus"; +} else { + uri0 += uriBase; +} + +document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+ + "<a href=\""+uri0+"\">Main Menu</a> : Admin Operations : Run Self Tests</font>\n"); +document.write("<table width=\"100%\"><tr><td align=\"right\">" + + "<b>UID:</b>" + + userid + "</td></tr></table>\n"); +document.write("<HR NOSHADE SIZE=1>\n"); + +function runSelfTest(form) { + var uri = ""; + if (typeof(uriBase) == "undefined") { + uri += "/tus" + } else { + uri += uriBase; + } + if (enabledTests > 0) { + document.selfTestForm.action = uri; + return true; + } else { + alert("Self tests are not enabled."); + return false; + } +} +//--> +</SCRIPT> + +<FORM NAME ="selfTestForm" METHOD="POST" onSubmit="return runSelfTest(this)" > +<input TYPE="hidden" NAME="query" VALUE="op=run_self_test"> + +<SCRIPT type="text/JavaScript"> +<!-- +if ((typeof(test_list) != "undefined") && (test_list.length > 0)) { + document.write("<center>\n"); + document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0>\n"); + document.write("<tr bgcolor=#e5e5e5>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> Enable </font></td>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> Critical </font></td>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> Test </font></td>\n"); + document.write("</tr>\n"); + var enabledTests = 0 + for (var i = 0, k = 1; i < test_list.length; i++) { + document.write("<tr bgcolor=#efefef>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> "); + document.write("<input type=checkbox name=\"enable"+test_list[i]+"\" value=\"enable"+test_list[i]+"\" "); + if ((typeof(enabled) != "undefined") && (enabled & k)) { + document.write("CHECKED"); + enabledTests++; + } + document.write(" DISABLED>\n"); + document.write(" </font></td>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> "); + document.write("<input type=checkbox name=\"critical"+test_list[i]+"\" value=\"critical"+test_list[i]+"\" "); + if ((typeof(critical) != "undefined") && (critical & k)) { + document.write("CHECKED"); + } + document.write(" DISABLED>\n"); + document.write(" </font></td>\n"); + document.write("<td><font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"> "); + document.write(test_list[i]); + document.write(" </font></td>\n"); + document.write("</tr>\n"); + k *= 2; + } + document.write("</table>\n"); + document.write("<HR NOSHADE SIZE=1>\n"); + document.write("<DIV ALIGN=RIGHT>\n"); + document.write("<input TYPE=submit VALUE=\"Run\">\n"); +} else { + document.write("Error: Missing self test list.\n"); + document.write("<HR NOSHADE SIZE=1>\n"); +} +//--> +</SCRIPT> + +</form> +</BODY> +</HTML> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template new file mode 100644 index 000000000..3495abaf6 --- /dev/null +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template @@ -0,0 +1,113 @@ +<!-- --- 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> +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> +<link rel="shortcut icon" href="/tps/admin/console/img/favicon.ico" /> +<HEAD> +<TITLE>TPS</Title> +</HEAD> + +<table border="0" width="100%" cellspacing="0" cellpadding="0" bgcolor="#000080"> + <tr> + <td> + <table border="0" cellspacing="12" cellpadding="0"> + <tr> + <td><img src="/tps/admin/console/img/logo_header.gif"></td> + <td> </td> + <td><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white"><b>Dogtag<sup><font color="#999999" size="-2">®</font></sup> TPS Services</b></font></td> + </tr> + </table> + </td> + </tr> +</table> +<p> + +<BODY> + +<CMS_TEMPLATE> + +<SCRIPT type="text/JavaScript"> +<!-- +var uri = ""; +if (typeof(uriBase) == "undefined") { + uri += "/tus"; +} else { + uri += uriBase; +} + +document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+ + "<a href=\""+uri+"\">Main Menu</a></font>\n"); +document.write("<table width=\"100%\"><tr><td align=\"right\">" + + "<b>UID:</b>" + + userid + "</td></tr></table>\n"); +document.write("<HR NOSHADE SIZE=1>\n"); + +if (typeof(result) == "undefined") { + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">\n"); + document.write("Error: Missing self test results.</font>\n"); +} else { + if (typeof(test_list) == "undefined" || test_list.length == 0) { + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">\n"); + document.write("Error: List of self tests is not available.</font>\n"); + } else { + var enabledTests = 0 + for (var i = 0, k = 1; i < test_list.length; i++) { + if ((typeof(enabled) != "undefined") && (enabled & k)) { + enabledTests++; + } + k *= 2; + } + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">\n"); + if (enabledTests == 0) { + document.write("Self tests are not enabled."); + } else { + if (result == 0) { + document.write("Self test"+((enabledTests > 1)?"s ":" ")); + for (i = 0, k = 1, n = 0; i < test_list.length; i++) { + if ((typeof(enabled) != "undefined") && (enabled & k)) { + if (n > 0) { + document.write(", "); + } + document.write("\""+test_list[i]+"\""); + n++; + } + k *= 2; + } + document.write(((enabledTests > 1)?" are":" is")+" completed successfully.\n"); + } else if (result > -4 && result < 4) { + document.write("Self test \""+test_list[0]+"\" encounter "+((result < 0)?"critical":"")+" failure: "+result+"\n"); + if (result < 0) { + document.write("<br><b>Please stop the server immediately.</b>\n"); + } + } else { + document.write("Self test \""+test_list[1]+"\" encounter "+((result < 0)?"critical":"")+" failure: "+result+"\n"); + if (result < 0) { + document.write("<br><b>Please stop the server immediately.</b>\n"); + } + } + } + document.write("</font>\n"); + } +} +document.write("<BR>\n<HR NOSHADE SIZE=1>\n"); +//--> +</SCRIPT> + +</BODY> +</HTML> |