# Basic Authentication
basicAuth.username=admin
-basicAuth.password=admin
+basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
# A&AI Enircher REST Client Configuration
enricher.url=https://d2enrichment:9505
enricher.connectionTimeout=5000
enricher.readTimeout=60000
enricher.keyStorePath=config/auth/enricher-client-cert.p12
-enricher.keyStorePassword=aaiDomain2
+enricher.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
enricher.types = vserver, l3-network
enricher.type.vserver.url = /enricher/v11/cloud-infrastructure/vservers/vserver/{0}?sot=!aai
package org.onap.sdnc.apps.pomba.networkdiscovery;
import java.util.Base64;
+import org.eclipse.jetty.util.security.Password;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@Value("${basicAuth.username:admin}")
private String username;
- @Value("${basicAuth.password:admin}")
+ @Value("${basicAuth.password:OBF:1u2a1toa1w8v1tok1u30}")
private String password;
- @Bean(name="basicAuthHeader")
- public String getBasicAuthHeader() {
- return "Basic " + Base64.getEncoder().encodeToString((this.username + ":" + this.password).getBytes());
+ @Bean(name="networkDiscoveryBasicAuthHeader")
+ public String getNdBasicAuthHeader() {
+ String auth = new String(this.username + ":" + Password.deobfuscate(this.password));
+ return "Basic " + Base64.getEncoder().encodeToString(auth.getBytes());
}
-
-
}
@Value("${enricher.keyStorePath}")
private String keyStorePath;
- @Value("${enricher.keyStorePassword}")
+ @Value("${enricher.keyStorePassword:OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o}")
private String keyStorePassword;
@Value("${enricher.connectionTimeout:5000}")
.connectTimeoutMs(this.connectionTimeout)
.readTimeoutMs(this.readTimeout)
.clientCertFile(this.keyStorePath)
- .clientCertPassword(this.keyStorePassword);
+ .clientCertPassword(
+ org.eclipse.jetty.util.security.Password.deobfuscate(this.keyStorePassword));
}
@Bean(name="enricherBaseUrl")
@Autowired
private SpringService service;
- @Resource(name="basicAuthHeader")
- private String basicAuthHeader;
+ @Resource(name="networkDiscoveryBasicAuthHeader")
+ private String networkDiscoveryBasicAuthHeader;
@Override
public Response findbyResourceIdAndType(HttpServletRequest request,
version = "v1";
}
- if (authorization == null || !this.basicAuthHeader.equals(authorization)) {
+ if (authorization == null || !this.networkDiscoveryBasicAuthHeader.equals(authorization)) {
throw new ApplicationException(UNAUTHORIZED, Status.UNAUTHORIZED);
}
if ((fromAppId == null) || fromAppId.trim().isEmpty()) {
--- /dev/null
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * 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.sdnc.apps.pomba.networkdiscovery.unittest.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.onap.sdnc.apps.pomba.networkdiscovery.AuthorizationConfiguration;
+
+public class AuthorizationConfigurationTest
+{
+ AuthorizationConfiguration authorizationConfiguration =
+ mock(AuthorizationConfiguration.class);
+
+ @Test
+ public void testGetNdBasicAuthHeader() {
+ String msg = "Basic YWRtaW46YWRtaW4=";
+ when(authorizationConfiguration.getNdBasicAuthHeader()).thenReturn(msg);
+ assertEquals(msg, authorizationConfiguration.getNdBasicAuthHeader());
+ }
+}
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.eclipse.jetty.util.security.Password;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@TestPropertySource(properties = {
"enricher.url=http://localhost:9505",
"basicAuth.username=admin",
- "basicAuth.password=admin"
+ "basicAuth.password=OBF:1u2a1toa1w8v1tok1u30"
})
public class NetworkDiscoveryTest {
private static final String V1 = "v1";
private static final String RESOURCE_TYPE_VSERVER = "vserver";
private static final String CALLBACK_PATH = "/callback";
- private static final String AUTH = "Basic " + Base64.getEncoder().encodeToString("admin:admin".getBytes());
+ private static final String AUTH = "Basic " + Base64.getEncoder().encodeToString((
+ "admin:" + Password.deobfuscate("OBF:1u2a1toa1w8v1tok1u30")).getBytes());
@Autowired
private Environment environment;
server.tomcat.max-idle-time=60000
basicAuth.username=admin
-basicAuth.password=admin
+basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
# AAI REST Client Configuration
aai.host=135.63.125.59
package org.onap.sdnc.apps.pomba.servicedecomposition;
import java.util.Base64;
+import org.eclipse.jetty.util.security.Password;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@Value("${basicAuth.username:admin}")
private String username;
- @Value("${basicAuth.password:admin}")
+ @Value("${basicAuth.password:OBF:1u2a1toa1w8v1tok1u30}")
private String password;
- @Bean(name="basicAuthHeader")
- public String getBasicAuthHeader() {
- return "Basic " + Base64.getEncoder().encodeToString((this.username + ":" + this.password).getBytes());
+ @Bean(name="serviceDecompositionBasicAuthHeader")
+ public String getSdBasicAuthHeader() {
+ String auth = new String(this.username + ":" + Password.deobfuscate(this.password));
+ return "Basic " + Base64.getEncoder().encodeToString(auth.getBytes());
}
-
-
}
@Autowired
private SpringService service;
- @Resource(name="basicAuthHeader")
- private String basicAuthHeader;
+ @Resource(name="serviceDecompositionBasicAuthHeader")
+ private String serviceDecompositionBasicAuthHeader;
public RestServiceImpl() {}
adapter.getServiceDescriptor().setServiceName(SERVICE_NAME);
adapter.entering(request);
try {
- if (authorization == null || !this.basicAuthHeader.equals(authorization)) {
+ if (authorization == null || !this.serviceDecompositionBasicAuthHeader.equals(authorization)) {
throw new DiscoveryException(UNAUTHORIZED, Status.UNAUTHORIZED);
}
--- /dev/null
+/*
+ * ============LICENSE_START===================================================
+ * Copyright (c) 2018 Amdocs
+ * ============================================================================
+ * 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.sdnc.apps.pomba.servicedecomposition.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.onap.sdnc.apps.pomba.servicedecomposition.AuthorizationConfiguration;
+
+public class AuthorizationConfigurationTest
+{
+ AuthorizationConfiguration authorizationConfiguration =
+ mock(AuthorizationConfiguration.class);
+
+ @Test
+ public void testGetSdBasicAuthHeader() {
+ String msg = "Basic YWRtaW46YWRtaW4=";
+ when(authorizationConfiguration.getSdBasicAuthHeader()).thenReturn(msg);
+ assertEquals(msg, authorizationConfiguration.getSdBasicAuthHeader());
+ }
+}
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.eclipse.jetty.util.security.Password;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Rule;
"aai.host=localhost",
"aai.port=8081",
"basicAuth.username=admin",
- "basicAuth.password=admin"
+ "basicAuth.password=OBF:1u2a1toa1w8v1tok1u30"
})
public class ServiceDecompositionTest {
- private static final String AUTH = "Basic " + Base64.getEncoder().encodeToString("admin:admin".getBytes());
+ private static final String AUTH = "Basic " + Base64.getEncoder().encodeToString((
+ "admin:" + Password.deobfuscate("OBF:1u2a1toa1w8v1tok1u30")).getBytes());
// TODO missing code coverage for VNFC resources
Code Review / sdnc / apps.git / commitdiff