X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityConfiguration.java;h=33458badaf3d2d1eefd034586c6c0f6460d61911;hb=50fb3b40ec45a65ba7c687e290a3d7f491484b49;hp=686b9cb17f535d4f9dceacd544f3b1788ec52b41;hpb=56ff26b25a114f55b66e47d8f2430d8fb8e3cda3;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
index 686b9cb1..33458bad 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,23 +23,20 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 
-import org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
-import org.oransc.ric.portal.dashboard.DashboardConstants;
-import org.oransc.ric.portal.dashboard.LoginServlet;
+import org.oransc.ric.portal.dashboard.DashboardUserManager;
 import org.oransc.ric.portal.dashboard.controller.A1MediatorController;
 import org.oransc.ric.portal.dashboard.controller.AdminController;
 import org.oransc.ric.portal.dashboard.controller.AnrXappController;
 import org.oransc.ric.portal.dashboard.controller.AppManagerController;
 import org.oransc.ric.portal.dashboard.controller.E2ManagerController;
 import org.oransc.ric.portal.dashboard.controller.SimpleErrorController;
-import org.oransc.ric.portal.dashboard.portalapi.DashboardUserManager;
 import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
 import org.oransc.ric.portal.dashboard.portalapi.PortalAuthenticationFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -73,8 +70,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	private String decryptor;
 	@Value("${portalapi.usercookie}")
 	private String userCookie;
-	@Value("${userfile}")
-	private String userFilePath;
+
+	@Autowired
+	DashboardUserManager userManager;
 
 	protected void configure(HttpSecurity http) throws Exception {
 		logger.debug("configure: portalapi.username {}", userName);
@@ -106,9 +104,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 			AppManagerController.CONTROLLER_PATH + "/" + AppManagerController.VERSION_METHOD, //
 			E2ManagerController.CONTROLLER_PATH + "/" + E2ManagerController.HEALTH_METHOD, //
 			E2ManagerController.CONTROLLER_PATH + "/" + E2ManagerController.VERSION_METHOD, //
-			SimpleErrorController.ERROR_PATH, //
-			DashboardConstants.LOGIN_PAGE //
-	};
+			SimpleErrorController.ERROR_PATH };
 
 	@Override
 	public void configure(WebSecurity web) throws Exception {
@@ -123,11 +119,6 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 		return new PortalAuthManager(appName, userName, password, decryptor, userCookie);
 	}
 
-	@Bean
-	public DashboardUserManager dashboardUserManagerBean() throws IOException {
-		return new DashboardUserManager(userFilePath);
-	}
-
 	/*
 	 * If this is annotated with @Bean, it is created automatically AND REGISTERED,
 	 * and Spring processes annotations in the source of the class. However, the
@@ -141,40 +132,8 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 			throws ClassNotFoundException, InstantiationException, IllegalAccessException, IOException,
 			IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
 		PortalAuthenticationFilter portalAuthenticationFilter = new PortalAuthenticationFilter(portalapiSecurity,
-				portalAuthManagerBean(), dashboardUserManagerBean());
+				portalAuthManagerBean(), this.userManager);
 		return portalAuthenticationFilter;
 	}
 
-	/**
-	 * Instantiates the EPSDK-FW servlet. Needed because this app is not configured
-	 * to scan the EPSDK-FW packages; there's also a chance that Spring-Boot does
-	 * not automatically process @WebServlet annotations.
-	 * 
-	 * @return Servlet registration bean for the Portal Rest API proxy servlet.
-	 */
-	@Bean
-	public ServletRegistrationBean<PortalRestAPIProxy> portalApiProxyServletBean() {
-		PortalRestAPIProxy servlet = new PortalRestAPIProxy();
-		final ServletRegistrationBean<PortalRestAPIProxy> servletBean = new ServletRegistrationBean<>(servlet,
-				PortalApiConstants.API_PREFIX + "/*");
-		servletBean.setName("PortalRestApiProxyServlet");
-		return servletBean;
-	}
-
-	/**
-	 * Instantiates a trivial login servlet that serves a basic page with a link to
-	 * authenticate at Portal. The login filter redirects to this page instead of
-	 * Portal.
-	 * 
-	 * @return Servlet registration bean for the Dashboard login servlet.
-	 */
-	@Bean
-	public ServletRegistrationBean<LoginServlet> loginServletBean() {
-		LoginServlet servlet = new LoginServlet();
-		final ServletRegistrationBean<LoginServlet> servletBean = new ServletRegistrationBean<>(servlet,
-				DashboardConstants.LOGIN_PAGE);
-		servletBean.setName("LoginServlet");
-		return servletBean;
-	}
-
 }