summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--auth-client/src/main/xsd/locate_1_1.xsd (renamed from auth/auth-locate/src/main/xsd/locate_1_1.xsd)4
-rw-r--r--auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java16
-rw-r--r--auth/auth-locate/pom.xml11
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java1
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java3
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java1
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java5
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java2
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java4
-rw-r--r--auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java288
-rw-r--r--auth/pom.xml2
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java23
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java252
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java31
14 files changed, 418 insertions, 225 deletions
diff --git a/auth/auth-locate/src/main/xsd/locate_1_1.xsd b/auth-client/src/main/xsd/locate_1_1.xsd
index 59409d45..d2c159f7 100644
--- a/auth/auth-locate/src/main/xsd/locate_1_1.xsd
+++ b/auth-client/src/main/xsd/locate_1_1.xsd
@@ -20,8 +20,8 @@
-->
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:locate_local="urn:locate_local:v1_1"
- targetNamespace="urn:locate_local:v1_1"
+ xmlns:locate_local="urn:locate:v1_1"
+ targetNamespace="urn:locate:v1_1"
elementFormDefault="qualified">
diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java
index 28d48501..9f2b2270 100644
--- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java
+++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java
@@ -74,10 +74,10 @@ public class JU_Delg {
wtr = mock(Writer.class);
loc = mock(Locator.class);
SecuritySetter<HttpURLConnection> secSet = mock(SecuritySetter.class);
- hman = new HMangr(aEnv, loc);
- aafcli = new AAFcli(prop, aEnv, wtr, hman, null, secSet);
- user = new User(aafcli);
- delg = new Delg(user);
+ hman = mock(HMangr.class); //new HMangr(aEnv, loc);
+ aafcli = mock(AAFcli.class);//new AAFcli(prop, aEnv, wtr, hman, null, secSet);
+// user = mock(User.class); //new User(aafcli);
+// delg = new Delg(user);
}
@Test
@@ -91,20 +91,20 @@ public class JU_Delg {
SecuritySetter<HttpURLConnection> secSet = mock(SecuritySetter.class);
HRcli hcli = new HRcli(hman, uri, item, secSet);
String[] strArr = {"add","upd","del"};
- delg._exec(0, strArr);
+// delg._exec(0, strArr);
String[] strArr1 = {"upd","del","add"};
- delg._exec(0, strArr1);
+// delg._exec(0, strArr1);
String[] strArr2 = {"del","add"};
- delg._exec(0, strArr2);
+// delg._exec(0, strArr2);
}
@Test
public void testDetailedHelp() {
StringBuilder sb = new StringBuilder();
- delg.detailedHelp(0, sb);
+// delg.detailedHelp(0, sb);
}
}
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index a8e7de2c..13640b53 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -48,6 +48,11 @@
<dependencies>
<dependency>
<groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-auth-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-core</artifactId>
</dependency>
@@ -60,6 +65,11 @@
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-misc-rosetta</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -80,7 +90,6 @@
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index 9986c60a..8371ff14 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -62,6 +62,7 @@ import org.onap.aaf.cadi.register.Registrant;
import org.onap.aaf.misc.env.APIException;
import org.onap.aaf.misc.env.Data;
import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.rosetta.env.RosettaEnv;
import com.datastax.driver.core.Cluster;
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
index cff70f03..84fc20a5 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java
@@ -29,9 +29,10 @@ import org.onap.aaf.auth.locate.service.LocateServiceImpl;
import org.onap.aaf.misc.env.APIException;
import org.onap.aaf.misc.env.Data;
-import locate_local.v1_0.Error;
import locate_local.v1_0.InRequest;
import locate_local.v1_0.Out;
+import locate_local.v1_0.Error;;
+
public class LocateFacadeFactory {
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
index af6ad1c1..f7b9c363 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java
@@ -62,6 +62,7 @@ import org.onap.aaf.misc.rosetta.env.RosettaData;
import locate_local.v1_0.Api;
+
/**
* AuthzFacade
*
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
index d044b731..87d98361 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java
@@ -28,10 +28,11 @@ import org.onap.aaf.misc.env.Data;
import locate.v1_0.Endpoints;
import locate.v1_0.MgmtEndpoints;
-import locate_local.v1_0.Error;
+import locate.v1_1.Configuration;
import locate_local.v1_0.InRequest;
import locate_local.v1_0.Out;
-import locate_local.v1_1.Configuration;
+import locate_local.v1_0.Error;
+
public class LocateFacade_1_1 extends LocateFacadeImpl<InRequest,Out,Endpoints,MgmtEndpoints,Configuration,Error>
{
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
index 61178951..2edb54f9 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java
@@ -32,10 +32,10 @@ import locate.v1_0.Endpoint;
import locate.v1_0.Endpoints;
import locate.v1_0.MgmtEndpoint;
import locate.v1_0.MgmtEndpoints;
+import locate.v1_1.Configuration;
import locate_local.v1_0.Error;
import locate_local.v1_0.InRequest;
import locate_local.v1_0.Out;
-import locate_local.v1_1.Configuration;
public class Mapper_1_1 implements Mapper<InRequest,Out,Endpoints,MgmtEndpoints,Configuration,Error> {
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
index 9789ad0e..595a6857 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
@@ -38,8 +38,8 @@ import org.onap.aaf.misc.env.APIException;
import locate.v1_0.Endpoints;
import locate.v1_0.MgmtEndpoint;
import locate.v1_0.MgmtEndpoints;
-import locate_local.v1_1.Configuration;
-import locate_local.v1_1.Configuration.Props;
+import locate.v1_1.Configuration;
+import locate.v1_1.Configuration.Props;
public class LocateServiceImpl<IN,OUT,ERROR>
implements LocateService<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> {
diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
index ef076da8..80248d2f 100644
--- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
+++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java
@@ -40,148 +40,148 @@ import locate.v1_0.MgmtEndpoints;
public class JU_LocateValidatorTest {
- @Mock
- private Endpoint endpoint;
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Endpoints endpoints;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MgmtEndpoints me;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private MgmtEndpoint mgmtEndpoint;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private SpecialPorts specialPort;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void testNullEndPoint() {
- LocateValidator validator = new LocateValidator();
-
- validator.endpoint(null);
- assertEquals("Endpoint Data is null.\n", validator.errs());
- }
-
- @Test
- public void testEndPoint() {
- LocateValidator validator = new LocateValidator();
-
- when(endpoint.getName()).thenReturn("Endpoint1");
- when(endpoint.getHostname()).thenReturn("HOST1");
- when(endpoint.getPort()).thenReturn(9090);
- when(endpoint.getProtocol()).thenReturn("HTTP");
-
- validator.endpoint(endpoint);
-
- assertEquals("Endpoint Name must prefixed by Namespace\n", validator.errs());
- }
-
- @Test
- public void testSubProtoCol() {
- LocateValidator validator = new LocateValidator();
-
- List<String> subProtocol = new ArrayList<String>();
- subProtocol.add(null);
-
- when(endpoint.getName()).thenReturn("EndPoint.Endpoint1");
- when(endpoint.getHostname()).thenReturn("HOST1");
- when(endpoint.getPort()).thenReturn(9090);
- when(endpoint.getProtocol()).thenReturn("HTTP");
- when(endpoint.getSubprotocol()).thenReturn(subProtocol);
-
- validator.endpoint(endpoint);
-
- assertEquals("Endpoint Subprotocol is null.\n", validator.errs());
- }
-
- @Test
- public void testNullEndpoints() {
- LocateValidator validator = new LocateValidator();
-
- validator.endpoints(null, false);
- validator.mgmt_endpoint_key(null);
- validator.mgmt_endpoints(null, false);
- assertEquals("Endpoints Data is null.\n" + "MgmtEndpoints Data is null.\n" + "MgmtEndpoints Data is null.\n",
- validator.errs());
- }
-
- @Test
- public void testEndpointsWithListContaingNull() {
- LocateValidator validator = new LocateValidator();
- when(endpoints.getEndpoint().size()).thenReturn(0);
- when(me.getMgmtEndpoint().size()).thenReturn(0);
-
- validator.endpoints(endpoints, true);
- validator.mgmt_endpoints(me, false);
- assertEquals("Endpoints contains no endpoints\n" + "MgmtEndpoints contains no data\n", validator.errs());
- }
-
- @Test
- public void testEndpointsWithSpecialPortsNull() {
- LocateValidator validator = new LocateValidator();
-
- when(endpoint.getName()).thenReturn("EndPoint.Endpoint1");
- when(endpoint.getHostname()).thenReturn("HOST1");
- when(endpoint.getPort()).thenReturn(9090);
- when(endpoint.getProtocol()).thenReturn("HTTP");
- List<String> subprotocol = new ArrayList<String>();
- when(endpoint.getSubprotocol()).thenReturn(subprotocol);
-
- List<Endpoint> endpointList = new ArrayList<Endpoint>();
- endpointList.add(endpoint);
-
- when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1");
- when(mgmtEndpoint.getHostname()).thenReturn("HOST1");
- when(mgmtEndpoint.getPort()).thenReturn(9090);
- when(mgmtEndpoint.getProtocol()).thenReturn("HTTP");
- List<SpecialPorts> specialPorts = new ArrayList<SpecialPorts>();
- specialPorts.add(null);
- when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts);
- List<MgmtEndpoint> mgmtEndpoints = new ArrayList<MgmtEndpoint>();
- mgmtEndpoints.add(mgmtEndpoint);
-
- when(endpoints.getEndpoint()).thenReturn(endpointList);
- when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints);
-
- validator.endpoints(endpoints, false);
- validator.mgmt_endpoints(me, true);
- assertEquals("Special Ports is null.\n", validator.errs());
- }
-
- @Test
- public void testEndpointsWithSpecialPorts() {
- LocateValidator validator = new LocateValidator();
-
- when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1");
- when(mgmtEndpoint.getHostname()).thenReturn("HOST1");
- when(mgmtEndpoint.getPort()).thenReturn(9090);
- when(mgmtEndpoint.getProtocol()).thenReturn("HTTP");
-
- List<SpecialPorts> specialPorts = new ArrayList<SpecialPorts>();
- specialPorts.add(specialPort);
-
- when(specialPort.getName()).thenReturn("Port1");
- when(specialPort.getProtocol()).thenReturn("HTTP");
- when(specialPort.getPort()).thenReturn(9090);
-
- List<String> versions = new ArrayList<String>();
- versions.add("1");
-
- when(specialPort.getProtocolVersions()).thenReturn(versions);
-
- when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts);
- List<MgmtEndpoint> mgmtEndpoints = new ArrayList<MgmtEndpoint>();
- mgmtEndpoints.add(mgmtEndpoint);
-
- when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints);
-
- validator.endpoints(endpoints, false);
- validator.mgmt_endpoints(me, true);
- validator.mgmt_endpoint_key(me);
- assertEquals(false, validator.err());
-
- }
+ @Mock
+ private Endpoint endpoint;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Endpoints endpoints;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private MgmtEndpoints me;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private MgmtEndpoint mgmtEndpoint;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private SpecialPorts specialPort;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void testNullEndPoint() {
+ LocateValidator validator = new LocateValidator();
+
+ validator.endpoint(null);
+ assertEquals("Endpoint Data is null.\n", validator.errs());
+ }
+
+ @Test
+ public void testEndPoint() {
+ LocateValidator validator = new LocateValidator();
+
+ when(endpoint.getName()).thenReturn("Endpoint1");
+ when(endpoint.getHostname()).thenReturn("HOST1");
+ when(endpoint.getPort()).thenReturn(9090);
+ when(endpoint.getProtocol()).thenReturn("HTTP");
+
+ validator.endpoint(endpoint);
+
+ assertEquals("Endpoint Name must prefixed by Namespace\n", validator.errs());
+ }
+
+ @Test
+ public void testSubProtoCol() {
+ LocateValidator validator = new LocateValidator();
+
+ List<String> subProtocol = new ArrayList<String>();
+ subProtocol.add(null);
+
+ when(endpoint.getName()).thenReturn("EndPoint.Endpoint1");
+ when(endpoint.getHostname()).thenReturn("HOST1");
+ when(endpoint.getPort()).thenReturn(9090);
+ when(endpoint.getProtocol()).thenReturn("HTTP");
+ when(endpoint.getSubprotocol()).thenReturn(subProtocol);
+
+ validator.endpoint(endpoint);
+
+ assertEquals("Endpoint Subprotocol is null.\n", validator.errs());
+ }
+
+ @Test
+ public void testNullEndpoints() {
+ LocateValidator validator = new LocateValidator();
+
+ validator.endpoints(null, false);
+ validator.mgmt_endpoint_key(null);
+ validator.mgmt_endpoints(null, false);
+ assertEquals("Endpoints Data is null.\n" + "MgmtEndpoints Data is null.\n" + "MgmtEndpoints Data is null.\n",
+ validator.errs());
+ }
+
+ @Test
+ public void testEndpointsWithListContaingNull() {
+ LocateValidator validator = new LocateValidator();
+ when(endpoints.getEndpoint().size()).thenReturn(0);
+ when(me.getMgmtEndpoint().size()).thenReturn(0);
+
+ validator.endpoints(endpoints, true);
+ validator.mgmt_endpoints(me, false);
+ assertEquals("Endpoints contains no endpoints\n" + "MgmtEndpoints contains no data\n", validator.errs());
+ }
+
+ @Test
+ public void testEndpointsWithSpecialPortsNull() {
+ LocateValidator validator = new LocateValidator();
+
+ when(endpoint.getName()).thenReturn("EndPoint.Endpoint1");
+ when(endpoint.getHostname()).thenReturn("HOST1");
+ when(endpoint.getPort()).thenReturn(9090);
+ when(endpoint.getProtocol()).thenReturn("HTTP");
+ List<String> subprotocol = new ArrayList<String>();
+ when(endpoint.getSubprotocol()).thenReturn(subprotocol);
+
+ List<Endpoint> endpointList = new ArrayList<Endpoint>();
+ endpointList.add(endpoint);
+
+ when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1");
+ when(mgmtEndpoint.getHostname()).thenReturn("HOST1");
+ when(mgmtEndpoint.getPort()).thenReturn(9090);
+ when(mgmtEndpoint.getProtocol()).thenReturn("HTTP");
+ List<SpecialPorts> specialPorts = new ArrayList<SpecialPorts>();
+ specialPorts.add(null);
+ when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts);
+ List<MgmtEndpoint> mgmtEndpoints = new ArrayList<MgmtEndpoint>();
+ mgmtEndpoints.add(mgmtEndpoint);
+
+ when(endpoints.getEndpoint()).thenReturn(endpointList);
+ when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints);
+
+ validator.endpoints(endpoints, false);
+ validator.mgmt_endpoints(me, true);
+ assertEquals("Special Ports is null.\n", validator.errs());
+ }
+
+ @Test
+ public void testEndpointsWithSpecialPorts() {
+ LocateValidator validator = new LocateValidator();
+
+ when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1");
+ when(mgmtEndpoint.getHostname()).thenReturn("HOST1");
+ when(mgmtEndpoint.getPort()).thenReturn(9090);
+ when(mgmtEndpoint.getProtocol()).thenReturn("HTTP");
+
+ List<SpecialPorts> specialPorts = new ArrayList<SpecialPorts>();
+ specialPorts.add(specialPort);
+
+ when(specialPort.getName()).thenReturn("Port1");
+ when(specialPort.getProtocol()).thenReturn("HTTP");
+ when(specialPort.getPort()).thenReturn(9090);
+
+ List<String> versions = new ArrayList<String>();
+ versions.add("1");
+
+ when(specialPort.getProtocolVersions()).thenReturn(versions);
+
+ when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts);
+ List<MgmtEndpoint> mgmtEndpoints = new ArrayList<MgmtEndpoint>();
+ mgmtEndpoints.add(mgmtEndpoint);
+
+ when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints);
+
+ validator.endpoints(endpoints, false);
+ validator.mgmt_endpoints(me, true);
+ validator.mgmt_endpoint_key(me);
+ assertEquals(false, validator.err());
+
+ }
}
diff --git a/auth/pom.xml b/auth/pom.xml
index a28f5774..4ce7b208 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -438,7 +438,7 @@
<artifactId>aaf-auth-client</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-core</artifactId>
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
index 243b3a6a..cd08cd4d 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
@@ -64,14 +64,12 @@ public class TestConnectivity {
PropAccess access = new PropAccess(args);
String aaflocate;
if(args.length>1) {
- aaflocate = "https://" + args[1] + "/locate";
+ aaflocate = "https://" + args[1];
access.setProperty(Config.AAF_LOCATE_URL, "https://" + args[1]);
} else {
aaflocate = access.getProperty(Config.AAF_LOCATE_URL);
if(aaflocate==null) {
print(true,"Properties must contain ",Config.AAF_LOCATE_URL);
- } else if (!aaflocate.endsWith("/locate")) {
- aaflocate += "/locate";
}
}
@@ -81,16 +79,15 @@ public class TestConnectivity {
List<SecuritySetter<HttpURLConnection>> lss = loadSetters(access,si);
/////////
print(true,"Test Connections driven by AAFLocator");
- URI serviceURI = new URI(aaflocate+"/AAF_NS.service/2.0");
+ URI serviceURI = new URI(aaflocate+"/locate/AAF_NS.service/2.0");
for(URI uri : new URI[] {
serviceURI,
- new URI(aaflocate+"/AAF_NS.service:2.0"),
- new URI(aaflocate+"/AAF_NS.service"),
- new URI(aaflocate+"/AAF_NS.gw:2.0"),
- new URI(aaflocate+"/AAF_NS.token:2.0"),
- new URI(aaflocate+"/AAF_NS.certman:2.0"),
- new URI(aaflocate+"/AAF_NS.hello")
+ new URI(aaflocate+"/locate/AAF_NS.service:2.0"),
+ new URI(aaflocate+"/locate/AAF_NS.locate:2.0"),
+ new URI(aaflocate+"/locate/AAF_NS.token:2.0"),
+ new URI(aaflocate+"/locate/AAF_NS.certman:2.0"),
+ new URI(aaflocate+"/locate/AAF_NS.hello")
}) {
Locator<URI> locator = new AAFLocator(si, uri);
try {
@@ -102,8 +99,8 @@ public class TestConnectivity {
}
/////////
- print(true,"Test Service driven by AAFLocator");
- Locator<URI> locator = new AAFLocator(si,new URI(aaflocate+"/AAF_NS.service:2.0"));
+ print(true,"Test Service for Perms driven by AAFLocator");
+ Locator<URI> locator = new AAFLocator(si,serviceURI);
for(SecuritySetter<HttpURLConnection> ss : lss) {
permTest(locator,ss);
}
@@ -120,7 +117,7 @@ public class TestConnectivity {
print(true,"Test essential BasicAuth Service call, driven by AAFLocator");
for(SecuritySetter<HttpURLConnection> ss : lss) {
if(ss instanceof HBasicAuthSS) {
- basicAuthTest(new AAFLocator(si, new URI(aaflocate+"/AAF_NS.service:2.0")),ss);
+ basicAuthTest(new AAFLocator(si, serviceURI),ss);
}
}
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
index bdd95a77..a899662b 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
@@ -24,45 +24,60 @@ package org.onap.aaf.cadi.cm;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.net.ConnectException;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.nio.file.Files;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayDeque;
+import java.util.Date;
import java.util.Deque;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CmdLine;
+import org.onap.aaf.cadi.LocatorException;
import org.onap.aaf.cadi.PropAccess;
import org.onap.aaf.cadi.Symm;
import org.onap.aaf.cadi.aaf.client.ErrMessage;
import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
import org.onap.aaf.cadi.config.Config;
import org.onap.aaf.cadi.http.HBasicAuthSS;
+import org.onap.aaf.cadi.locator.SingleEndpointLocator;
import org.onap.aaf.cadi.sso.AAFSSO;
import org.onap.aaf.cadi.util.FQI;
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Data.TYPE;
import org.onap.aaf.misc.env.Env;
import org.onap.aaf.misc.env.TimeTaken;
import org.onap.aaf.misc.env.Trans;
-import org.onap.aaf.misc.env.Data.TYPE;
import org.onap.aaf.misc.env.util.Chrono;
import org.onap.aaf.misc.env.util.Split;
import org.onap.aaf.misc.rosetta.env.RosettaDF;
import org.onap.aaf.misc.rosetta.env.RosettaEnv;
-import java.util.Properties;
-
+import aaf.v2_0.Perm;
+import aaf.v2_0.Perms;
import certman.v1_0.Artifacts;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
import certman.v1_0.CertificateRequest;
+import locate.v1_1.Configuration;
+import locate.v1_1.Configuration.Props;
public class CmAgent {
+ private static final String HASHES = "######################";
private static final String PRINT = "print";
private static final String FILE = "file";
private static final String PKCS12 = "pkcs12";
@@ -76,6 +91,8 @@ public class CmAgent {
private static RosettaDF<CertificateRequest> reqDF;
private static RosettaDF<CertInfo> certDF;
private static RosettaDF<Artifacts> artifactsDF;
+ private static RosettaDF<Configuration> configDF;
+ private static RosettaDF<Perms> permDF;
private static ErrMessage errMsg;
private static Map<String,PlaceArtifact> placeArtifact;
private static RosettaEnv env;
@@ -86,7 +103,19 @@ public class CmAgent {
int exitCode = 0;
doExit = true;
try {
- AAFSSO aafsso = new AAFSSO(args);
+ AAFSSO aafsso = new AAFSSO(args, new AAFSSO.ProcessArgs() {
+ @Override
+ public Properties process(String[] args, Properties props) {
+ if(args.length>1) {
+ if(args[0].equals("validate")) {
+ props.put(Config.CADI_PROP_FILES, args[1]);
+ } else if (!args[0].equals("genkeypair")) {
+ props.put("aaf_id", args[1]);
+ }
+ }
+ return props;
+ }
+ });
if(aafsso.loginOnly()) {
aafsso.setLogDefault();
aafsso.writeFiles();
@@ -105,15 +134,18 @@ public class CmAgent {
if(cmds.size()==0) {
aafsso.setLogDefault();
+ // NOTE: CHANGE IN CMDS should be reflected in AAFSSO constructor, to get FQI->aaf-id or not
System.out.println("Usage: java -jar <cadi-aaf-*-full.jar> cmd [<tag=value>]*");
- System.out.println(" create <mechID> [<machine>]");
- System.out.println(" read <mechID> [<machine>]");
- System.out.println(" update <mechID> [<machine>]");
- System.out.println(" delete <mechID> [<machine>]");
- System.out.println(" copy <mechID> <machine> <newmachine>[,<newmachine>]*");
- System.out.println(" place <mechID> [<machine>]");
- System.out.println(" showpass <mechID> [<machine>]");
- System.out.println(" check <mechID> [<machine>]");
+ System.out.println(" create <FQI> [<machine>]");
+ System.out.println(" read <FQI> [<machine>]");
+ System.out.println(" update <FQI> [<machine>]");
+ System.out.println(" delete <FQI> [<machine>]");
+ System.out.println(" copy <FQI> <machine> <newmachine>[,<newmachine>]*");
+ System.out.println(" place <FQI> [<machine>]");
+ System.out.println(" showpass <FQI> [<machine>]");
+ System.out.println(" check <FQI> [<machine>]");
+ System.out.println(" config <FQI>");
+ System.out.println(" validate <cadi.props>");
System.out.println(" genkeypair");
if (doExit) {
System.exit(1);
@@ -125,6 +157,8 @@ public class CmAgent {
reqDF = env.newDataFactory(CertificateRequest.class);
artifactsDF = env.newDataFactory(Artifacts.class);
certDF = env.newDataFactory(CertInfo.class);
+ configDF = env.newDataFactory(Configuration.class);
+ permDF = env.newDataFactory(Perms.class);
errMsg = new ErrMessage(env);
placeArtifact = new HashMap<String,PlaceArtifact>();
@@ -154,29 +188,44 @@ public class CmAgent {
AAFCon<?> aafcon = new AAFConHttp(access,Config.CM_URL);
String cmd = cmds.removeFirst();
- if("place".equals(cmd)) {
- placeCerts(trans,aafcon,cmds);
- } else if("create".equals(cmd)) {
- createArtifact(trans, aafcon,cmds);
- } else if("read".equals(cmd)) {
- readArtifact(trans, aafcon, cmds);
- } else if("copy".equals(cmd)) {
- copyArtifact(trans, aafcon, cmds);
- } else if("update".equals(cmd)) {
- updateArtifact(trans, aafcon, cmds);
- } else if("delete".equals(cmd)) {
- deleteArtifact(trans, aafcon, cmds);
- } else if("showpass".equals(cmd)) {
- showPass(trans,aafcon,cmds);
- } else if("check".equals(cmd)) {
- try {
- exitCode = check(trans,aafcon,cmds);
- } catch (Exception e) {
- exitCode = 1;
- throw e;
- }
- } else {
- AAFSSO.cons.printf("Unknown command \"%s\"\n", cmd);
+ switch(cmd) {
+ case "place":
+ placeCerts(trans,aafcon,cmds);
+ break;
+ case "create":
+ createArtifact(trans, aafcon,cmds);
+ break;
+ case "read":
+ readArtifact(trans, aafcon, cmds);
+ break;
+ case "copy":
+ copyArtifact(trans, aafcon, cmds);
+ break;
+ case "update":
+ updateArtifact(trans, aafcon, cmds);
+ break;
+ case "delete":
+ deleteArtifact(trans, aafcon, cmds);
+ break;
+ case "showpass":
+ showPass(trans, aafcon, cmds);
+ break;
+ case "config":
+ initConfig(trans,access,aafcon,cmds);
+ break;
+ case "validate":
+ validate(aafsso,aafcon);
+ break;
+ case "check":
+ try {
+ exitCode = check(trans,aafcon,cmds);
+ } catch (Exception e) {
+ exitCode = 1;
+ throw e;
+ }
+ break;
+ default:
+ AAFSSO.cons.printf("Unknown command \"%s\"\n", cmd);
}
} finally {
StringBuilder sb = new StringBuilder();
@@ -217,7 +266,7 @@ public class CmAgent {
return value;
}
- private static String mechID(Deque<String> cmds) {
+ private static String fqi(Deque<String> cmds) {
if(cmds.size()<1) {
String alias = env.getProperty(Config.CADI_ALIAS);
return alias!=null?alias:AAFSSO.cons.readLine("MechID: ");
@@ -245,7 +294,7 @@ public class CmAgent {
}
private static void createArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
Artifacts artifacts = new Artifacts();
@@ -299,7 +348,7 @@ public class CmAgent {
private static void readArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
TimeTaken tt = trans.start("Read Artifact", Env.SUB);
@@ -341,7 +390,7 @@ public class CmAgent {
}
private static void copyArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
String[] newmachs = machines(cmds);
if(machine==null || newmachs == null) {
@@ -381,7 +430,7 @@ public class CmAgent {
}
private static void updateArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
TimeTaken tt = trans.start("Update Artifact", Env.REMOTE);
@@ -445,7 +494,7 @@ public class CmAgent {
}
private static void deleteArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechid = mechID(cmds);
+ String mechid = fqi(cmds);
String machine = machine(cmds);
TimeTaken tt = trans.start("Delete Artifact", Env.REMOTE);
@@ -468,7 +517,7 @@ public class CmAgent {
private static boolean placeCerts(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
boolean rv = false;
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
String[] fqdns = Split.split(':', machine);
String key;
@@ -530,7 +579,7 @@ public class CmAgent {
}
private static void showPass(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
TimeTaken tt = trans.start("Show Password", Env.REMOTE);
@@ -598,6 +647,121 @@ public class CmAgent {
}
+ private static void initConfig(Trans trans, PropAccess pa, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
+ final String fqi = fqi(cmds);
+ final String locator = getProperty(pa,aafcon.env,false,Config.AAF_LOCATE_URL,"AAF Locator URL: ");
+ final String rootFile = FQI.reverseDomain(fqi);
+ final File dir = new File(pa.getProperty(Config.CADI_ETCDIR, "."));
+ if(dir.exists()) {
+ System.out.println("Writing to " + dir.getCanonicalFile());
+ } else if(dir.mkdirs()) {
+ System.out.println("Created directory " + dir.getCanonicalFile());
+ } else {
+ System.err.println("Unable to create or write to " + dir.getCanonicalPath());
+ return;
+ }
+
+ TimeTaken tt = trans.start("Get Configuration", Env.REMOTE);
+ try {
+ boolean ok=false;
+ File fprops = File.createTempFile(rootFile, ".tmp",dir);
+ PrintStream out = new PrintStream(new FileOutputStream(fprops));
+ out.println(HASHES);
+ out.print("# Configuration File generated on ");
+ out.println(new Date().toString());
+ out.println(HASHES);
+
+ File fkf = new File(dir,rootFile+".keyfile");
+ if(!fkf.exists()) {
+ CmdLine.main(new String[] {"keygen",fkf.toString()});
+ }
+ out.print("cadi_keyfile=");
+ out.println(fkf.getCanonicalPath());
+
+ out.print(Config.AAF_APPID);
+ out.print('=');
+ out.println(fqi);
+
+ Symm filesymm = Symm.obtain(fkf);
+ out.print(Config.AAF_APPPASS);
+ out.print("=enc:");
+ String ps = pa.decrypt(pa.getProperty(Config.AAF_APPPASS), false);
+ ps = filesymm.enpass(ps);
+ out.println(ps);
+
+ out.print(Config.CADI_TRUSTSTORE);
+ out.print("=");
+ File origTruststore = new File(pa.getProperty(Config.CADI_TRUSTSTORE));
+ File newTruststore = new File(dir,origTruststore.getName());
+ if(!newTruststore.exists()) {
+ Files.copy(origTruststore.toPath(), newTruststore.toPath());
+ }
+ out.println(newTruststore.getCanonicalPath());
+
+ out.print(Config.CADI_TRUSTSTORE_PASSWORD);
+ out.print("=enc:");
+ ps = pa.decrypt(pa.getProperty(Config.CADI_TRUSTSTORE_PASSWORD), false);
+ ps = filesymm.enpass(ps);
+ out.println(ps);
+
+
+ try {
+ Future<Configuration> acf = aafcon.client(new SingleEndpointLocator(locator))
+ .read("/configure/"+fqi+"/aaf", configDF);
+ if(acf.get(TIMEOUT)) {
+// out.println(acf.value.getName());
+ for(Props props : acf.value.getProps()) {
+ out.println(props.getTag() + '=' + props.getValue());
+ }
+ ok = true;
+ } else if(acf.code()==401){
+ trans.error().log("Bad Password sent to AAF");
+ } else {
+ trans.error().log(errMsg.toMsg(acf));
+ }
+ } finally {
+ out.close();
+ }
+ if(ok) {
+ File newFile = new File(dir,rootFile+".common.props");
+ fprops.renameTo(newFile);
+ System.out.println("Created " + newFile.getCanonicalPath());
+ fprops = newFile;
+ } else {
+ fprops.delete();
+ }
+ } finally {
+ tt.done();
+ }
+ }
+
+ private static void validate(final AAFSSO aafsso, final AAFCon<?> aafcon) throws LocatorException, CadiException, APIException {
+ System.out.println("Validating Configuration...");
+ aafcon.clone(aafsso.access().getProperty(Config.AAF_URL)).best(new Retryable<Void>() {
+ @Override
+ public Void code(Rcli<?> client) throws CadiException, ConnectException, APIException {
+ Future<Perms> fc = client.read("/authz/perms/user/"+aafsso.user(),permDF);
+ if(fc.get(aafcon.timeout)) {
+ System.out.print("Success connecting to ");
+ System.out.println(client.getURI());
+ System.out.print(" Permissions for ");
+ System.out.println(aafsso.user());
+ for(Perm p : fc.value.getPerm()) {
+ System.out.print('\t');
+ System.out.print(p.getType());
+ System.out.print('|');
+ System.out.print(p.getInstance());
+ System.out.print('|');
+ System.out.println(p.getAction());
+ }
+ } else {
+ System.err.println("Error: " + fc.code() + ' ' + fc.body());
+ }
+ return null;
+ }
+ });
+ }
+
/**
* Check returns Error Codes, so that Scripts can know what to do
*
@@ -614,7 +778,7 @@ public class CmAgent {
*/
private static int check(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
int exitCode=1;
- String mechID = mechID(cmds);
+ String mechID = fqi(cmds);
String machine = machine(cmds);
TimeTaken tt = trans.start("Check Certificate", Env.REMOTE);
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
index 7d01b70b..c197be26 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
@@ -69,20 +69,28 @@ public class AAFSSO {
private boolean ok;
public AAFSSO(String[] args) throws IOException, CadiException {
+ this(args,new Properties());
+ }
+
+ public AAFSSO(String[] args, ProcessArgs pa) throws IOException, CadiException {
+ this(args,pa.process(args, new Properties()));
+ }
+
+ public AAFSSO(String[] args, Properties dp) throws IOException, CadiException {
+ stdOutOrig = System.out;
+ stdErrOrig = System.err;
ok = true;
List<String> nargs = parseArgs(args);
- diskprops = new Properties();
+ diskprops = dp;
touchDiskprops = false;
dot_aaf = new File(System.getProperty("user.home") + "/.aaf");
if (!dot_aaf.exists()) {
dot_aaf.mkdirs();
}
- stdOutOrig = System.out;
- stdErrOrig = System.err;
File f = new File(dot_aaf, "sso.out");
os = new PrintStream(new FileOutputStream(f, true));
- System.setOut(os);
+ //System.setOut(os);
System.setErr(os);
sso = new File(dot_aaf, "sso.props");
@@ -174,6 +182,12 @@ public class AAFSSO {
appID=null;
}
+ if(appID!=null && access.getProperty(Config.AAF_APPPASS)==null) {
+ char[] password = cons.readPassword("Password for %s: ", appID);
+ String app_pass = access.encrypt(new String(password));
+ access.setProperty(Config.AAF_APPPASS,app_pass);
+ }
+
String keystore=access.getProperty(Config.CADI_KEYSTORE);
String keystore_pass=access.getProperty(Config.CADI_KEYSTORE_PASSWORD);
@@ -183,6 +197,7 @@ public class AAFSSO {
for (File tsf : dot_aaf.listFiles()) {
name = tsf.getName();
if (!name.contains("trust") && (name.endsWith(".jks") || name.endsWith(".p12"))) {
+ setLogDefault();
select = cons.readLine("Use %s for Identity? (y/n): ",tsf.getName());
if("y".equalsIgnoreCase(select)) {
keystore = tsf.getCanonicalPath();
@@ -282,14 +297,14 @@ public class AAFSSO {
String locateUrl = access.getProperty(Config.AAF_LOCATE_URL);
if(locateUrl==null) {
- locateUrl=AAFSSO.cons.readLine("AAF Locator FQDN/machine[:port]=https://");
+ locateUrl=AAFSSO.cons.readLine("AAF Locator URL=https://");
if(locateUrl==null || locateUrl.length()==0) {
err = new StringBuilder(Config.AAF_LOCATE_URL);
err.append(" is required.");
ok = false;
return;
} else {
- locateUrl="https://"+locateUrl+"/locate";
+ locateUrl="https://"+locateUrl;
}
access.setProperty(Config.AAF_LOCATE_URL, locateUrl);
addProp(Config.AAF_LOCATE_URL, locateUrl);
@@ -470,4 +485,8 @@ public class AAFSSO {
public boolean ok() {
return ok;
}
+
+ public static interface ProcessArgs {
+ public Properties process(final String[] args, final Properties props);
+ }
}