diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-16 10:13:33 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-30 15:02:06 -0500 |
commit | cef7a7704f9f4b48c0a9b242fabd3a919f2068d5 (patch) | |
tree | dae84ebdc4572be4830028012b2ae74d924c5558 | |
parent | ba1e743ed6903d063543c817abe6543c8bae74ba (diff) | |
download | pki-cef7a7704f9f4b48c0a9b242fabd3a919f2068d5.tar.gz pki-cef7a7704f9f4b48c0a9b242fabd3a919f2068d5.tar.xz pki-cef7a7704f9f4b48c0a9b242fabd3a919f2068d5.zip |
Fixed issuedOn parameters for cert-find.
The CertSearchRequest has been modified to fix the infinite loop
in getIssuedOnTo(). The CertFindCLI has been modified to accept
dates with format YYYY-MM-DD instead of epoch time.
Ticket #416
-rw-r--r-- | base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java | 8 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java | 31 |
2 files changed, 30 insertions, 9 deletions
diff --git a/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java b/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java index d2a4eeee9..29e36f7fe 100644 --- a/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java +++ b/base/common/src/com/netscape/certsrv/cert/CertSearchRequest.java @@ -430,7 +430,11 @@ public class CertSearchRequest { } public String getIssuedOnTo() { - return getIssuedOnTo(); + return issuedOnTo; + } + + public void setIssuedOnTo(String issuedOnTo) { + this.issuedOnTo = issuedOnTo; } //Valid Not After @@ -651,6 +655,7 @@ public class CertSearchRequest { private void buildDateFilter(String prefix, String outStr, long adjustment, StringBuffer filter) { + if (prefix == null || prefix.length() == 0) return; long epoch = 0; try { epoch = Long.parseLong(prefix); @@ -703,7 +708,6 @@ public class CertSearchRequest { return; } String issuedBy = getIssuedBy(); - ; if (issuedBy == null || issuedBy.equals("")) { filter.append("(certIssuedBy=*)"); } else { 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 397df3f93..7df99956a 100644 --- a/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java @@ -21,6 +21,8 @@ package com.netscape.cmstools.cert; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import javax.xml.bind.JAXBException; @@ -40,6 +42,7 @@ import com.netscape.cmstools.cli.MainCLI; */ public class CertFindCLI extends CLI { + public SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); public CertCLI parent; public CertFindCLI(CertCLI parent) { @@ -51,7 +54,7 @@ public class CertFindCLI extends CLI { formatter.printHelp(parent.name + "-" + name + " [OPTIONS...]", options); } - public void execute(String[] args) { + public void execute(String[] args) throws Exception { addOptions(); @@ -217,9 +220,15 @@ public class CertFindCLI extends CLI { option.setArgName("user id"); options.addOption(option); - //issuedFor(period) - option = new Option(null, "issuedOn", true, "Date issued"); - option.setArgName("date"); + //issuedOn + option = new Option(null, "issuedOnFrom", true, + "Issued on or after this date"); + option.setArgName("YYYY-MM-DD"); + options.addOption(option); + + option = new Option(null, "issuedOnTo", true, + "Issued on or before this date"); + option.setArgName("YYYY-MM-DD"); options.addOption(option); //certTypeinUse @@ -267,7 +276,9 @@ public class CertFindCLI extends CLI { options.addOption(option); } - public void addSearchAttribute(CommandLine cmd, CertSearchRequest csd) { + public void addSearchAttribute(CommandLine cmd, CertSearchRequest csd) + throws java.text.ParseException { + if (cmd.hasOption("minSerialNumber")) { csd.setSerialNumberRangeInUse(true); csd.setSerialFrom(cmd.getOptionValue("minSerialNumber")); @@ -331,9 +342,15 @@ public class CertFindCLI extends CLI { csd.setIssuedByInUse(true); csd.setIssuedBy(cmd.getOptionValue("issuedBy")); } - if (cmd.hasOption("issuedOn")) { + if (cmd.hasOption("issuedOnFrom")) { + csd.setIssuedOnInUse(true); + Date date = dateFormat.parse(cmd.getOptionValue("issuedOnFrom")); + csd.setIssuedOnFrom(""+date.getTime()); + } + if (cmd.hasOption("issuedOnTo")) { csd.setIssuedOnInUse(true); - csd.setIssuedOnFrom(cmd.getOptionValue("issuedOn")); + Date date = dateFormat.parse(cmd.getOptionValue("issuedOnTo")); + csd.setIssuedOnTo(""+date.getTime()); } if (cmd.hasOption("certTypeSubEmailCA")) { csd.setCertTypeInUse(true); |