Issue 30288 small fixes

docker/k8s-aws-eks-manifest-examples/alb.yaml

@@ -26,7 +26,7 @@ metadata:
     alb.ingress.kubernetes.io/backend-protocol: HTTP
     alb.ingress.kubernetes.io/healthcheck-protocol: HTTP
     alb.ingress.kubernetes.io/healthcheck-port: '8082'
-    alb.ingress.kubernetes.io/healthcheck-path: /api/v1/appconfiguration
+    alb.ingress.kubernetes.io/healthcheck-path: /api/v1/alive
     alb.ingress.kubernetes.io/healthcheck-interval-seconds: '30'
     alb.ingress.kubernetes.io/healthcheck-timeout-seconds: '5'
     alb.ingress.kubernetes.io/success-codes: '200'

docker/k8s-aws-eks-manifest-examples/statefulset.yaml

@@ -102,7 +102,7 @@ spec:
                 fi; ln -s /data/shared/assets/.backup /data/local/dotsecure/backup;
         startupProbe:
           httpGet:
-            path: /api/v1/appconfiguration
+            path: /api/v1/heavy
             port: 8082
           initialDelaySeconds: 30
           periodSeconds: 5
@@ -111,16 +111,16 @@ spec:
           timeoutSeconds: 1
         livenessProbe:
           httpGet:
-            path: /api/v1/appconfiguration
+            path: /api/v1/light
             port: 8082
           initialDelaySeconds: 1
           periodSeconds: 30
           successThreshold: 1
-          failureThreshold: 1
+          failureThreshold: 3
           timeoutSeconds: 10
         readinessProbe:
           httpGet:
-            path: /api/v1/appconfiguration
+            path: /api/v1/light
             port: 8082
           initialDelaySeconds: 1
           periodSeconds: 10

dotCMS/src/main/java/com/dotcms/rest/api/v1/maintenance/JVMInfoResource.java

@@ -10,6 +10,16 @@
 import com.dotmarketing.util.UtilMethods;
 import com.liferay.portal.util.ReleaseInfo;
 import io.vavr.control.Try;
+import org.glassfish.jersey.server.JSONP;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.management.ManagementFactory;
@@ -20,23 +30,18 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.glassfish.jersey.server.JSONP;
-
 
 @Path("/v1/jvm")
 @SuppressWarnings("serial")
 public class JVMInfoResource implements Serializable {
 
+    private static final String DEFAULT_OBFUSCATE_PATTERN = "passw|pass|passwd|secret|key|token";
+
+    public static final Pattern obfuscateBasePattern = Pattern.compile(DEFAULT_OBFUSCATE_PATTERN,
+            Pattern.CASE_INSENSITIVE);
+
     public static final Pattern obfuscatePattern = Pattern.compile(
-            Config.getStringProperty("OBFUSCATE_SYSTEM_ENVIRONMENTAL_VARIABLES", "passw|pass|passwd|secret|key|token"),
+            Config.getStringProperty("OBFUSCATE_SYSTEM_ENVIRONMENTAL_VARIABLES", DEFAULT_OBFUSCATE_PATTERN),
             Pattern.CASE_INSENSITIVE);
 
     @Path("/")
@@ -187,7 +192,9 @@ private Map<String,Object> getReleaseInfo(){
     public static String obfuscateIfNeeded(final String key, final Object valueObject) {
         final String value = (String) valueObject;
         if(UtilMethods.isEmpty(value)) return "";
-        return obfuscatePattern.matcher(key).find() ? obfuscate(value) : value;
+        return obfuscateBasePattern.matcher(key).find() || obfuscatePattern.matcher(key).find()
+                ? obfuscate(value)
+                : value;
     }
 
     private static String obfuscate(final String value) {

dotCMS/src/main/java/com/dotmarketing/filters/CMSFilter.java

@@ -57,6 +57,13 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
 
         try {
             doFilterInternal(req, res, chain);
+        } catch (Exception e) {
+            if (e.getClass().getCanonicalName().contains("ClientAbortException")) {
+                Logger.info(this.getClass(), "ClientAbortException: " + ((HttpServletRequest) req).getRequestURI());
+                Logger.debug(this.getClass(), "ClientAbortException: " + e.getMessage());
+            } else {
+                throw e;
+            }
         } finally {
             DbConnectionFactory.closeSilently();
         }