Bugzilla Bug 651916 - kra and ocsp are using incorrect ports to talk to CA and complete configuration in DonePanel

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1498 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

5 files changed, 61 insertions, 10 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
index 72f299278..848ffba6f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
@@ -52,6 +52,10 @@ public class AdminRequestFilter implements Filter
         String request_port = null;
         String param_https_port = null;
         String msg = null;
+        String param_active = null;
+
+        // CMS.debug("Entering the admin filter");
+        param_active = config.getInitParameter( "active");
 
         if( request instanceof HttpServletRequest ) {
             HttpServletResponse resp = ( HttpServletResponse ) response;
@@ -82,14 +86,21 @@ public class AdminRequestFilter implements Filter
 
             // Compare the request and param "https" ports
             if( ! param_https_port.equals( request_port ) ) {
+                String uri = ((HttpServletRequest) request).getRequestURI(); 
                 msg = "Use HTTPS port '" + param_https_port
                     + "' instead of '" + request_port
                     + "' when performing " + HTTPS_ROLE + " tasks!";
                 CMS.debug( filterName + ":  " + msg );
-                resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
-                return;
+                CMS.debug( filterName + ": uri is " + uri);
+                if ((param_active != null) &&(param_active.equals("false"))) {
+                    CMS.debug("Filter is disabled .. continuing");
+                } else {
+                    resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
+                    return;
+                }
             }
         }
+        // CMS.debug("Exiting the admin filter");
 
         chain.doFilter( request, response );
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
index f8385f1f9..e4d1bb3df 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
@@ -53,6 +53,11 @@ public class AgentRequestFilter implements Filter
         String param_https_port = null;
         String msg = null;
 
+        String param_active = null;
+
+        // CMS.debug("Entering the agent filter");
+        param_active = config.getInitParameter( "active");
+
         if( request instanceof HttpServletRequest ) {
             HttpServletResponse resp = ( HttpServletResponse ) response;
 
@@ -82,14 +87,21 @@ public class AgentRequestFilter implements Filter
 
             // Compare the request and param "https" ports
             if( ! param_https_port.equals( request_port ) ) {
+                String uri = ((HttpServletRequest) request).getRequestURI();
                 msg = "Use HTTPS port '" + param_https_port
                     + "' instead of '" + request_port
                     + "' when performing " + HTTPS_ROLE + " tasks!";
                 CMS.debug( filterName + ":  " + msg );
-                resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
-                return;
+                CMS.debug( filterName + ": uri is " + uri);
+                if ((param_active != null) &&(param_active.equals("false"))) {
+                    CMS.debug("Filter is disabled .. continuing");
+                } else {
+                    resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
+                    return;
+                }
             }
         }
+        // CMS.debug("Exiting the Agent filter");
 
         chain.doFilter( request, response );
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
index ef78a799a..6ed6617bc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
@@ -52,6 +52,10 @@ public class EEClientAuthRequestFilter implements Filter
         String request_port = null;
         String param_https_port = null;
         String msg = null;
+        String param_active = null;
+
+        // CMS.debug("Entering the EECA filter");
+        param_active = config.getInitParameter( "active");
 
         if( request instanceof HttpServletRequest ) {
             HttpServletResponse resp = ( HttpServletResponse ) response;
@@ -82,14 +86,21 @@ public class EEClientAuthRequestFilter implements Filter
 
             // Compare the request and param "https" ports
             if( ! param_https_port.equals( request_port ) ) {
+                String uri = ((HttpServletRequest) request).getRequestURI();
                 msg = "Use HTTPS port '" + param_https_port
                     + "' instead of '" + request_port
                     + "' when performing " + HTTPS_ROLE + " tasks!";
                 CMS.debug( filterName + ":  " + msg );
-                resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
-                return;
+                CMS.debug( filterName + ": uri is " + msg);
+                if ((param_active != null) &&(param_active.equals("false"))) {
+                    CMS.debug("Filter is disabled .. continuing");
+                } else {
+                    resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
+                    return;
+                }
             }
         }
+       // CMS.debug("exiting the EECA filter");
 
         chain.doFilter( request, response );
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
index dfaf2902d..23df05954 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
@@ -56,6 +56,10 @@ public class EERequestFilter implements Filter
         String param_http_port = null;
         String param_https_port = null;
         String msg = null;
+        String param_active = null;
+
+        // CMS.debug("Entering the EE filter");
+        param_active = config.getInitParameter( "active");
 
         if( request instanceof HttpServletRequest ) {
             HttpServletResponse resp = ( HttpServletResponse ) response;
@@ -102,12 +106,18 @@ public class EERequestFilter implements Filter
             // the request and param "https" ports
             if( scheme.equals( HTTP_SCHEME ) ) {
                 if( ! param_http_port.equals( request_port ) ) {
+                    String uri = ((HttpServletRequest) request).getRequestURI();
                     msg = "Use HTTP port '" + param_http_port
                         + "' instead of '" + request_port
                         + "' when performing " + HTTP_ROLE + " tasks!";
                     CMS.debug( filterName + ":  " + msg );
-                    resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
-                    return; 
+                    CMS.debug( filterName + ": uri is " + uri);
+                    if ((param_active != null) &&(param_active.equals("false"))) {
+                        CMS.debug("Filter is disabled .. continuing");
+                    } else {
+                        resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
+                        return;
+                    }
                 }
             } else if( scheme.equals( HTTPS_SCHEME ) ) {
                 if( ! param_https_port.equals( request_port ) ) {
@@ -115,11 +125,16 @@ public class EERequestFilter implements Filter
                         + "' instead of '" + request_port
                         + "' when performing " + HTTPS_ROLE + " tasks!";
                     CMS.debug( filterName + ":  " + msg );
-                    resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
-                    return; 
+                    if ((param_active != null) &&(param_active.equals("false"))) {
+                        CMS.debug("Filter is disabled .. continuing");
+                    } else {
+                        resp.sendError( HttpServletResponse.SC_NOT_FOUND, msg );
+                        return;
+                    }
                 }
             }
         }
+        // CMS.debug("Exiting the EE filter");
 
         chain.doFilter( request, response );
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/PassThroughRequestFilter.java b/pki/base/common/src/com/netscape/cms/servlet/filter/PassThroughRequestFilter.java
index a47888442..32a3725f1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/PassThroughRequestFilter.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/filter/PassThroughRequestFilter.java
@@ -59,6 +59,7 @@ public class PassThroughRequestFilter implements Filter
 
         String servlet = null;
         String msg = null;
+        // CMS.debug("Entering the Passthrough filter");
 
         if( request instanceof HttpServletRequest ) {
             HttpServletRequest req = ( HttpServletRequest ) request;
@@ -68,6 +69,7 @@ public class PassThroughRequestFilter implements Filter
             CMS.debug( filterName + ":  " + msg );
         }
 
+        // CMS.debug("Exiting the passthrough filter");
         chain.doFilter( request, response );
     }