aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java35
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java3
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/guilin.features.properties2
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/controller/WebConfigTest.java93
5 files changed, 129 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java b/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
index cfb848007..ab028756b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/WebConfig.java
@@ -28,7 +28,11 @@ import io.joshworks.restclient.http.mapper.ObjectMapper;
import java.io.File;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.annotation.PostConstruct;
import javax.servlet.ServletContext;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.portalsdk.core.domain.App;
+import org.onap.portalsdk.core.service.DataAccessService;
import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.vid.aai.AaiClient;
import org.onap.vid.aai.AaiClientInterface;
@@ -54,6 +58,7 @@ import org.onap.vid.asdc.rest.SdcRestClient;
import org.onap.vid.client.SyncRestClient;
import org.onap.vid.logging.VidLoggingInterceptor;
import org.onap.vid.properties.AsdcClientConfiguration;
+import org.onap.vid.properties.Features;
import org.onap.vid.properties.VidProperties;
import org.onap.vid.scheduler.SchedulerService;
import org.onap.vid.scheduler.SchedulerServiceImpl;
@@ -66,6 +71,7 @@ import org.onap.vid.services.PombaServiceImpl;
import org.onap.vid.utils.JoshworksJacksonObjectMapper;
import org.onap.vid.utils.Logging;
import org.onap.vid.utils.SystemPropertiesWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -83,11 +89,30 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration
public class WebConfig implements WebMvcConfigurer {
- /**
- * Gets the object mapper.
- *
- * @return the object mapper
- */
+ @Autowired DataAccessService dataAccessService;
+ @Autowired FeatureManager featureManager;
+ String portalAppPassword = System.getenv(VidProperties.PORTAL_APP_PASSWORD_ENVIRONMENT_VARIABLE_NAME);
+
+ @PostConstruct
+ public void persistPortalAppPassword() {
+ if (featureManager.isActive(Features.FLAG_GUILIN_CONFIG_PORTAL_APP_PASSWORD)) {
+ if (StringUtils.isEmpty(portalAppPassword)) {
+ return;
+ }
+
+ // Read self app object (i.e. where id=1) from database as AppServiceImpl.getDefaultApp() does
+ App defaultApp = (App) dataAccessService.getDomainObject(App.class, 1L, null);
+
+ if (defaultApp == null || StringUtils.equals(defaultApp.getAppPassword(), portalAppPassword)) {
+ return;
+ }
+
+ defaultApp.setAppPassword(portalAppPassword);
+ dataAccessService.saveDomainObject(defaultApp, null);
+ }
+ }
+
+
@Bean
public com.fasterxml.jackson.databind.ObjectMapper getObjectMapper() {
return new com.fasterxml.jackson.databind.ObjectMapper().registerModule(new KotlinModule());
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index 5c3f7835f..91f787cda 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -94,6 +94,8 @@ public enum Features implements Feature {
FLAG_2006_NETWORK_LOB_MULTI_SELECT,
FLAG_2006_VNF_LOB_MULTI_SELECT,
+ FLAG_GUILIN_CONFIG_PORTAL_APP_PASSWORD,
+
;
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
index 39750246b..ab2d1ec74 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java
@@ -21,9 +21,9 @@
package org.onap.vid.properties;
import org.apache.commons.lang3.StringUtils;
-import org.onap.vid.model.ModelConstants;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.model.ModelConstants;
/**
* The Class VidProperties.
*/
@@ -36,6 +36,7 @@ public class VidProperties extends SystemProperties {
public static final String MSO_MAX_OPENED_INSTANTIATION_REQUESTS="mso.maxOpenedInstantiationRequests";
public static final String MSO_ASYNC_POLLING_INTERVAL_SECONDS="mso.asyncPollingIntervalSeconds";
public static final String PROBE_SDC_MODEL_UUID="probe.sdc.model.uuid";
+ public static final String PORTAL_APP_PASSWORD_ENVIRONMENT_VARIABLE_NAME="VID_PORTAL_APP_PASSWORD";
/** The Constant VID_TRUSTSTORE_FILENAME. */
public static final String VID_TRUSTSTORE_FILENAME = "vid.truststore.filename";
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/guilin.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/guilin.features.properties
index f86dd970a..e842256f8 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/guilin.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/guilin.features.properties
@@ -40,3 +40,5 @@ FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE=true
FLAG_2004_INSTANTIATION_STATUS_FILTER=true
FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF=true
+FLAG_GUILIN_CONFIG_PORTAL_APP_PASSWORD = true
+
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/WebConfigTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/WebConfigTest.java
new file mode 100644
index 000000000..82b7682d3
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/WebConfigTest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.controller;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.Mockito.when;
+import static org.onap.vid.testUtils.TestUtils.setStringsInStringFields;
+
+import javax.inject.Inject;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.portalsdk.core.domain.App;
+import org.onap.portalsdk.core.service.DataAccessService;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.config.DataSourceConfig;
+import org.onap.vid.properties.Features;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.togglz.core.manager.FeatureManager;
+
+@ContextConfiguration(classes = {DataSourceConfig.class, SystemProperties.class})
+public class WebConfigTest extends AbstractTestNGSpringContextTests {
+
+ @Inject private DataAccessService dataAccessService;
+ @Mock FeatureManager featureManager;
+ @InjectMocks WebConfig webConfig;
+
+ @BeforeMethod
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ webConfig.dataAccessService = dataAccessService;
+
+ // set default app values
+ App defaultApp = setStringsInStringFields(new App());
+ defaultApp.setId(1L);
+ dataAccessService.saveDomainObject(defaultApp, null);
+
+ // enable feature
+ when(featureManager.isActive(Features.FLAG_GUILIN_CONFIG_PORTAL_APP_PASSWORD)).thenReturn(true);
+ }
+
+ @Test
+ public void persistPortalAppPassword_givenFlagAndValue_thenValueIsPersisted() {
+ assertThat(setAndGetPortalAppPassword("fresh password"),
+ equalTo("fresh password"));
+ }
+
+ @Test
+ public void persistPortalAppPassword_givenEmptyValue_thenDbValueUnchanged() {
+ assertThat(setAndGetPortalAppPassword(""),
+ equalTo("appPassword"));
+ }
+
+ @Test
+ public void persistPortalAppPassword_givenNullValue_thenDbValueUnchanged() {
+ assertThat(setAndGetPortalAppPassword(null),
+ equalTo("appPassword"));
+ }
+
+ public String setAndGetPortalAppPassword(String password) {
+ webConfig.portalAppPassword = password;
+
+ webConfig.persistPortalAppPassword();
+ return appDomainPasswordFromDB();
+ }
+
+ private String appDomainPasswordFromDB() {
+ return ((App) dataAccessService.getDomainObject(App.class, 1L, null))
+ .getAppPassword();
+ }
+} \ No newline at end of file