Using MultipartHttpServletRequest casting due to latest spring compatbility

Author: sudhanshu-raj

omod/src/main/java/org/openmrs/web/xss/XSSFilter.java

@@ -19,34 +19,34 @@
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 
-import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import static org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload.isMultipartContent;
 
 public class XSSFilter implements Filter {
-	
+
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
-	        ServletException {
-		
+			ServletException {
+
 		if (!"GET".equalsIgnoreCase(((HttpServletRequest) request).getMethod())) {
 			if (isMultipartContent((HttpServletRequest) request)) {
-				request = new XSSMultipartRequestWrapper((DefaultMultipartHttpServletRequest) request);
+				request = new XSSMultipartRequestWrapper((MultipartHttpServletRequest) request);
 			} else {
 				request = new XSSRequestWrapper((HttpServletRequest) request);
 			}
 		}
-		
+
 		chain.doFilter(request, response);
 	}
-	
+
 	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {
-		
+
 	}
-	
+
 	@Override
 	public void destroy() {
-		
+
 	}
 }

omod/src/main/java/org/openmrs/web/xss/XSSMultipartRequestWrapper.java

@@ -9,16 +9,21 @@
  */
 package org.openmrs.web.xss;
 
-import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
+import jakarta.servlet.http.HttpServletRequestWrapper;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-public class XSSMultipartRequestWrapper extends DefaultMultipartHttpServletRequest {
-	
-	public XSSMultipartRequestWrapper(DefaultMultipartHttpServletRequest request) {
+public class XSSMultipartRequestWrapper extends HttpServletRequestWrapper implements MultipartHttpServletRequest {
+
+	public XSSMultipartRequestWrapper(MultipartHttpServletRequest request) {
 		super(request);
 	}
 
@@ -51,27 +56,52 @@ public String[] getParameterValues(String name) {
 	}
 
 	@Override
-	public DefaultMultipartHttpServletRequest getRequest() {
-		return (DefaultMultipartHttpServletRequest) super.getRequest();
+	public MultipartHttpServletRequest getRequest() {
+		return (MultipartHttpServletRequest) super.getRequest();
 	}
-	
+
+	@Override
+	public Iterator<String> getFileNames() {
+		return getRequest().getFileNames();
+	}
+
 	@Override
 	public MultipartFile getFile(String name) {
 		return getRequest().getFile(name);
 	}
-	
+
+	@Override
+	public List<MultipartFile> getFiles(String name) {
+		return getRequest().getFiles(name);
+	}
+
+	@Override
+	public Map<String, MultipartFile> getFileMap() {
+		return getRequest().getFileMap();
+	}
+
 	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return getRequest().getMultiFileMap();
 	}
-	
+
 	@Override
-	public Enumeration<String> getParameterNames() {
-		return getRequest().getParameterNames();
+	public String getMultipartContentType(String paramOrFileName) {
+		return getRequest().getMultipartContentType(paramOrFileName);
 	}
-	
+
 	@Override
-	public List<MultipartFile> getFiles(String name) {
-		return getRequest().getFiles(name);
+	public HttpHeaders getMultipartHeaders(String paramOrFileName) {
+		return getRequest().getMultipartHeaders(paramOrFileName);
+	}
+
+	@Override
+	public HttpHeaders getRequestHeaders() {
+		return getRequest().getRequestHeaders();
+	}
+
+	@Override
+	public HttpMethod getRequestMethod() {
+		return getRequest().getRequestMethod();
 	}
 }