ServletRequestMethodArgumentResolver validates argument type match

Issue: SPR-15214
(cherry picked from commit e44533f)

Author: jhoeller

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
 import org.springframework.lang.UsesJava8;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
@@ -46,12 +45,12 @@
  * <li>{@link MultipartRequest}
  * <li>{@link HttpSession}
  * <li>{@link Principal}
+ * <li>{@link InputStream}
+ * <li>{@link Reader}
+ * <li>{@link HttpMethod} (as of Spring 4.0)</li>
  * <li>{@link Locale}
  * <li>{@link TimeZone} (as of Spring 4.0)
  * <li>{@link java.time.ZoneId} (as of Spring 4.0 and Java 8)</li>
- * <li>{@link InputStream}
- * <li>{@link Reader}
- * <li>{@link org.springframework.http.HttpMethod} (as of Spring 4.0)</li>
  * </ul>
  *
  * @author Arjen Poutsma
@@ -69,12 +68,12 @@ public boolean supportsParameter(MethodParameter parameter) {
 				MultipartRequest.class.isAssignableFrom(paramType) ||
 				HttpSession.class.isAssignableFrom(paramType) ||
 				Principal.class.isAssignableFrom(paramType) ||
-				Locale.class == paramType ||
-				TimeZone.class == paramType ||
-				"java.time.ZoneId".equals(paramType.getName()) ||
 				InputStream.class.isAssignableFrom(paramType) ||
 				Reader.class.isAssignableFrom(paramType) ||
-				HttpMethod.class == paramType);
+				HttpMethod.class == paramType ||
+				Locale.class == paramType ||
+				TimeZone.class == paramType ||
+				"java.time.ZoneId".equals(paramType.getName()));
 	}
 
 	@Override
@@ -83,6 +82,10 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 
 		Class<?> paramType = parameter.getParameterType();
 		if (WebRequest.class.isAssignableFrom(paramType)) {
+			if (!paramType.isInstance(webRequest)) {
+				throw new IllegalStateException(
+						"Current request is not of type [" + paramType.getName() + "]: " + webRequest);
+			}
 			return webRequest;
 		}
 
@@ -96,13 +99,39 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 			return nativeRequest;
 		}
 		else if (HttpSession.class.isAssignableFrom(paramType)) {
-			return request.getSession();
+			HttpSession session = request.getSession();
+			if (!paramType.isInstance(session)) {
+				throw new IllegalStateException(
+						"Current session is not of type [" + paramType.getName() + "]: " + session);
+			}
+			return session;
 		}
-		else if (HttpMethod.class == paramType) {
-			return ((ServletWebRequest) webRequest).getHttpMethod();
+		else if (InputStream.class.isAssignableFrom(paramType)) {
+			InputStream inputStream = request.getInputStream();
+			if (!paramType.isInstance(inputStream)) {
+				throw new IllegalStateException(
+						"Request input stream is not of type [" + paramType.getName() + "]: " + inputStream);
+			}
+			return inputStream;
+		}
+		else if (Reader.class.isAssignableFrom(paramType)) {
+			Reader reader = request.getReader();
+			if (!paramType.isInstance(reader)) {
+				throw new IllegalStateException(
+						"Request body reader is not of type [" + paramType.getName() + "]: " + reader);
+			}
+			return reader;
 		}
 		else if (Principal.class.isAssignableFrom(paramType)) {
-			return request.getUserPrincipal();
+			Principal userPrincipal = request.getUserPrincipal();
+			if (!paramType.isInstance(userPrincipal)) {
+				throw new IllegalStateException(
+						"Current user principal is not of type [" + paramType.getName() + "]: " + userPrincipal);
+			}
+			return userPrincipal;
+		}
+		else if (HttpMethod.class == paramType) {
+			return HttpMethod.resolve(request.getMethod());
 		}
 		else if (Locale.class == paramType) {
 			return RequestContextUtils.getLocale(request);
@@ -114,16 +143,10 @@ else if (TimeZone.class == paramType) {
 		else if ("java.time.ZoneId".equals(paramType.getName())) {
 			return ZoneIdResolver.resolveZoneId(request);
 		}
-		else if (InputStream.class.isAssignableFrom(paramType)) {
-			return request.getInputStream();
-		}
-		else if (Reader.class.isAssignableFrom(paramType)) {
-			return request.getReader();
-		}
 		else {
-			// should never happen...
+			// Should never happen...
 			throw new UnsupportedOperationException(
-					"Unknown parameter type: " + paramType + " in method: " + parameter.getMethod());
+					"Unknown parameter type [" + paramType.getName() + "] in " + parameter.getMethod());
 		}
 	}