XSS Vulnerability fix in AuxApiRequestMapperController 42/91442/2
authorDominik Mizyn <d.mizyn@samsung.com>
Mon, 15 Jul 2019 10:32:27 +0000 (12:32 +0200)
committerDominik Mizyn <d.mizyn@samsung.com>
Mon, 15 Jul 2019 11:58:57 +0000 (13:58 +0200)
Custom data validotor is used to valid incoming data.

Issue-ID: OJSI-15
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
Change-Id: I1b2a1fe0fcb6278a7b12017479243009142c2cbd

ecomp-portal-BE-common/src/main/java/org/onap/portalapp/externalsystemapproval/model/ExternalSystemRoleApproval.java
ecomp-portal-BE-common/src/main/java/org/onap/portalapp/externalsystemapproval/model/ExternalSystemUser.java
ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperController.java
ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/Analytics.java
ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AuxApiRequestMapperControllerTest.java

index 550d11d..49eb469 100644 (file)
 package org.onap.portalapp.externalsystemapproval.model;
 
 import java.io.Serializable;
+import org.hibernate.validator.constraints.SafeHtml;
 
 public class ExternalSystemRoleApproval implements Serializable {
 
        private static final long serialVersionUID = 6048830318039958615L;
-
+       @SafeHtml
        private String roleName;
-
+       @SafeHtml
        public String getRoleName() {
                return roleName;
        }
index cfe4926..fa6c04e 100644 (file)
@@ -40,15 +40,17 @@ package org.onap.portalapp.externalsystemapproval.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.validation.Valid;
+import org.hibernate.validator.constraints.SafeHtml;
 
 public class ExternalSystemUser {
-
+       @SafeHtml
        private String loginId;
-       
+       @SafeHtml
        private String applicationName;
-       
+       @SafeHtml
        private String myloginrequestId;
-       
+       @Valid
        private List<ExternalSystemRoleApproval> roles;
 
        public ExternalSystemUser() {
index fe2c349..9ca88c0 100644 (file)
@@ -36,6 +36,8 @@
  */
 package org.onap.portalapp.portal.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.ApiOperation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -47,10 +49,8 @@ import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.portalapp.annotation.ApiVersion;
 import org.onap.portalapp.externalsystemapproval.model.ExternalSystemUser;
@@ -67,6 +67,8 @@ import org.onap.portalapp.portal.transport.EpNotificationItem;
 import org.onap.portalapp.portal.transport.FavoritesFunctionalMenuItemJson;
 import org.onap.portalapp.portal.transport.FunctionalMenuItem;
 import org.onap.portalapp.portal.transport.OnboardingApp;
+import org.onap.portalapp.validation.DataValidator;
+import org.onap.portalapp.validation.SecureString;
 import org.onap.portalsdk.core.domain.Role;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.crossapi.PortalAPIResponse;
@@ -76,6 +78,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -85,18 +88,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.annotations.ApiOperation;
-
 @RestController
 @RequestMapping("/auxapi")
-@org.springframework.context.annotation.Configuration
+@Configuration
 @EnableAspectJAutoProxy
 @EPAuditLog
 public class AuxApiRequestMapperController implements ApplicationContextAware, BasicAuthenticationController {
 
        private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AuxApiRequestMapperController.class);
+       private DataValidator dataValidator = new DataValidator();
 
        ApplicationContext context = null;
        int minorVersion = 0;
@@ -108,6 +108,13 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/user/{loginId}" }, method = RequestMethod.GET, produces = "application/json")
        public String getUser(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("loginId") String loginId) throws Exception {
+               if (loginId!=null){
+                       SecureString secureLoginId = new SecureString(loginId);
+                       if (!dataValidator.isValid(secureLoginId))
+                               return "Provided data is not valid";
+               }
+
+
                Map<String, Object> res = getMethod(request, response);
                String answer = null;
                try {
@@ -198,6 +205,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/function/{code}" }, method = RequestMethod.GET, produces = "application/json")
        public CentralV2RoleFunction getRoleFunction(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("code") String code) throws Exception {
+               if (code!=null){
+                       SecureString secureCode = new SecureString(code);
+                       if (!dataValidator.isValid(secureCode))
+                               return new CentralV2RoleFunction();
+               }
+
                Map<String, Object> res = getMethod(request, response);
                CentralV2RoleFunction roleFunction = null;
                try {
@@ -214,13 +227,20 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        public PortalRestResponse<String> saveRoleFunction(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody String roleFunc) throws Exception {
                PortalRestResponse<String> result = null;
+
+               if (roleFunc!=null){
+                       SecureString secureRoleFunc = new SecureString(roleFunc);
+                       if(!dataValidator.isValid(secureRoleFunc))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Provided data is not valid", "Failed");
+               }
+
                Map<String, Object> res = getMethod(request, response);
                try {
                        result = (PortalRestResponse<String>) invokeMethod(res, request, response, roleFunc);
                        return result;
                } catch (Exception e) {
                        logger.error(EELFLoggerDelegate.errorLogger, "saveRoleFunction failed", e);
-                       return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "Failed");
+                       return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage(), "Failed");
                }
        }
 
@@ -230,6 +250,13 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        public PortalRestResponse<String> deleteRoleFunction(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("code") String code) throws Exception {
                PortalRestResponse<String> result = null;
+
+               if (code!=null){
+                       SecureString secureCode = new SecureString(code);
+                       if(!dataValidator.isValid(secureCode))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Provided data is not valid", "Failed");
+               }
+
                Map<String, Object> res = getMethod(request, response);
                try {
                        result = (PortalRestResponse<String>) invokeMethod(res, request, response, code);
@@ -276,6 +303,14 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        public String getEcompUser(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("loginId") String loginId) throws Exception {
                Map<String, Object> res = getMethod(request, response);
+
+               if (loginId!=null){
+                       SecureString secureLoginId = new SecureString(loginId);
+
+                       if (!dataValidator.isValid(secureLoginId))
+                               return null;
+               }
+
                String answer = null;
                try {
                        answer = (String) invokeMethod(res, request, response, loginId);
@@ -319,6 +354,14 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/extendSessionTimeOuts" }, method = RequestMethod.POST)
        public Boolean extendSessionTimeOuts(HttpServletRequest request, HttpServletResponse response,
                        @RequestParam String sessionMap) throws Exception {
+
+               if (sessionMap!=null){
+                       SecureString secureSessionMap = new SecureString(sessionMap);
+                       if (!dataValidator.isValid(secureSessionMap)){
+                               return null;
+                       }
+               }
+
                Map<String, Object> res = getMethod(request, response);
                Boolean ans = null;
                try {
@@ -347,6 +390,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @ApiOperation(value = "Accepts data from partner applications with web analytics data.", response = PortalAPIResponse.class)
        public PortalAPIResponse storeAnalyticsScript(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody Analytics analyticsMap) throws Exception {
+
+               if (analyticsMap!=null){
+                       if (!dataValidator.isValid(analyticsMap))
+                               return new PortalAPIResponse(false, "analyticsScript is not valid");
+               }
+
                Map<String, Object> res = getMethod(request, response);
                PortalAPIResponse ans = new PortalAPIResponse(true, "error");
                try {
@@ -715,6 +764,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/userProfile" }, method = RequestMethod.POST, produces = "application/json")
        public PortalRestResponse<String> postUserProfile(HttpServletRequest request,
                        @RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
+
+               if (extSysUser!=null){
+                       if (!dataValidator.isValid(extSysUser))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = null;
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -731,6 +786,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/userProfile" }, method = RequestMethod.PUT, produces = "application/json")
        public PortalRestResponse<String> putUserProfile(HttpServletRequest request,
                        @RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
+
+               if (extSysUser!=null){
+                       if (!dataValidator.isValid(extSysUser))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = null;
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -747,6 +808,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/userProfile" }, method = RequestMethod.DELETE, produces = "application/json")
        public PortalRestResponse<String> deleteUserProfile(HttpServletRequest request,
                        @RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
+
+               if (extSysUser!=null){
+                       if (!dataValidator.isValid(extSysUser))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = null;
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -763,6 +830,13 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/ticketevent" }, method = RequestMethod.POST)
        public PortalRestResponse<String> handleRequest(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody String ticketEventJson) throws Exception {
+
+               if (ticketEventJson!=null){
+                       SecureString secureTicketEventJson = new SecureString(ticketEventJson);
+                       if (!dataValidator.isValid(secureTicketEventJson))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ticketEventJson is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = null;
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -780,6 +854,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @ResponseBody
        public PortalRestResponse<String> postPortalAdmin(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody EPUser epUser) {
+
+               if (epUser!=null){
+                       if (!dataValidator.isValid(epUser))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "EPUser is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = null;
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -812,6 +892,12 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @ResponseBody
        public PortalRestResponse<String> postOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody OnboardingApp newOnboardApp) {
+
+               if (newOnboardApp!=null){
+                       if (!dataValidator.isValid(newOnboardApp))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "OnboardingApp is not valid", "Failed");
+               }
+
                PortalRestResponse<String> result = new PortalRestResponse<>();
                Map<String, Object> res = getMethod(request, response);
                try {
@@ -830,7 +916,13 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @ResponseBody
        public PortalRestResponse<String> putOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("appId") Long appId, @RequestBody OnboardingApp oldOnboardApp) {
-               PortalRestResponse<String> result = new PortalRestResponse<>();
+
+               if (oldOnboardApp!=null){
+                       if (!dataValidator.isValid(oldOnboardApp))
+                               return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "OnboardingApp is not valid", "Failed");
+               }
+
+               PortalRestResponse<String> result;
                Map<String, Object> res = getMethod(request, response);
                try {
                        result = (PortalRestResponse<String>) invokeMethod(res, request, response, appId, oldOnboardApp);
@@ -845,12 +937,16 @@ public class AuxApiRequestMapperController implements ApplicationContextAware, B
        @RequestMapping(value = { "/v3/publishNotification" }, method = RequestMethod.POST, produces = "application/json")
        @ResponseBody
        public PortalAPIResponse publishNotification(HttpServletRequest request,
-                       @RequestBody EpNotificationItem notificationItem, HttpServletResponse response) throws Exception {
-               PortalAPIResponse result = new PortalAPIResponse(true, "success");
+                       @RequestBody EpNotificationItem notificationItem, HttpServletResponse response) {
+
+               if (notificationItem!=null){
+                       if (!dataValidator.isValid(notificationItem))
+                               return new PortalAPIResponse(false, "EpNotificationItem is not valid");
+               }
+
                Map<String, Object> res = getMethod(request, response);
                try {
-                       result = (PortalAPIResponse) invokeMethod(res, request, response, notificationItem);
-                       return result;
+                       return (PortalAPIResponse) invokeMethod(res, request, response, notificationItem);
                } catch (Exception e) {
                        logger.error(EELFLoggerDelegate.errorLogger, "publishNotification failed", e);
                        return new PortalAPIResponse(false, e.getMessage());
index 2d85e8f..f5ca183 100644 (file)
 package org.onap.portalapp.portal.transport;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import org.hibernate.validator.constraints.SafeHtml;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Analytics {
-       
+       @SafeHtml
        private String action;
+       @SafeHtml
        private String page;
+       @SafeHtml
        private String function;
+       @SafeHtml
        private String userid;
+       @SafeHtml
        private String type;
        
        public String getType() {
index e730331..5f49c74 100644 (file)
@@ -45,10 +45,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -68,6 +66,7 @@ import org.onap.portalapp.portal.transport.Analytics;
 import org.onap.portalapp.portal.transport.EpNotificationItem;
 import org.onap.portalapp.portal.transport.OnboardingApp;
 import org.onap.portalsdk.core.domain.Role;
+import org.onap.portalsdk.core.onboarding.crossapi.PortalAPIResponse;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -114,6 +113,21 @@ public class AuxApiRequestMapperControllerTest {
                Mockito.when(mockedRequest.getMethod()).thenReturn("GET");
                assertNull(auxApiRequestMapperController.getUser(mockedRequest, mockedResponse, "test12"));
        }
+
+       @Test
+       public void getUserXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/roles");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("GET");
+               String expected = "Provided data is not valid";
+               String actual = auxApiRequestMapperController.getUser(mockedRequest, mockedResponse, "“><script>alert(“XSS”)</script>");
+               assertEquals(expected, actual);
+       }
        
        @Test
        public void getUserTestWithException() throws Exception {
@@ -233,6 +247,7 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.getRoleFunction(mockedRequest, mockedResponse, "test"));
        }
 
+
        @Test
        public void saveRoleFunctionTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/roleFunction");
@@ -247,6 +262,21 @@ public class AuxApiRequestMapperControllerTest {
                assertNotNull(response);
        }
 
+       @Test
+       public void saveRoleFunctionXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/roleFunction");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.saveRoleFunction(mockedRequest, mockedResponse, "<script>alert(123)</script>");
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Provided data is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void deleteRoleFunctionTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/roleFunction/test");
@@ -260,6 +290,22 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.deleteRoleFunction(mockedRequest, mockedResponse, "test"));
        }
 
+       @Test
+       public void deleteRoleFunctionXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/roleFunction/test");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("DELETE");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.deleteRoleFunction(mockedRequest, mockedResponse,
+                       "<svg><script x:href='https://dl.dropbox.com/u/13018058/js.js' {Opera}");
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Provided data is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void deleteRoleTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/deleteRole/1");
@@ -299,6 +345,19 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.getEcompUser(mockedRequest, mockedResponse, "test"));
        }
 
+       @Test
+       public void getEcompUserXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v4/user/test");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("GET");
+               assertNull(auxApiRequestMapperController.getEcompUser(mockedRequest, mockedResponse, "<script>alert(‘XSS’)</script>"));
+       }
+
        @Test
        public void getEcompRolesOfApplicationTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v4/roles");
@@ -339,6 +398,20 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.extendSessionTimeOuts(mockedRequest, mockedResponse, sessionMap));
        }
 
+       @Test
+       public void extendSessionTimeOutsXSSTest() throws Exception {
+               String sessionMap = "<script>alert(“XSS”)</script>";
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/extendSessionTimeOuts");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", sessionCommunicationController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               assertNull(auxApiRequestMapperController.extendSessionTimeOuts(mockedRequest, mockedResponse, sessionMap));
+       }
+
        @Test
        public void getAnalyticsScriptTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/analytics");
@@ -366,6 +439,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.storeAnalyticsScript(mockedRequest, mockedResponse, analyticsMap));
        }
 
+       @Test
+       public void storeAnalyticsScriptXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/storeAnalytics");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", webAnalyticsExtAppController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               Analytics analyticsMap = new Analytics();
+               analyticsMap.setPage("<script>alert(“XSS”);</script>");
+               PortalAPIResponse actual = auxApiRequestMapperController.storeAnalyticsScript(mockedRequest, mockedResponse, analyticsMap);
+               PortalAPIResponse expected  = new PortalAPIResponse(true, "analyticsScript is not valid");
+               assertEquals(expected.getMessage(), actual.getMessage());
+       }
+
        @Test
        public void bulkUploadFunctionsTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/upload/portal/functions");
@@ -531,6 +621,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.postUserProfile(mockedRequest, extSysUser, mockedResponse));
        }
 
+       @Test
+       public void postUserProfileXSSTest() {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/userProfile");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesApprovalSystemController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               ExternalSystemUser extSysUser = new ExternalSystemUser();
+               extSysUser.setLoginId("<script>alert(“XSS”);</script>");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.postUserProfile(mockedRequest, extSysUser, mockedResponse);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void putUserProfileTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/userProfile");
@@ -545,6 +652,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.putUserProfile(mockedRequest, extSysUser, mockedResponse));
        }
 
+       @Test
+       public void putUserProfileXSSTest() {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/userProfile");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesApprovalSystemController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               ExternalSystemUser extSysUser = new ExternalSystemUser();
+               extSysUser.setLoginId("<script>alert(“XSS”);</script>");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.putUserProfile(mockedRequest, extSysUser, mockedResponse);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void deleteUserProfileTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/userProfile");
@@ -559,6 +683,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.deleteUserProfile(mockedRequest, extSysUser, mockedResponse));
        }
 
+       @Test
+       public void deleteUserProfileXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/userProfile");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", rolesApprovalSystemController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("DELETE");
+               ExternalSystemUser extSysUser = new ExternalSystemUser();
+               extSysUser.setLoginId("<script>alert(“XSS”);</script>");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.deleteUserProfile(mockedRequest, extSysUser, mockedResponse);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ExternalSystemUser is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void handleRequestTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/ticketevent");
@@ -572,6 +713,21 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.handleRequest(mockedRequest, mockedResponse, "test"));
        }
 
+       @Test
+       public void handleRequestXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/ticketevent");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", ticketEventVersionController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.handleRequest(mockedRequest, mockedResponse, "<script>alert(“XSS”);</script>");
+               PortalRestResponse<String> expected =  new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "ticketEventJson is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void postPortalAdminTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/portalAdmin");
@@ -586,6 +742,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.postPortalAdmin(mockedRequest, mockedResponse, epUser));
        }
 
+       @Test
+       public void postPortalAdminXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/portalAdmin");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", appsControllerExternalVersionRequest);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               EPUser epUser = new EPUser();
+               epUser.setLoginId("<script>alert(/XSS”)</script>");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.postPortalAdmin(mockedRequest, mockedResponse, epUser);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "EPUser is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void getOnboardAppExternalTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/onboardApp/1");
@@ -613,6 +786,23 @@ public class AuxApiRequestMapperControllerTest {
                assertNull(auxApiRequestMapperController.postOnboardAppExternal(mockedRequest, mockedResponse, newOnboardApp));
        }
 
+       @Test
+       public void postOnboardAppExternalXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/onboardApp");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", appsControllerExternalVersionRequest);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               OnboardingApp newOnboardApp = new OnboardingApp();
+               newOnboardApp.setUebKey("&#00;</form><input type&#61;\"date\" onfocus=\"alert(1)\">");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.postOnboardAppExternal(mockedRequest, mockedResponse, newOnboardApp);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "OnboardingApp is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void putOnboardAppExternalTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/onboardApp/1");
@@ -628,6 +818,24 @@ public class AuxApiRequestMapperControllerTest {
                                newOnboardApp));
        }
 
