Tidyup /ca/v2/agent/certrequests APIs implementation

dogtagpki · Feb 19, 2024 · 2a24da9 · 2a24da9
1 parent 664dab5
commit 2a24da9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 23 deletions.
diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/CertRequestInfoFactory.java
@@ -38,7 +38,7 @@
 
 public class CertRequestInfoFactory {
 
-    public static CertRequestInfo create(Request request) throws SecurityException, NoSuchMethodException {
+    public static CertRequestInfo create(Request request) throws SecurityException {
 
         CertRequestInfo info = new CertRequestInfo();
 

diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestACLFilter.java b/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestACLFilter.java
@@ -17,7 +17,6 @@ public class AgentCertRequestACLFilter extends ACLFilter {
 
     @Override
     public void init() throws ServletException {
-        super.init();
         setAcl("certrequests");
     }
 

diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestAuthMethodFilter.java b/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestAuthMethodFilter.java
@@ -17,7 +17,6 @@ public class AgentCertRequestAuthMethodFilter extends AuthMethodFilter {
 
     @Override
     public void init() throws ServletException {
-        super.init();
         setAuthMethod("certrequests");
     }
 

diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestServlet.java b/base/ca/src/main/java/org/dogtagpki/server/ca/v2/AgentCertRequestServlet.java
@@ -76,9 +76,10 @@ public void get(HttpServletRequest request, HttpServletResponse response) throws
             try {
                 RequestId id = new RequestId(request.getPathInfo().substring(1));
                 CertReviewResponse req = getRequestData(request, id);
-                if(req != null) {
-                    out.println(req.toJSON());
+                if(req == null) {
+                    throw new RequestNotFoundException(id);
                 }
+                out.println(req.toJSON());
             } catch (Exception e) {
                     response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI());
             }
@@ -218,11 +219,6 @@ private CertReviewResponse getRequestData(HttpServletRequest servletRequest, Req
             // return nonce to client
             info.setNonce(Long.toString(n));
         }
-        if (info == null) {
-            // request does not exist
-            throw new RequestNotFoundException(id);
-        }
-
         logger.info("AgentCertRequestServlet: - profile: {}", info.getProfileName());
         logger.info("AgentCertRequestServlet: - type: {}", info.getRequestType());
         logger.info("AgentCertRequestServlet: - status: {}", info.getRequestStatus());
@@ -250,11 +246,7 @@ public CertRequestInfos listRequests(String requestState, String requestType,
         while(reqs.hasNext()) {
             Request request = reqs.next().toRequest();
             logger.debug("- {}", request.getRequestId().toHexString());
-            try {
-                reqInfos.addEntry(CertRequestInfoFactory.create(request));
-            } catch (NoSuchMethodException e) {
-                logger.warn("Error in creating certrequestinfo - no such method: " + e.getMessage(), e);
-            }
+            reqInfos.addEntry(CertRequestInfoFactory.create(request));
         }
         reqInfos.setTotal(requestRepository.getTotalRequestsByFilter(filter));
 
@@ -301,18 +293,18 @@ private void changeRequestState(RequestId id, HttpServletRequest request, CertRe
         AuthToken authToken = null;
 
         Principal principal = request.getUserPrincipal();
-        if (principal instanceof PKIPrincipal) {
+        if (principal instanceof PKIPrincipal pkiPrincipal) {
             logger.debug("AgentCertRequestServlet: getting auth token from user principal");
-            authToken = ((PKIPrincipal) principal).getAuthToken();
+            authToken = pkiPrincipal.getAuthToken();
         }
 
         String authMgr = processor.getAuthenticationManager();
         if (authToken == null && authMgr != null) {
-            logger.debug("AgentCertRequestServlet: getting auth token from " + authMgr);
+            logger.debug("AgentCertRequestServlet: getting auth token from {}", authMgr);
             authToken = processor.authenticate(request);
         }
 
-        logger.debug("AgentCertRequestServlet: auth token: " + authToken);
+        logger.debug("AgentCertRequestServlet: auth token: {}", authToken);
 
         processor.processRequest(request, authToken, data, ireq, op);
     }

diff --git a/base/server/src/main/java/org/dogtagpki/server/v2/ACLFilter.java b/base/server/src/main/java/org/dogtagpki/server/v2/ACLFilter.java
@@ -14,11 +14,11 @@
 import java.util.Properties;
 
 import javax.servlet.FilterChain;
-import javax.servlet.GenericFilter;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -41,7 +41,7 @@
 import com.netscape.cmscore.authorization.AuthzSubsystem;
 import com.netscape.cmscore.logging.Auditor;
 
-public abstract class ACLFilter extends GenericFilter {
+public abstract class ACLFilter extends HttpFilter {
 
     private static final long serialVersionUID = 1L;
     public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ACLFilter.class);

diff --git a/base/server/src/main/java/org/dogtagpki/server/v2/AuthMethodFilter.java b/base/server/src/main/java/org/dogtagpki/server/v2/AuthMethodFilter.java
@@ -16,10 +16,10 @@
 import java.util.Properties;
 
 import javax.servlet.FilterChain;
-import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,7 +32,7 @@
 import com.netscape.cms.realm.PKIPrincipal;
 import com.netscape.cmscore.apps.CMS;
 
-public abstract class AuthMethodFilter extends GenericFilter {
+public abstract class AuthMethodFilter extends HttpFilter {
 
     private static final long serialVersionUID = 1L;
     public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AuthMethodFilter.class);