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%2Fcontroller%2FAppManagerController.java;h=2e1aaea09606afd5733754ff29b999940cf835c0;hb=847b44ffdd48cd1fa6b201887d3728df54305891;hp=40e03dbfb262eb0369a3e7a0ba8fdc5a140dbfd8;hpb=93a44cb851a49c923126f32016646860d104075c;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
index 40e03dbf..2e1aaea0 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,9 +56,12 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * Proxies calls from the front end to the App Manager API. All methods answer
- * 502 on failure: <blockquote>HTTP server received an invalid response from a
- * server it consulted when acting as a proxy or gateway.</blockquote>
+ * Proxies calls from the front end to the App Manager API.
+ * 
+ * If a method throws RestClientResponseException, it is handled by
+ * {@link CustomResponseEntityExceptionHandler#handleProxyMethodException(Exception, org.springframework.web.context.request.WebRequest)}
+ * which returns status 502. All other exceptions are handled by Spring which
+ * returns status 500.
  */
 @Configuration
 @RestController
@@ -95,12 +99,14 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Gets the XApp manager client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
 	@GetMapping(VERSION_METHOD)
+	// No role required
 	public SuccessTransport getClientVersion() {
 		return new SuccessTransport(200, DashboardApplication.getImplementationVersion(HealthApi.class));
 	}
 
 	@ApiOperation(value = "Health check of xApp Manager - Liveness probe.")
 	@GetMapping(HEALTH_ALIVE_METHOD)
+	// No role required
 	public void getHealth(HttpServletResponse response) {
 		logger.debug("getHealthAlive");
 		healthApi.getHealthAlive();
@@ -109,6 +115,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Readiness check of xApp Manager - Readiness probe.")
 	@GetMapping(HEALTH_READY_METHOD)
+	// No role required
 	public void getHealthReady(HttpServletResponse response) {
 		logger.debug("getHealthReady");
 		healthApi.getHealthReady();
@@ -117,6 +124,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Returns the configuration of all xapps.", response = AllXappConfig.class)
 	@GetMapping(CONFIG_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public AllXappConfig getAllXappConfig() {
 		logger.debug("getAllXappConfig");
 		return xappApi.getAllXappConfig();
@@ -124,6 +132,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Create xApp config.", response = XAppConfig.class)
 	@PostMapping(CONFIG_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public XAppConfig createXappConfig(@RequestBody XAppConfig xAppConfig) {
 		logger.debug("createXappConfig {}", xAppConfig);
 		return xappApi.createXappConfig(xAppConfig);
@@ -131,6 +140,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Modify xApp config.", response = XAppConfig.class)
 	@PutMapping(CONFIG_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public XAppConfig modifyXappConfig(@RequestBody XAppConfig xAppConfig) {
 		logger.debug("modifyXappConfig {}", xAppConfig);
 		return xappApi.modifyXappConfig(xAppConfig);
@@ -138,6 +148,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Delete xApp configuration.")
 	@DeleteMapping(CONFIG_METHOD + "/{" + PP_XAPP_NAME + "}")
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void deleteXappConfig(@RequestBody ConfigMetadata configMetadata, HttpServletResponse response) {
 		logger.debug("deleteXappConfig {}", configMetadata);
 		xappApi.deleteXappConfig(configMetadata);
@@ -146,9 +157,10 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Returns a list of deployable xapps.", response = DashboardDeployableXapps.class)
 	@GetMapping(XAPPS_LIST_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public Object getAvailableXapps() {
 		logger.debug("getAvailableXapps");
-		AllDeployableXapps appNames = xappApi.listAllXapps();
+		AllDeployableXapps appNames = xappApi.listAllDeployableXapps();
 		// Answer a collection of structure instead of string
 		// because I expect the AppMgr to be extended with
 		// additional properties for each one.
@@ -160,6 +172,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Returns the status of all deployed xapps.", response = AllDeployedXapps.class)
 	@GetMapping(XAPPS_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public AllDeployedXapps getDeployedXapps() {
 		logger.debug("getDeployedXapps");
 		return xappApi.getAllXapps();
@@ -167,6 +180,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Returns the status of a given xapp.", response = Xapp.class)
 	@GetMapping(XAPPS_METHOD + "/{" + PP_XAPP_NAME + "}")
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public Xapp getXapp(@PathVariable("xAppName") String xAppName) {
 		logger.debug("getXapp {}", xAppName);
 		return xappApi.getXappByName(xAppName);
@@ -174,6 +188,7 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Deploy a xapp.", response = Xapp.class)
 	@PostMapping(XAPPS_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public Xapp deployXapp(@RequestBody XAppInfo xAppInfo) {
 		logger.debug("deployXapp {}", xAppInfo);
 		return xappApi.deployXapp(xAppInfo);
@@ -181,10 +196,11 @@ public class AppManagerController {
 
 	@ApiOperation(value = "Undeploy an existing xapp.")
 	@DeleteMapping(XAPPS_METHOD + "/{" + PP_XAPP_NAME + "}")
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void undeployXapp(@PathVariable("xAppName") String xAppName, HttpServletResponse response) {
 		logger.debug("undeployXapp {}", xAppName);
 		xappApi.undeployXapp(xAppName);
-		response.setStatus(healthApi.getApiClient().getStatusCode().value());
+		response.setStatus(xappApi.getApiClient().getStatusCode().value());
 	}
 
 }