Reorganized RA templates and scripts.

The templates, JS, and CGI scripts for RA have been moved into
the RA core package.

Ticket #407

8 files changed, 800 insertions, 0 deletions

diff --git a/base/ra/apache/docroot/agent/cert/index.cgi b/base/ra/apache/docroot/agent/cert/index.cgi
new file mode 100755
index 000000000..46e5b8c2c
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/index.cgi
@@ -0,0 +1,119 @@
+#!/usr/bin/perl
+#
+# --- 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 ---
+#
+#
+#
+#
+
+package op;
+
+use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
+
+use DBI;
+use CGI;
+use Template::Velocity;
+use PKI::RA::GlobalVar;
+use PKI::Base::Conf;
+use PKI::Base::Util;
+use PKI::Base::Registry;
+use PKI::Base::CertStore;
+
+use vars qw (@ISA);
+use PKI::Service::Op;
+@ISA = qw(PKI::Service::Op);
+
+sub new {
+  my $self = {};
+  bless ($self);
+  return $self;
+}
+
+sub process()
+{
+  my $self = shift;
+  my $q = CGI->new();
+
+  my $util = PKI::Base::Util->new();
+  my $docroot = PKI::Base::Registry->get_docroot();
+  my $parser = PKI::Base::Registry->get_parser();
+  my $cfg = PKI::Base::Registry->get_config();
+
+  $self->debug_params($cfg, $q);
+
+  if (!$self->agent_auth($cfg)) {
+    print $q->redirect("/agent/error.cgi");
+    return;
+  }
+  my $uid = $self->get_current_uid($cfg);
+
+  my %context;
+  $context{uid} = $util->html_encode($uid);
+
+  my @roles = $self->get_current_roles($cfg);
+  my $r = join(",",@roles);
+
+  my $sp = $util->get_alphanum_val($q->param('sp'));
+  if ($sp eq "") {
+    $sp = "0";
+  }
+  $context{sp} = $sp;
+  my $mc = $util->get_alphanum_val($q->param('mc'));
+  if ($mc eq "") {
+    $mc = "20";
+  }
+  $context{mc} = $mc;
+  $context{pp} = $sp - $mc; # previous pos (for paging)
+  $context{np} = $sp + $mc; # next pos (for paging)
+
+  my $cs = PKI::Base::CertStore->new();
+  $cs->open($cfg);
+  my @certs = $cs->list_certs_by_approver($uid, $sp, $mc);
+  $cs->close();
+
+  my @r;
+  my $i = 0;
+  foreach my $cert (@certs) {
+    $r[$i] = new PKI::RA::GlobalVar(
+                    getReqId => sub { return $util->html_encode($cert->{'rid'}) },
+                    getSerialno => sub { return $util->html_encode($cert->{'serialno'}) },
+                    getSubjectDN => sub { return $util->html_encode($cert->{'subject_dn'}) },
+                    getCertificate => sub { return $util->html_encode($cert->{'certificate'}) },
+                    getApprovedBy => sub { return $util->html_encode($cert->{'approved_by'}) },
+                    getCreatedAt => sub { return $util->html_encode($cert->{'created_at'}); },
+                   );
+    $i++;
+  }
+  $context{rows} = \@r;
+
+  my $result = $parser->execute_file_with_context("agent/cert/index.vm", 
+                       \%context);
+
+  my $xml = $q->param('xml');
+  if ($xml eq "true") {
+    print "Content-Type: text/xml\n\n";
+    print $self->xml_output(\%context);
+  } else {
+    print "Content-Type: text/html\n\n";
+    print "$result";
+  }
+}
+
+my $op = op->new();
+$op->execute();
diff --git a/base/ra/apache/docroot/agent/cert/index.vm b/base/ra/apache/docroot/agent/cert/index.vm
new file mode 100644
index 000000000..f9229b0f9
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/index.vm
@@ -0,0 +1,86 @@
+<!-- --- 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>
+
+<title>RA Agent</title>
+    <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+    <link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
+    <META http-equiv=Content-Type content="text/html; charset=UTF-8">
+
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+
+#include ( "header.vm" )
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+UID: $uid
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+
+
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+<a href="/agent/index.cgi">Agent Interface</a>
+<br>List Certificates Approved by: $uid
+</font><br>
+<p> 
+<center>
+<table border="1" cellspacing="1" cellpadding="1">
+<tr valign="TOP">
+<td><b>Serial#</b></td>
+<td><b>Request ID</b></td>
+<td><b>Subject DN</b></td>
+<td><b>Approved By</b></td>
+<td><b>Created At</b></td>
+</tr>
+#foreach($r in $rows)
+<tr valign="TOP">
+<td><a href="read.cgi?serialno=$r.getSerialno()">$r.getSerialno()</a></td>
+<td><a href="/agent/request/read.cgi?id=$r.getReqId()">$r.getReqId()</a></td>
+<td>$r.getSubjectDN()</td>
+<td>$r.getApprovedBy()</td>
+<td>$r.getCreatedAt()</td>
+</tr>
+#end
+</table>
+</center>
+<p>
+<a href="index.cgi?sp=$pp&mc=$mc">Previous</a> | <a href="index.cgi?sp=$np&mc=$mc">Next</a>
+#include ( "footer.vm" )
+
+</body>
+</html>
diff --git a/base/ra/apache/docroot/agent/cert/read.cgi b/base/ra/apache/docroot/agent/cert/read.cgi
new file mode 100755
index 000000000..f434baedb
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/read.cgi
@@ -0,0 +1,104 @@
+#!/usr/bin/perl
+#
+# --- 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 ---
+#
+#
+#
+#
+
+package op;
+
+use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
+
+use DBI;
+use CGI;
+use Template::Velocity;
+use PKI::Base::Conf;
+use PKI::Base::Util;
+use PKI::Base::Registry;
+use PKI::Conn::CA;
+use Encode;
+use vars qw (@ISA);
+use PKI::Service::Op;
+
+@ISA = qw(PKI::Service::Op);
+
+sub new {
+  my $self = {};
+  bless ($self);
+  return $self;
+}
+
+sub process()
+{
+  my $self = shift;
+  my $q = CGI->new();
+
+  my $util = PKI::Base::Util->new();
+  my $docroot = PKI::Base::Registry->get_docroot();
+  my $parser = PKI::Base::Registry->get_parser();
+  my $cfg = PKI::Base::Registry->get_config();
+  $self->debug_params($cfg, $q);
+
+  if (!$self->agent_auth($cfg)) {
+    print $q->redirect("/agent/error.cgi");
+    return;
+  }
+  my $uid = $self->get_current_uid($cfg);
+
+  my %context;
+  $context{uid} = $util->html_encode($uid);
+
+  my $serialno = $util->get_alphanum_val($q->param('serialno'));
+
+  my $cs = PKI::Base::CertStore->new();
+  $cs->open($cfg);
+  my $ref = $cs->read_certificate_by_approver($uid, $serialno);
+  $cs->close();
+
+  my $ca = PKI::Conn::CA->new();
+  $ca->open($cfg);
+  my $certStatus = $ca->getCertStatus("ca1", $serialno);
+  $ca->close();
+
+
+  $context{certificate} = $util->breakline($util->html_encode($ref->{'certificate'}), 40);
+
+  $context{serialno} = $util->html_encode($ref->{'serialno'});
+  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8', $ref->{'subject_dn'}));
+  $context{created_at} = $util->html_encode($ref->{'created_at'});
+  $context{approved_by} = $util->html_encode($ref->{'approved_by'});
+  $context{rid} = $util->html_encode($ref->{'rid'});
+  $context{certStatus} = $util->html_encode($certStatus);
+
+  my $result = $parser->execute_file_with_context("agent/cert/read.vm",
+                   \%context);
+
+  my $xml = $q->param('xml');
+  if ($xml eq "true") {
+    print "Content-Type: text/xml\n\n";
+    print $self->xml_output(\%context);
+  } else {
+    print "Content-Type: text/html\n\n";
+    print "$result";
+  }
+}
+
+my $op = op->new();
+$op->execute();
diff --git a/base/ra/apache/docroot/agent/cert/read.vm b/base/ra/apache/docroot/agent/cert/read.vm
new file mode 100644
index 000000000..43c78ffa4
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/read.vm
@@ -0,0 +1,96 @@
+<!-- --- 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>
+
+<title>Certificates</title>
+    <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+    <link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
+    <META http-equiv=Content-Type content="text/html; charset=UTF-8">
+
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+
+#include ( "header.vm" )
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+UID: $uid
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+
+
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+<a href="/agent/index.cgi">Agent Interface</a>
+<br>Certificate Information
+</font><br>
+<p> 
+</font>
+<center>
+<table border="1" cellspacing="1" cellpadding="1">
+<tr valign="TOP">
+<td><b>Serial Number</b></td>
+<td><a href="read.cgi?serialno=$serialno">$serialno</a></td>
+</tr>
+<tr valign="TOP">
+<td><b>Subject DN</b></td>
+<td>$subject_dn</td>
+</tr>
+<tr valign="TOP">
+<td><b>Certificate</b></td>
+<td>$certificate</td>
+</tr>
+<tr valign="TOP">
+<td><b>Approved By</b></td>
+<td>$approved_by</td>
+</tr>
+<tr valign="TOP">
+<td><b>Created At</b></td>
+<td>$created_at</td>
+</tr>
+<tr valign="TOP">
+<td><b>Revocation Status</b></td>
+<td>$certStatus</td>
+</tr>
+</table>
+</center>
+<br/>
+<a href="/agent/cert/revoke.cgi?rid=$rid&serialno=$serialno&subject_dn=$subject_dn">Revoke</a>
+<br/>
+#include ( "footer.vm" )
+
+</body>
+</html>
diff --git a/base/ra/apache/docroot/agent/cert/revoke.cgi b/base/ra/apache/docroot/agent/cert/revoke.cgi
new file mode 100755
index 000000000..1e483aea0
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/revoke.cgi
@@ -0,0 +1,89 @@
+#!/usr/bin/perl
+#
+# --- 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 ---
+#
+#
+#
+#
+
+package op;
+
+use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
+
+use DBI;
+use CGI;
+use Template::Velocity;
+use PKI::Base::Conf;
+use PKI::Base::Registry;
+use PKI::Base::Util;
+use Encode;
+
+use vars qw (@ISA);
+use PKI::Service::Op;
+@ISA = qw(PKI::Service::Op);
+
+sub new {
+  my $self = {};
+  bless ($self);
+  return $self;
+}
+
+sub process()
+{
+  my $self = shift;
+  my $q = CGI->new();
+
+  my $util = PKI::Base::Util->new();
+  my $docroot = PKI::Base::Registry->get_docroot();
+  my $parser = PKI::Base::Registry->get_parser();
+  my $cfg = PKI::Base::Registry->get_config();
+  $self->debug_params($cfg, $q);
+
+  if (!$self->agent_auth($cfg)) {
+    print $q->redirect("/agent/error.cgi");
+    return;
+  }
+  my $uid = $self->get_current_uid($cfg);
+
+  my %context;
+  $context{uid} = $util->html_encode($uid);
+
+  my $serialno = $util->get_alphanum_val($q->param('serialno'));
+  my $subject_dn = $util->get_val($q->param('subject_dn'));
+  my $rid = $util->get_alphanum_val($q->param('rid'));
+
+  $context{serialno} = $util->html_encode($serialno);
+  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8',$subject_dn));
+  $context{rid} = $util->html_encode($rid);
+ 
+  my $result = $parser->execute_file_with_context("agent/cert/revoke.vm",
+                   \%context);
+
+  my $xml = $q->param('xml');
+  if ($xml eq "true") {
+    print "Content-Type: text/xml\n\n";
+    print $self->xml_output(\%context);
+  } else {
+    print "Content-Type: text/html\n\n";
+    print "$result";
+  }
+}
+
+my $op = op->new();
+$op->execute();
diff --git a/base/ra/apache/docroot/agent/cert/revoke.vm b/base/ra/apache/docroot/agent/cert/revoke.vm
new file mode 100644
index 000000000..626bbed42
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/revoke.vm
@@ -0,0 +1,111 @@
+<!-- --- 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>
+
+<title>Certificate Revocation</title>
+    <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+    <link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
+    <META http-equiv=Content-Type content="text/html; charset=UTF-8">
+
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+
+#include ( "header.vm" )
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+UID: $uid
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+
+
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+<a href="/agent/index.cgi">Agent Interface</a>
+<br>Revoking Certificate: 
+</font><br>
+<p> 
+</font>
+<center>
+<table border="0" cellspacing="1" cellpadding="1">
+<tr valign="TOP">
+<td><b>Serial Number:</b></td>
+<td>$serialno</td>
+</tr>
+<tr valign="TOP">
+<td><b>Subject DN:</b></td>
+<td>$subject_dn</td>
+</tr>
+</table>
+<br>
+<b>Select A Reason:</b>
+</br>
+<table>
+<form name=reason_form method=post action=submit.cgi>
+<input type=hidden name=serialno value="$serialno">
+<input type=hidden name=subject_dn value="$subject_dn">
+<input type=hidden name=rid value="$rid">
+<tr>
+<td><input checked type=radio name="reason" value="0">Unspecified</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="1">Key compromised</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="2">CA key compromised</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="3">Affiliation changed</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="4">Certificate superseded</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="5">Cessation of operation</td>
+</tr>
+<tr>
+<td><input type=radio name="reason" value="6">Certificate is on hold</td>
+</tr>
+</form>
+</table>
+</center>
+<br/>
+<a href="#" onclick="document.reason_form.submit();">Submit</a>
+<br/>
+#include ( "footer.vm" )
+
+</body>
+</html>
diff --git a/base/ra/apache/docroot/agent/cert/submit.cgi b/base/ra/apache/docroot/agent/cert/submit.cgi
new file mode 100755
index 000000000..571385f3a
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/submit.cgi
@@ -0,0 +1,104 @@
+#!/usr/bin/perl
+#
+# --- 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 ---
+#
+#
+#
+#
+
+package op;
+
+use lib $ENV{DOCUMENT_ROOT} . "/../lib/perl";
+
+use DBI;
+use CGI;
+use Template::Velocity;
+use PKI::Base::Conf;
+use PKI::Base::Util;
+use PKI::Base::Registry;
+use PKI::Conn::CA;
+use Encode;
+
+use vars qw (@ISA);
+use PKI::Service::Op;
+@ISA = qw(PKI::Service::Op);
+
+sub new {
+  my $self = {};
+  bless ($self);
+  return $self;
+}
+
+sub process()
+{
+  my $self = shift;
+  my $q = CGI->new();
+
+  my $util = PKI::Base::Util->new();
+  my $docroot = PKI::Base::Registry->get_docroot();
+  my $parser = PKI::Base::Registry->get_parser();
+  my $cfg = PKI::Base::Registry->get_config();
+
+  $self->debug_params($cfg, $q);
+
+  if (!$self->agent_auth($cfg)) {
+    print $q->redirect("/agent/error.cgi");
+    return;
+  }
+  my $uid = $self->get_current_uid($cfg);
+
+  my %context;
+  $context{uid} = $util->html_encode($uid);
+
+  my $serialno = $util->get_alphanum_val($q->param('serialno'));
+  my $subject_dn = $util->get_val($q->param('subject_dn'));
+  my $reason = $util->get_alphanum_val($q->param('reason'));
+  my $rid = $util->get_alphanum_val($q->param('rid'));
+
+  my $ca = PKI::Conn::CA->new();
+  $ca->open($cfg);
+  $ca->revoke($rid, "ca1", $serialno, $reason);
+  $ca->close();
+
+  my $queue = PKI::Request::Queue->new();
+  $queue->open($cfg);
+
+  my $ref = $queue->read_request($rid);
+  $context{errorString} = $util->html_encode($ref->{'errorString'});
+  $queue->close();
+
+  $context{rid} = $util->html_encode($rid);
+  $context{serialno} = $util->html_encode($serialno);
+  $context{subject_dn} = $util->html_encode(Encode::decode('UTF-8', $subject_dn));
+
+  my $result = $parser->execute_file_with_context("agent/cert/submit.vm",
+                   \%context);
+
+  my $xml = $q->param('xml');
+  if ($xml eq "true") {
+    print "Content-Type: text/xml\n\n";
+    print $self->xml_output(\%context);
+  } else {
+    print "Content-Type: text/html\n\n";
+    print "$result";
+  }
+}
+
+my $op = op->new();
+$op->execute();
diff --git a/base/ra/apache/docroot/agent/cert/submit.vm b/base/ra/apache/docroot/agent/cert/submit.vm
new file mode 100644
index 000000000..730228715
--- /dev/null
+++ b/base/ra/apache/docroot/agent/cert/submit.vm
@@ -0,0 +1,91 @@
+<!-- --- 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>
+
+<title>Certificate Revocation Submission</title>
+    <link rel="shortcut icon" href="/pki/images/favicon.ico" />
+    <link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
+    <META http-equiv=Content-Type content="text/html; charset=UTF-8">
+
+</head>
+<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">
+
+#include ( "header.vm" )
+
+<div id="mainNavOuter">
+<div id="mainNav">
+<div id="mainNavInner">
+
+</div><!-- end mainNavInner -->
+</div><!-- end mainNav -->
+</div><!-- end mainNavOuter -->
+                                                                                
+                                                                                
+<div id="bar">
+                                                                                
+<div id="systembar">
+<div id="systembarinner">
+                                                                                
+<div>
+UID: $uid
+</div>
+                                                                                
+                                                                                
+</div>
+</div>
+                                                                                
+</div>
+
+
+<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
+<a href="/agent/index.cgi">Agent Interface</a>
+<br>Revocation of Certificate: 
+</font><br>
+<p> 
+</font>
+<center>
+<table border="0" cellspacing="1" cellpadding="1">
+<tr valign="TOP">
+<td><b>Serial Number:</b></td>
+<td>$serialno</td>
+</tr>
+<tr valign="TOP">
+<td><b>Subject DN:</b></td>
+<td>$subject_dn</td>
+</tr>
+<tr>
+<td><b>Result:</b></td>
+#if ($errorString == "0")
+<td>Revoked</td>
+#else
+<td>Failed: $errorString</td>
+#end
+</tr>
+<tr>
+<td><b>Request ID:</b></td>
+<td><a href="/agent/request/read.cgi?id=$rid">$rid</a></td>
+</tr>
+</table>
+<br>
+</center>
+<br/>
+#include ( "footer.vm" )
+
+</body>
+</html>