1 files changed, 18 insertions, 32 deletions
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
index 9805d004..0d7a547f 100644
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
@@ -25,17 +25,16 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.annotation.Order;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.realm.text.PropertiesRealm;
-import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
-import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.springframework.context.annotation.Bean;
-import org.onap.aaf.cadi.shiro.AAFRealm;
+
+import org.onap.aaf.cadi.filter.CadiFilter;
 
 @SpringBootApplication(scanBasePackages={ "org.onap.ccsdk.apps.ms.sliboot.*", "org.onap.ccsdk.apps.services" })
 @EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*")
@@ -51,34 +50,21 @@ public class SlibootApp {
   }
 
   @Bean
-  public Realm realm() {
-
-    // If cadi prop files is not defined use local properties realm
-    // src/main/resources/shiro-users.properties
-    if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {
-      log.info("cadi_prop_files undefined, AAF Realm will not be set");
-      PropertiesRealm realm = new PropertiesRealm();
-      return realm;
-    } else {
-      AAFRealm realm = new AAFRealm();
-      return realm;
-    }
+	@Order(1)
+	public FilterRegistrationBean<CadiFilter> cadiFilter() {
+		CadiFilter filter = new CadiFilter();
 
-  }
+		FilterRegistrationBean<CadiFilter> registrationBean = new FilterRegistrationBean<>();
+		registrationBean.setFilter(filter);
+		if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {
+            log.info("cadi_prop_files undefined, AAF CADI disabled");
+			registrationBean.addUrlPatterns("/xxxx/*");
+		} else {
+			registrationBean.addUrlPatterns("/*");
+			registrationBean.addInitParameter("cadi_prop_files", System.getProperty("cadi_prop_files"));
+		}
 
-  @Bean
-  public ShiroFilterChainDefinition shiroFilterChainDefinition() {
-    DefaultShiroFilterChainDefinition chainDefinition = new DefaultShiroFilterChainDefinition();
-
-    // if cadi prop files is not set disable authentication
-    if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {
-      chainDefinition.addPathDefinition("/**", "anon");
-    } else {
-      log.info("Loaded property cadi_prop_files, AAF REALM set");
-      chainDefinition.addPathDefinition("/**", "authcBasic, rest[org.onap.sdnc.odl:odl-api]");
-    }
-
-    return chainDefinition;
-  }
+		return registrationBean;
+	} 
 
 }