Use AAAShiroFilter as TokenAuthFilter was deprecated in Be

Use the correct shiro filter for GBP endpoints.

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

diff --git a/features/pom.xml b/features/pom.xml
index 037ab315488aec812af1d8ebe655b3f119a92f13..305fea44f9c2f5d0f0cdaa288c06527c9b44fd00 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -185,7 +185,7 @@
     <!-- AAA -->
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa</artifactId>
+      <artifactId>features-aaa-shiro</artifactId>
       <version>${aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 4b77ef4c3c06da996a85891f9bda92c65a191e51..f2e915f514e6a7e858a2303a8175d93f8ad900af 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -30,7 +30,7 @@
     <!-- Repos needed by the UI -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
     <!-- Repos needed by IOvisor Renderer -->
-    <repository>mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${aaa.version}/xml/features</repository>
     <!-- Repos needed by sxp-mapper -->
     <repository>mvn:org.opendaylight.sxp/features/${sxp.version}/xml/features</repository>
 
@@ -104,7 +104,7 @@
     <feature name='odl-groupbasedpolicy-iovisor' version='${project.version}'
              description='OpenDaylight :: groupbasedpolicy :: IOVisor Renderer'>
         <feature>war</feature>
-        <feature version='${aaa.version}'>odl-aaa-authn</feature>
+        <feature version='${aaa.version}'>odl-aaa-shiro</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${restconf.version}">odl-restconf</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/iovisor-renderer/{{VERSION}}</bundle>

diff --git a/renderers/iovisor/pom.xml b/renderers/iovisor/pom.xml
index db7e60a4fecfda705f1c543de318b4e44b10edfc..0404347b4c92e5b8b0c611a2b08910caa6784a3d 100644 (file)
--- a/renderers/iovisor/pom.xml
+++ b/renderers/iovisor/pom.xml
@@ -99,6 +99,15 @@
           <instructions>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+          <Import-Package>
+            *,
+            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>
         </configuration>
       </plugin>
     </plugins>

diff --git a/renderers/iovisor/src/main/resources/WEB-INF/web.xml b/renderers/iovisor/src/main/resources/WEB-INF/web.xml
index 67da998b60f105939075301fbc298bf6fe48a73b..b296f1faeca6a76a1d0c887cabc3e4f9fd6cac15 100644 (file)
--- a/renderers/iovisor/src/main/resources/WEB-INF/web.xml
+++ b/renderers/iovisor/src/main/resources/WEB-INF/web.xml
@@ -9,11 +9,6 @@
       <param-name>javax.ws.rs.Application</param-name>\r
       <param-value>org.opendaylight.groupbasedpolicy.renderer.iovisor.sbrest.IovisorRSApplication</param-value>\r
     </init-param>\r
-    <!-- AAA Auth Filter -->\r
-    <init-param>\r
-      <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>\r
-      <param-value> org.opendaylight.aaa.sts.TokenAuthFilter</param-value>\r
-    </init-param>\r
     <load-on-startup>1</load-on-startup>\r
   </servlet>\r
 \r
@@ -22,6 +17,25 @@
     <url-pattern>/*</url-pattern>\r
   </servlet-mapping>\r
 \r
+  <context-param>\r
+    <param-name>shiroEnvironmentClass</param-name>\r
+    <param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>\r
+  </context-param>\r
+\r
+  <listener>\r
+    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>\r
+  </listener>\r
+\r
+  <filter>\r
+    <filter-name>ShiroFilter</filter-name>\r
+    <filter-class>org.opendaylight.aaa.shiro.filters.AAAShiroFilter</filter-class>\r
+  </filter>\r
+\r
+  <filter-mapping>\r
+    <filter-name>ShiroFilter</filter-name>\r
+    <url-pattern>/*</url-pattern>\r
+  </filter-mapping>\r
+\r
   <filter>\r
     <filter-name>cross-origin-restconf</filter-name>\r
     <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>\r