Bug 4846 odl-mdsal-apidocs swagger UI uses deprecated TokenAuthFilter

Switches from TokenAuthFilter, a ContainerRequestFilter, to AAAFilter, a
javax.servlet.Filter.  This allows use of Shiro Realms including LDAP.

Change-Id: I4956d773da4128b5bbae92b3438154eff3e76367
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/opendaylight/restconf/sal-rest-docgen/pom.xml b/opendaylight/restconf/sal-rest-docgen/pom.xml
index 2a14fe28aaa8f0f44cfb53b1dc80b9c6440e033c..30f78ea494ace7f4cfec7cd23583606c8558eb78 100644 (file)
--- a/opendaylight/restconf/sal-rest-docgen/pom.xml
+++ b/opendaylight/restconf/sal-rest-docgen/pom.xml
@@ -106,7 +106,12 @@
               !org.apache.maven.project,
               !org.opendaylight.yangtools.yang2sources.spi,
               *,
-              com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets,
+              org.opendaylight.aaa.shiro.filters,
+              org.opendaylight.aaa.shiro.realm,
+              org.opendaylight.aaa.shiro.web.env,
+              org.apache.shiro.web.env
             </Import-Package>
             <Bundle-Activator>org.opendaylight.netconf.sal.rest.doc.DocProvider</Bundle-Activator>
             <Web-ContextPath>/apidoc</Web-ContextPath>

diff --git a/opendaylight/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml b/opendaylight/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
index 930a39db8e8083c3f394d20d6d3991bde385a453..cd267696304312eac072d295aba47b1529b6b343 100644 (file)
--- a/opendaylight/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
@@ -12,14 +12,28 @@
             <param-name>javax.ws.rs.Application</param-name>
             <param-value>org.opendaylight.netconf.sal.rest.doc.jaxrs.ApiDocApplication</param-value>
         </init-param>
-        <!-- AAA Auth Filter -->
-        <init-param>
-            <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
-            <param-value> org.opendaylight.aaa.sts.TokenAuthFilter</param-value>
-        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
+    <context-param>
+      <param-name>shiroEnvironmentClass</param-name>
+      <param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
+    </listener>
+
+    <filter>
+        <filter-name>ShiroFilter</filter-name>
+        <filter-class>org.opendaylight.aaa.shiro.filters.AAAFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>ShiroFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
     <servlet-mapping>
         <servlet-name>JAXRSApiDoc</servlet-name>
         <url-pattern>/apis/*</url-pattern>