From 777dc69ec7d0d3b14144040191c283815f44a28f Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Thu, 7 Feb 2013 15:59:18 -0500
Subject: Added certificate status option for cert-find.

The cert-find command has been modified to provide an option to
search by certificate status.

Ticket #501
---
 .../src/com/netscape/certsrv/cert/CertSearchRequest.java   | 14 ++++++++++++++
 .../src/com/netscape/cms/servlet/cert/FilterBuilder.java   | 11 +++++++++++
 .../src/com/netscape/cmstools/cert/CertFindCLI.java        |  8 ++++++++
 3 files changed, 33 insertions(+)

diff --git a/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java b/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java
index 7939a02b4..33ff3fc68 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java
@@ -81,6 +81,10 @@ public class CertSearchRequest {
     @XmlElement
     protected boolean matchExactly;
 
+    //Status
+    @XmlElement
+    protected String status;
+
     //Revoked By
 
     @XmlElement
@@ -366,6 +370,16 @@ public class CertSearchRequest {
         this.matchExactly = matchExactly;
     }
 
+    //Status
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     //Revoked On
 
     public String getRevokedOnTo() {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java b/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java
index b8e32295a..46c597b4d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java
@@ -42,6 +42,7 @@ public class FilterBuilder {
         StringBuffer filter = new StringBuffer();
         buildSerialNumberRangeFilter(filter);
         buildSubjectFilter(filter);
+        buildStatusFilter(filter);
         buildRevokedByFilter(filter);
         buildRevokedOnFilter(filter);
         buildRevocationReasonFilter(filter);
@@ -120,6 +121,16 @@ public class FilterBuilder {
         }
     }
 
+    private void buildStatusFilter(StringBuffer filter) {
+        String status = request.getStatus();
+        if (status == null || status.equals("")) {
+            return;
+        }
+        filter.append("(certStatus=");
+        filter.append(LDAPUtil.escapeFilter(status));
+        filter.append(")");
+    }
+
     private void buildRevokedByFilter(StringBuffer filter) {
         if (!request.getRevokedByInUse()) {
             return;
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
index e4f741bcf..5415da574 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
@@ -195,6 +195,11 @@ public class CertFindCLI extends CLI {
         options.addOption(option);
         options.addOption(null, "matchExactly", false, "Match exactly with the details provided");
 
+        //status
+        option = new Option(null, "status", true, "Certificate status: VALID, INVALID, REVOKED, EXPIRED, REVOKED_EXPIRED");
+        option.setArgName("status");
+        options.addOption(option);
+
         //revokedByInUse
         option = new Option(null, "revokedBy", true, "Certificate revoked by");
         option.setArgName("user id");
@@ -339,6 +344,9 @@ public class CertFindCLI extends CLI {
         if (cmd.hasOption("matchExactly")) {
             csd.setMatchExactly(true);
         }
+        if (cmd.hasOption("status")) {
+            csd.setStatus(cmd.getOptionValue("status"));
+        }
         if (cmd.hasOption("revokedBy")) {
             csd.setRevokedByInUse(true);
             csd.setRevokedBy(cmd.getOptionValue("revokedBy"));
-- 
cgit