Merge "Fix sql injection vulnerability"

[portal.git] / ecomp-portal-BE-os / src / main / webapp / WEB-INF / web.xml

diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
index 1480a51..af712d4 100644 (file)
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
@@ -3,11 +3,11 @@
   ============LICENSE_START==========================================
   ONAP Portal
   ===================================================================
-  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
  
   Unless otherwise specified, all software contained herein is licensed
-  under the Apache License, Version 2.0 (the “License”);
+  under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -20,7 +20,7 @@
   limitations under the License.
  
   Unless otherwise specified, all documentation contained herein is licensed
-  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
  
@@ -34,7 +34,7 @@
  
   ============LICENSE_END============================================
  
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  
   -->
 
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
@@ -54,7 +54,7 @@
        <!-- The Portal app can function on a HA cluster -->
        <distributable/>
        
-       <context-param>
+       <!-- <context-param>
        <param-name>contextConfigLocation</param-name>
                <param-value>/WEB-INF/oid-context.xml</param-value>
        </context-param>
@@ -63,13 +63,22 @@
           <listener-class>
                org.springframework.web.context.ContextLoaderListener
           </listener-class>
-       </listener> 
+       </listener>  -->
 
 
        <listener>
-       <listener-class>org.openecomp.portalapp.portal.listener.UserSessionListener</listener-class>
+       <listener-class>org.onap.portalapp.portal.listener.UserSessionListener</listener-class>
        </listener>
-               
+       <filter>
+               <filter-name>springSessionRepositoryFilter</filter-name>
+               <filter-class>org.onap.portalapp.music.filter.MusicSessionRepositoryFilter</filter-class>
+       </filter>
+       <filter-mapping>
+               <filter-name>springSessionRepositoryFilter</filter-name>
+               <url-pattern>/*</url-pattern>
+               <dispatcher>REQUEST</dispatcher>
+               <dispatcher>ERROR</dispatcher>
+       </filter-mapping>
        <filter>
        <filter-name>CorsFilter</filter-name>
                <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
@@ -88,18 +97,41 @@
       <url-pattern>/*</url-pattern>
     </filter-mapping>
     
-       <filter>
-           <filter-name>springSecurityFilterChain</filter-name>
-           <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-            <!-- <init-param>
-               <param-name>contextAttribute</param-name>
-               <param-value>org.springframework.web.servlet.FrameworkServlet.CONTEXT.appServlet</param-value>
-           </init-param> -->
+       <filter>
+           <filter-name>SecurityXssFilter</filter-name>
+           <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>
        </filter>
-
+       
        <filter-mapping>
-           <filter-name>springSecurityFilterChain</filter-name>
+           <filter-name>SecurityXssFilter</filter-name>
            <url-pattern>/*</url-pattern>
        </filter-mapping>
-        
+<!--   <filter> -->
+<!--           <filter-name>CadiAuthFilter</filter-name> -->
+<!--           <filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class> -->
+<!--           <init-param> -->
+<!--                   <param-name>cadi_prop_files</param-name> -->
+<!--         Add Absolute path of cadi.properties -->
+<!--                   <param-value>{Path}/cadi.properties -->
+<!--                   </param-value> -->
+<!--           </init-param> -->
+<!--          Add param values with comma delimited values -->
+<!--           <init-param> -->
+<!--                   <param-name>include_url_endpoints</param-name> -->
+<!--                   <param-value>/auxapi/*</param-value> -->
+<!--           </init-param> -->
+<!--           <init-param> -->
+<!--                   <param-name>exclude_url_endpoints</param-name> -->
+<!--                   <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value> -->
+<!--           </init-param> -->
+<!--   </filter> -->
+<!--   <filter-mapping> -->
+<!--           <filter-name>CadiAuthFilter</filter-name> -->
+<!--           <url-pattern>/auxapi/v3/*</url-pattern> -->
+<!--   </filter-mapping> -->
+<!--   <filter-mapping> -->
+<!--           <filter-name>CadiAuthFilter</filter-name> -->
+<!--           <url-pattern>/auxapi/v4/*</url-pattern> -->
+               
+<!--   </filter-mapping>   -->
 </web-app>