diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-08 20:05:53 +0700 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-15 10:24:39 -0500 |
commit | ab3d3c8075a0b5244765a931ff11e6658130ade1 (patch) | |
tree | d5e8c64c0a5b21173488e466befdc121be1e2120 /base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java | |
parent | 1cceecafb8050ec362a9c9568d36d52d3fe4117e (diff) | |
download | pki-ab3d3c8075a0b5244765a931ff11e6658130ade1.tar.gz pki-ab3d3c8075a0b5244765a931ff11e6658130ade1.tar.xz pki-ab3d3c8075a0b5244765a931ff11e6658130ade1.zip |
Added nonce validation for certificate revocation.
The certificate REST service has been modified to validate
nonce when revoking a certificate.
Ticket #213
Diffstat (limited to 'base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java')
-rw-r--r-- | base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java b/base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java index 7b86286ce..0fe0c4696 100644 --- a/base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java +++ b/base/common/src/com/netscape/certsrv/cert/CertRevokeRequest.java @@ -63,6 +63,7 @@ public class CertRevokeRequest { Date invalidityDate; String comments; String encoded; + Long nonce; @XmlElement(name="RequestID") @@ -118,6 +119,16 @@ public class CertRevokeRequest { this.encoded = encoded; } + @XmlElement(name="Nonce") + @FormParam("nonce") + public Long getNonce() { + return nonce; + } + + public void setNonce(Long nonce) { + this.nonce = nonce; + } + @Override public int hashCode() { final int prime = 31; @@ -125,6 +136,7 @@ public class CertRevokeRequest { result = prime * result + ((comments == null) ? 0 : comments.hashCode()); result = prime * result + ((encoded == null) ? 0 : encoded.hashCode()); result = prime * result + ((invalidityDate == null) ? 0 : invalidityDate.hashCode()); + result = prime * result + ((nonce == null) ? 0 : nonce.hashCode()); result = prime * result + ((reason == null) ? 0 : reason.hashCode()); result = prime * result + ((requestID == null) ? 0 : requestID.hashCode()); return result; @@ -154,6 +166,11 @@ public class CertRevokeRequest { return false; } else if (!invalidityDate.equals(other.invalidityDate)) return false; + if (nonce == null) { + if (other.nonce != null) + return false; + } else if (!nonce.equals(other.nonce)) + return false; if (reason == null) { if (other.reason != null) return false; @@ -194,6 +211,7 @@ public class CertRevokeRequest { before.setInvalidityDate(new Date()); before.setComments("test"); before.setEncoded("test"); + before.setNonce(12345l); String string = before.toString(); System.out.println(string); |