+       @Test
+       public void putOnboardAppExternalXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/onboardApp/1");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", appsControllerExternalVersionRequest);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("PUT");
+               OnboardingApp newOnboardApp = new OnboardingApp();
+               newOnboardApp.setUebTopicName("&#13;<blink/&#13; onmouseover=pr&#x6F;mp&#116;(1)>OnMouseOver {Firefox & Opera}");
+               PortalRestResponse<String> actual = auxApiRequestMapperController.putOnboardAppExternal(mockedRequest, mockedResponse, (long) 1,
+                       newOnboardApp);
+               PortalRestResponse<String> expected = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "OnboardingApp is not valid", "Failed");
+               assertEquals(expected, actual);
+       }
+
        @Test
        public void publishNotificationTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/publishNotification");
@@ -642,6 +850,24 @@ public class AuxApiRequestMapperControllerTest {
                assertNotNull(auxApiRequestMapperController.publishNotification(mockedRequest, notificationItem, mockedResponse));
        }
 
+       @Test
+       public void publishNotificationXSSTest() throws Exception {
+               Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/publishNotification");
+               Mockito.when(mockedRequest.getHeader("MinorVersion")).thenReturn("0");
+               Map<String, Object> beans = new HashMap<>();
+               beans.put("bean1", externalAppsRestfulVersionController);
+               Mockito.when(context.getBeansWithAnnotation(ApiVersion.class)).thenReturn(beans);
+               PowerMockito.mockStatic(AopUtils.class);
+               Mockito.when(AopUtils.isAopProxy(Matchers.anyObject())).thenReturn(false);
+               Mockito.when(mockedRequest.getMethod()).thenReturn("POST");
+               EpNotificationItem notificationItem = new EpNotificationItem();
+               notificationItem.setIsForAllRoles("</svg>''<svg><script 'AQuickBrownFoxJumpsOverTheLazyDog'>alert&#x28;1&#x29; {Opera}");
+               PortalAPIResponse actual = auxApiRequestMapperController.publishNotification(mockedRequest, notificationItem, mockedResponse);
+               PortalAPIResponse expected = new PortalAPIResponse(false, "EpNotificationItem is not valid");
+               assertEquals(expected.getMessage(), actual.getMessage());
+               assertEquals(expected.getStatus(), actual.getStatus());
+       }
+
        @Test
        public void getFavoritesForUserTest() throws Exception {
                Mockito.when(mockedRequest.getRequestURI()).thenReturn("/auxapi/v3/getFavorites");