Merge "Fix get resource input json string issue"

[so.git] / asdc-controller / WebContent / WEB-INF / web.xml

diff --git a/asdc-controller/WebContent/WEB-INF/web.xml b/asdc-controller/WebContent/WEB-INF/web.xml
index a8ccd17..910b466 100644 (file)
--- a/asdc-controller/WebContent/WEB-INF/web.xml
+++ b/asdc-controller/WebContent/WEB-INF/web.xml
@@ -2,8 +2,8 @@
 \r
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">\r
   <display-name>ASDC Controller</display-name>\r
- \r
- \r
+\r
+\r
    <!-- enable the Asynchronous Job Service -->\r
     <context-param>\r
         <param-name>resteasy.async.job.service.enabled</param-name>\r
@@ -15,7 +15,7 @@
                <param-value>java:module/MsoPropertiesFactory</param-value>\r
         </context-param>\r
 \r
-    <!-- The next context parameters are all optional.  \r
+    <!-- The next context parameters are all optional.\r
          Their default values are shown as example param-values -->\r
 \r
     <!-- How many jobs results can be held in memory at once? -->\r
@@ -45,8 +45,8 @@
     <param-name>resteasy.scan</param-name>\r
     <param-value>true</param-value>\r
   </context-param>\r
- \r
-  <!--  \r
+\r
+  <!--\r
   <context-param>\r
     <param-name>resteasy.servlet.mapping.prefix</param-name>\r
     <param-value>/v1</param-value>\r
@@ -56,18 +56,17 @@
        <param-name>log.configuration</param-name>\r
        <param-value>logback.asdc.xml</param-value>\r
   </context-param>\r
-  \r
+\r
   <context-param>\r
        <param-name>mso.configuration</param-name>\r
-       <param-value>MSO_PROP_ASDC=mso.asdc.json,MSO_PROP_TOPOLOGY=topology.properties</param-value>\r
-\r
+       <param-value>MSO_PROP_ASDC=mso.asdc.json,MSO_PROP_TOPOLOGY=topology.properties,MSO_ASDC_CLIENTS=mso.asdc.clients.properties</param-value>\r
   </context-param>\r
-  \r
+\r
   <context-param>\r
     <param-name>resteasy.resources</param-name>\r
     <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.asdc.healthcheck.HealthCheckHandler</param-value>\r
   </context-param>\r
-  \r
+\r
   <listener>\r
     <listener-class>\r
                        org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap\r
@@ -86,7 +85,7 @@
 \r
     <filter>\r
                <filter-name>LogFilter</filter-name>\r
-               <filter-class>org.openecomp.mso.logger.LogFilter</filter-class> \r
+               <filter-class>org.openecomp.mso.logger.LogFilter</filter-class>\r
        </filter>\r
       <filter-mapping>\r
                <filter-name>LogFilter</filter-name>\r
@@ -104,6 +103,19 @@
             <role-name>SiteControl-Client</role-name>\r
         </auth-constraint>\r
     </security-constraint>\r
+    <security-constraint>\r
+        <web-resource-collection>\r
+            <web-resource-name>MSO internal Requests</web-resource-name>\r
+            <description>Internal Requests</description>\r
+            <url-pattern>/logging/*</url-pattern>\r
+            <url-pattern>/properties/*</url-pattern>\r
+            <http-method>POST</http-method>\r
+            <http-method>GET</http-method>\r
+        </web-resource-collection>\r
+        <auth-constraint>\r
+            <role-name>MSO-Client</role-name>\r
+        </auth-constraint>\r
+    </security-constraint>\r
     <login-config>\r
         <auth-method>BASIC</auth-method>\r
         <realm-name>ApplicationRealm</realm-name>\r
@@ -111,4 +123,7 @@
     <security-role>\r
         <role-name>SiteControl-Client</role-name>\r
     </security-role>\r
+    <security-role>\r
+        <role-name>MSO-Client</role-name>\r
+    </security-role>\r
 </web-app>
\ No newline at end of file