LPS-200583 - Check max files against modulePaths.length, and add error handling

Author: kresimir-coko

portal-impl/src/com/liferay/portal/servlet/ComboServlet.java

@@ -307,7 +307,7 @@ protected void doService(
 			if (cacheEnabled && (modulePathsString != null) &&
 				!PropsValues.COMBO_CHECK_TIMESTAMP) {
 
-				if (PropsValues.COMBO_MAX_FILES != -1) {
+				if (modulePaths.length <= PropsValues.COMBO_MAX_FILES) {
 					int totalFilesCount = 0;
 
 					List<String> keys = _bytesArrayPortalCache.getKeys();
@@ -323,6 +323,21 @@ protected void doService(
 						}
 					}
 				}
+				else {
+					httpServletResponse.setHeader(
+						HttpHeaders.CACHE_CONTROL,
+						HttpHeaders.CACHE_CONTROL_NO_CACHE_VALUE);
+
+					httpServletResponse.setStatus(
+						HttpServletResponse.SC_BAD_REQUEST);
+
+					if (_log.isWarnEnabled()) {
+						_log.warn(
+							"ComboServlet request exceeded maximum file count")
+					}
+
+					return;
+				}
 
 				_bytesArrayPortalCache.put(modulePathsString, bytesArray);
 			}