From 4fddcd370e6f3d47f252eec8077cbca379d4e281 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Sat, 16 Apr 2016 10:56:18 -0400
Subject: Add realm to the request record

Part of Trac Ticket #2041
---
 .../com/netscape/certsrv/request/CMSRequestInfo.java | 17 +++++++++++++++++
 .../src/com/netscape/certsrv/request/IRequest.java   | 20 +++++++++++++++++---
 .../com/netscape/certsrv/request/IRequestRecord.java |  2 ++
 3 files changed, 36 insertions(+), 3 deletions(-)

(limited to 'base/common/src')

diff --git a/base/common/src/com/netscape/certsrv/request/CMSRequestInfo.java b/base/common/src/com/netscape/certsrv/request/CMSRequestInfo.java
index f7b34f0a2..bfd1b2f0a 100644
--- a/base/common/src/com/netscape/certsrv/request/CMSRequestInfo.java
+++ b/base/common/src/com/netscape/certsrv/request/CMSRequestInfo.java
@@ -35,6 +35,9 @@ public  class CMSRequestInfo {
     @XmlElement
     protected String requestURL;
 
+    @XmlElement
+    protected String realm;
+
     /**
      * @return the requestType
      */
@@ -85,10 +88,19 @@ public  class CMSRequestInfo {
         this.requestURL = requestURL;
     }
 
+    public String getRealm() {
+        return realm;
+    }
+
+    public void setRealm(String realm) {
+        this.realm = realm;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
+        result = prime * result + ((realm == null) ? 0 : realm.hashCode());
         result = prime * result + ((requestStatus == null) ? 0 : requestStatus.hashCode());
         result = prime * result + ((requestType == null) ? 0 : requestType.hashCode());
         result = prime * result + ((requestURL == null) ? 0 : requestURL.hashCode());
@@ -104,6 +116,11 @@ public  class CMSRequestInfo {
         if (getClass() != obj.getClass())
             return false;
         CMSRequestInfo other = (CMSRequestInfo) obj;
+        if (realm == null) {
+            if (other.realm != null)
+                return false;
+        } else if (!realm.equals(other.realm))
+            return false;
         if (requestStatus == null) {
             if (other.requestStatus != null)
                 return false;
diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java
index 8d4ec98fb..8a002ab13 100644
--- a/base/common/src/com/netscape/certsrv/request/IRequest.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequest.java
@@ -27,15 +27,15 @@ import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Vector;
 
+import com.netscape.certsrv.authentication.IAuthToken;
+import com.netscape.certsrv.base.IAttrSet;
+
 import netscape.security.x509.CertificateExtensions;
 import netscape.security.x509.CertificateSubjectName;
 import netscape.security.x509.RevokedCertImpl;
 import netscape.security.x509.X509CertImpl;
 import netscape.security.x509.X509CertInfo;
 
-import com.netscape.certsrv.authentication.IAuthToken;
-import com.netscape.certsrv.base.IAttrSet;
-
 /**
  * An interface that defines abilities of request objects,
  *
@@ -305,6 +305,9 @@ public interface IRequest extends Serializable {
     // String error messages
     public static final String ERROR = "Error";
 
+    // authentication realm
+    public static final String REALM = "realm";
+
     /**
      * Copies meta attributes (excluding request Id, etc.) of another request
      * to this request.
@@ -771,4 +774,15 @@ public interface IRequest extends Serializable {
      */
     public IAttrSet asIAttrSet();
 
+    /**
+     * Get realm
+     * @return String
+     */
+    public String getRealm();
+
+    /**
+     * Set the realm
+     * @param realm
+     */
+    public void setRealm(String realm);
 }
diff --git a/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
index eba6cabb8..7b041fbf8 100644
--- a/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
@@ -61,6 +61,8 @@ public interface IRequestRecord
     // and the RequestRecord.
     public final static String ATTR_EXT_DATA = "requestExtData";
 
+    public final static String ATTR_REALM = "realm";
+
     /**
      * Gets the request id.
      *
-- 
cgit