diff options
author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-24 19:29:49 +0000 |
---|---|---|
committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-24 19:29:49 +0000 |
commit | 9198e50726847c12dd842c075e996115c9cd2e31 (patch) | |
tree | 40a08c9b22ecd232c27087c6f558260645f36633 /pki/dogtag | |
parent | aacc2fa90239c3b613ecb9804e356baaa3fd2ab1 (diff) | |
download | pki-9198e50726847c12dd842c075e996115c9cd2e31.tar.gz pki-9198e50726847c12dd842c075e996115c9cd2e31.tar.xz pki-9198e50726847c12dd842c075e996115c9cd2e31.zip |
Bugzilla 490452 support for signed audit in UI
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@318 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag')
-rw-r--r-- | pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template | 194 | ||||
-rw-r--r-- | pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template | 6 | ||||
-rw-r--r-- | pki/dogtag/tps/pki-tps.spec | 4 |
4 files changed, 206 insertions, 2 deletions
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec index b4f74211b..5e12be945 100644 --- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec +++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_ui_prefix}-%{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 12 +%define base_release 13 %define base_group System Environment/Base %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Tue Mar 24 2009 Ade Lee <alee@redhat.com> 1.0.0-13 +- Bugzilla 490452 support for signed audit in UI * Tue Mar 17 2009 Ade Lee <alee@redhat.com> 1.0.0-12 - Bugzilla 489318 TPS does not list more than 20 activities * Wed Mar 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11 diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template new file mode 100644 index 000000000..bfad303fd --- /dev/null +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template @@ -0,0 +1,194 @@ +<!-- --- BEGIN COPYRIGHT BLOCK --- + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; 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"> +<HEAD> +<TITLE>TPS</Title> +</HEAD> + +<table border="0" width="100%" cellspacing="0" cellpadding="6"> + <tr bgcolor="#666699"> + <td width=25%> + <table border="0" cellspacing="0" cellpadding="6"> + <tr> + <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>®<br> + Certificate<br>System</b></font> </td> + </tr> + </table> + </td> + <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td> + <td width="10%"> </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> : Administrator Operations : Configure Audit Logging</font>\n"); + +if ((typeof(flash) != "undefined") && (flash != "")) { + document.write("<table width=\"100%\"><tr><td align=\"left\">" + + "<font color=\"#ff0000\"><b>" + flash.replace(/\+/g, " ") + "</b><font>" + + "</td></tr></table>\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 doUpdateAudit(form) { + var uri = ""; + if (typeof(uriBase) == "undefined") { + uri += "/tus"; + } else { + uri += uriBase; + } + this.action = uri; + return true; +} + +function doCancel() { + var uri = ""; + if (typeof(uriBase) == "undefined") { + uri += "/tus"; + } else { + uri += uriBase; + } + location.href = uri; +} + + + document.write("<BR>"); + document.write("<form NAME =\"editAuditForm\" METHOD=POST onSubmit=\"return doUpdateAudit(this);\">"); + document.write("<input TYPE=HIDDEN NAME=query VALUE=\"op=update_audit_admin\">"); + + document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n"); + document.write("<tr>\n"); + document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n"); + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+ + "Enable Audit Logging: </font>\n"); + document.write("</td>\n"); + document.write("<td>\n"); + if (signedAuditEnable == "true") { + document.write("<input TYPE=RADIO NAME=auditEnable VALUE=\"true\" checked> Enable "); + document.write("<input TYPE=RADIO NAME=auditEnable VALUE=\"false\"> Disable"); + } else { + document.write("<input TYPE=RADIO NAME=auditEnable VALUE=\"true\" > Enable "); + document.write("<input TYPE=RADIO NAME=auditEnable VALUE=\"false\" checked> Disable"); + } + document.write("</td>\n"); + document.write("</tr>\n"); + + document.write("<tr>\n"); + document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n"); + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+ + "Enable Audit Log Signing: </font>\n"); + document.write("</td>\n"); + document.write("<td>\n"); + if (logSigningEnable == "true") { + document.write("<input TYPE=RADIO NAME=logSigningEnable VALUE=\"true\" checked> Enable "); + document.write("<input TYPE=RADIO NAME=logSigningEnable VALUE=\"false\"> Disable"); + } else { + document.write("<input TYPE=RADIO NAME=logSigningEnable VALUE=\"true\" > Enable "); + document.write("<input TYPE=RADIO NAME=logSigningEnable VALUE=\"false\" checked> Disable"); + } + document.write("</td>\n"); + document.write("</tr>\n"); + + var nonselectable_array = signedAuditNonSelectableEvents.split(","); + document.write("<tr>\n"); + document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n"); + document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+ + "Events Always Logged: </font>\n"); + document.write("</td>\n"); + document.write("<td>\n"); + document.write("<textarea name=nonselect cols=40 rows=10 >\n"); + for (var i=0; i< nonselectable_array.length; i++) { + document.write(nonselectable_array[i] + "\n"); + } + document.write("</textarea>\n"); + document.write("</td>\n"); + document.write("</tr>\n"); + + document.write("</table>\n"); + + document.write("<BR>\n<HR NOSHADE SIZE=1>\n"); + + document.write("<p> Selected Optional Events to be logged: </p>"); + var selectable_array = signedAuditSelectableEvents.split(","); + var signedAuditSelectedEvents_tmp = "," + signedAuditSelectedEvents + ","; + + + if ((typeof(selectable_array) != "undefined") && (selectable_array.length > 0)) { + document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n"); + for (var i=0; i < selectable_array.length; i++) { + if (i % 3 == 0) { + document.write("<tr bgcolor=#e5e5e5>\n"); + } + document.write("<td>" + selectable_array[i] + "</td>"); + if (signedAuditSelectedEvents_tmp.search("," + selectable_array[i] + ",") != -1) { + document.write("<td><input type=checkbox name=\"event_" + i + "\" value=\"" + selectable_array[i] + "\" checked></td>"); + } else { + document.write("<td><input type=checkbox name=\"event_" + i + "\" value=\"" + selectable_array[i] + "\"></td>"); + } + + if ((i % 3 == 2) || (i == (selectable_array.length - 1))) { + document.write("</tr>"); + } + } + document.write("</table>"); + } else { + document.write("<p>There are no optional events to select.</p>"); + } + + document.write("<input type=hidden name=\"nEvents\" value=" + selectable_array.length + ">"); + + document.write("<DIV ALIGN=RIGHT>\n"); + document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0>\n"); + document.write("<tr>\n"); + document.write("<td>\n"); + document.write("<input TYPE=submit VALUE=Update>"); + document.write("</td>\n"); + document.write("<td>\n"); + document.write("<input TYPE=button VALUE=Cancel onClick=\"doCancel();\">"); + document.write("</td>\n"); + document.write("</form>\n"); + document.write("</tr>\n"); + document.write("</table>\n"); + + +//--> +</SCRIPT> + +</BODY> +</HTML> diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template index 28dce4d5c..61eb5b88f 100644 --- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template +++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template @@ -134,6 +134,12 @@ document.write("</tr></table>"); <tr> <td><li><a href="tus?op=search_activity_admin">Search Activities</a></td> </tr> + <tr> + <td><i>Auditing</i></td> + </tr> + <tr> + <td><li><a href="tus?op=audit_admin">Configure Signed Audit</a></td> + </tr> </table> <HR NOSHADE SIZE=1> <DIV ALIGN=RIGHT> diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec index d59c921f9..9152b40e3 100644 --- a/pki/dogtag/tps/pki-tps.spec +++ b/pki/dogtag/tps/pki-tps.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 39 +%define base_release 40 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license LGPLv2 with exceptions @@ -313,6 +313,8 @@ fi ############################################################################### %changelog +* Tue Mar 24 2009 Ade Lee <alee@redhat.com> 1.0.0-40 +- Bugzilla 490452 support for signed audit in UI * Fri Mar 20 2009 Ade Lee <alee@redhat.com> 1.0.0-39 - Bugzilla 489318 TPS does not list more than 20 activities * Wed Mar 18 2009 Christina Fu <cfu@redhat.com> 1.0.0-38 |