Check Perm Instance ending in colon

Issue-ID: AAF-269
Change-Id: I5422c0f119a53284ddc25eb7b99a8a6b09d3dd39
Signed-off-by: Instrumental <jonathan.gathman@att.com>

Fix broken JUnits

Issue-ID: AAF-270
Change-Id: I91e5d24b0e0610b10dcd12e90813e9ea00af1812
Signed-off-by: Instrumental <jonathan.gathman@att.com>

9 files changed, 45 insertions, 46 deletions

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index 9f0bef76..789e24ee 100644
--- a/auth-client/pom.xml
+++ b/auth-client/pom.xml
@@ -122,7 +122,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.5</version>
 				<configuration>
 					<skip>false</skip>
 				</configuration>
@@ -140,7 +139,6 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
@@ -151,7 +149,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
 				<configuration>
 					<dumpOnExit>true</dumpOnExit>
 					<includes>
diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
index a0e5bfa6..f304fccd 100644
--- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
+++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java
@@ -53,6 +53,18 @@ public class JU_ServiceValidator {
 		assertTrue(validator.errs().equals("ERR_Security\n"));
 
 	}
+	
+	@Test
+	public void permInstance() {
+		assertFalse(validator.permInstance("hello").err());
+		assertFalse(validator.permInstance("hello32").err());
+		assertFalse(validator.permInstance("hello-32").err());
+		assertFalse(validator.permInstance(":asdf:*:sdf*:sdk").err());
+		assertFalse(validator.permInstance(":asdf:*:sdf*:sdk*").err());
+		// Perms may not end in ":"
+		assertTrue(validator.permInstance(":").err());
+		assertTrue(validator.permInstance(":hello:").err());
+	}
 
 	@Test
 	public void permOkNull() {
diff --git a/auth/sample/local/org.osaaf.aaf.p12 b/auth/sample/local/org.osaaf.aaf.p12
index f40a7556..1e1ce696 100644
--- a/auth/sample/local/org.osaaf.aaf.p12
+++ b/auth/sample/local/org.osaaf.aaf.p12
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
index 9360e02f..2b498d4f 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
@@ -125,17 +125,16 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 			char[] truststorePassArray = trustStorePass.toCharArray();
 			jks.load(null,truststorePassArray); // load in
 			
-			// Add Trusted Certificates
+			// Add Trusted Certificates, but PKCS12 doesn't support
 			for(int i=0; i<trustCAs.length;++i) {
 				jks.setCertificateEntry("ca_" + arti.getCa() + '_' + i, trustCAs[i]);
 			}
 			// Write out
 			write(fks,Chmod.to644,jks,truststorePassArray);
-
+			return true;
 		} catch (Exception e) {
 			throw new CadiException(e);
 		}
-		return false;
 	}
 
 }
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
index 855c26f3..dbddd57a 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
@@ -21,9 +21,11 @@
 
 package org.onap.aaf.cadi.cm.test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,9 +36,11 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.*;
-import org.mockito.*;
-
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.cm.ArtifactDir;
 import org.onap.aaf.cadi.util.Chmod;
@@ -125,12 +129,12 @@ public class JU_ArtifactDir {
 	
 	}
 
-	@Test(expected = CadiException.class)
+	@Test
 	public void throwsTest() throws CadiException {
 		ArtifactDirStud artiDir = new ArtifactDirStud();
 		when(artiMock.getDir()).thenReturn(dirName);
 		when(artiMock.getNs()).thenReturn(nsName);
-		artiDir.place(transMock, certInfoMock, artiMock, "machine");
+		assertTrue(artiDir.place(transMock, certInfoMock, artiMock, "machine"));
 	}
 
 	private class ArtifactDirStud extends ArtifactDir {
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
index 02054cbf..d146f631 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
@@ -53,6 +53,7 @@ public class JU_PlaceArtifactInKeystore {
 	@Mock private CertInfo certInfoMock;
 	@Mock private Artifact artiMock;
 
+	private static final String caName = "onap";
 	private static final String dirName = "src/test/resources/artifacts";
 	private static final String nsName = "org.onap.test";
 	private static final String mechID = "m12345";
@@ -77,6 +78,7 @@ public class JU_PlaceArtifactInKeystore {
 		when(certInfoMock.getChallenge()).thenReturn(luggagePassword);
 		when(certInfoMock.getCerts()).thenReturn(certs);
 
+		when(artiMock.getCa()).thenReturn(caName);
 		when(artiMock.getDir()).thenReturn(dirName);
 		when(artiMock.getNs()).thenReturn(nsName);
 		when(artiMock.getMechid()).thenReturn(mechID);
@@ -94,12 +96,13 @@ public class JU_PlaceArtifactInKeystore {
 
 	@Test
 	public void test() throws CadiException {
-		PlaceArtifactInKeystore placer = new PlaceArtifactInKeystore("pkcs12");
+		// Note: PKCS12 can't be tested in JDK 7 and earlier.  Can't handle Trusting Certificates.
+		PlaceArtifactInKeystore placer = new PlaceArtifactInKeystore("jks");
 
 		certs.add(x509String);
 		certs.add(x509Chain);
 		assertThat(placer.place(transMock, certInfoMock, artiMock, "machine"), is(true));
-		for (String ext : new String[] {"chal", "keyfile", "pkcs12", "props", "trust.pkcs12"}) {
+		for (String ext : new String[] {"chal", "keyfile", "jks", "props", "trust.jks"}) {
 			assertThat(new File(dirName + '/' + nsName + '.' + ext).exists(), is(true));
 		}
 
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java b/cadi/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
index fd8e3575..50933f4e 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
@@ -47,12 +47,24 @@ public class JU_LocalLur {
 
 	@Test
 	public void test() throws IOException {
-		Symm symmetric = Symm.baseCrypt().obtain();
+		final Symm symmetric = Symm.baseCrypt().obtain();
 		LocalLur up;
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		baos.write(Symm.ENC.getBytes());
 		symmetric.enpass("<pass>", baos);
-		PropAccess ta = new PropAccess();
+		PropAccess ta = new PropAccess() {
+			@Override
+			public String decrypt(String encrypted, boolean anytext) throws IOException {
+				return symmetric.depass(encrypted);
+			}
+
+			@Override
+			public String encrypt(String unencrypted) throws IOException {
+				return symmetric.enpass(unencrypted);
+			}
+			
+		};
+		
 		Lur ml = up = new LocalLur(ta,"myname:groupA,groupB","admin:myname,yourname;suser:hisname,hername,m1234%"+baos.toString());
 
 		
diff --git a/cadi/core/src/test/resources/output_key b/cadi/core/src/test/resources/output_key
deleted file mode 100644
index 9d94dcbd..00000000
--- a/cadi/core/src/test/resources/output_key
+++ /dev/null
@@ -1 +0,0 @@
-QRSTUVWXYZabcdef
\ No newline at end of file
diff --git a/cadi/core/test/output_key b/cadi/core/test/output_key
deleted file mode 100644
index 353fabd2..00000000
--- a/cadi/core/test/output_key
+++ /dev/null
@@ -1,27 +0,0 @@
-g6wDq10CsnMUE0HB18N2UsrFri27TBG05Z1JzrvNSPUhIphFcv7gst-eHKvfbgffKF-rs9Zkjd5F
-3FZDci9MlG4vhwrXHXLgo6DXEVH4FsfT5MP__E3yrnuGOcDI4kWUFdni3xG48PXNcT_xQoPb6JRO
-dI3PiRRhgpvxuIL8O6iptFRoEilywvb8ySRFJA1XkRxCq-btzSpAHdMkBF-YnwMQYASveKXUddgo
-Ab6Rvn6u8cDVWTIvmlEQe2el6dcKOOeMc5Ipc0AXsTLpGmhMVySEeyzKysHk0c1BiGxTulqZQcHP
-L9uDFMxqL_GBwQOM4Xfu5wD_Dh1zNoKIpPta1AORjqlaUFOEsVWIn5oOKnimz4aNOjUku7tj3OKi
-c-AsphXLIpmodQD4uZBynwhIjuNcJ3-SRZ3_SHnXqvf8gE-4jab2baMEX_QJ2GXumcOdZujDp8yz
-3hCBlsToWXD-IatJ9dv_1gSn2_VOcXIhaNwe4YomaBVsQ4QqOkFWP9ZH3IfHrcCWZGt_HKg87NrJ
-PASZ9yzlBLBTI7XFOg4rqU7l-b6-LpTLm36c0f5ImPzr-kHpE--y0cuTfdI4CEv3dJMGysKOfXax
-N4tgR5t7ArQdFhLyo5mH-L5l973yuqJGVeRlTsYBYsHEb5vtIZxrYlebU9SSMmL9J-xI-hQV5tV7
-VR2C_zIKGL2nAq-tfVaiD1-M-SZW0S5VNmM-zXVxPT7jalCdHl6Dca47MhwQBVv_fxB5Nsahf10X
-MT58fLLi7C2aCIAPqFyu0e3B_yuAnhDzdkS_TmtX9ke25BSZe8Ql0lni9USKxwykfoRpt7UtdAId
-l8XxAgksLoDwxpL_EGz4I0jQN-4ziCVHpZNQmX08XUQ7Gx_xMtrIi21QRUhF04ZxLxlwTXjsr_Tj
-jO2Y6xs-S0wShAXGA8qZWdUXqO-zg6pGQ51RWf1HZYvgCDy1E0LiBEdlGye0dFzy1jS2DRg-3ByC
-oYtQmOmuyvOoCAH4B7C2fWSW8Kn2ps2VvHTmk7b7ZcWlteNWfjezaU4W2JQclBP8UzcfuuMohZgP
-eYRTQ_vTxvwbVBESBNpcfW3Og5sru0FhHbKyL6UE5iOxAnnf06bMOCesDRDm4yTcCbCCya-norY9
-aWiFbXKyFUqZVbmCSRd1hv-FJazsfXgJneeTvzyRg1vPQhnmyngwm0H1S7YPAGPL2B6Ir-nMCzLR
-oscgShrIPR7YnemaZxqwMES6iWqnnPNOJO3NRAs7iVw71sIh1BNoDdHYqETsGcmiFiZsNc-LEIFe
-c3nmCZ9VufLaYPpYDyTqHjijc0p2gtZtxCyrtSKJO-7Y4rtv9vCOfub7Vn8na_-DtIKUL2Lzspne
-dmS5_yetSJ-mNtzB__1jJk-Ke65mZ1BNJ4zMv839rC1rrb63kPZsdQp0w2hnNm-ttWXDN0nnyLOY
-Vz6p9BLrVAg9kA4Y0DFsI3qqEA1Xhuc9LuKLIGiCuGfa6ydoIzDRvlDTJR-Kju1A8npgzQTxGFSo
-P2A4f8E8doF9Lbt46yQQx0S14kS-1sPHUAc-Lqx5lnLcDxU1e4kgDrgbQ2Tly60tIhU_es9m1RZP
-5c4-VyjgDXmKxCIaq53VihbPmGi626xfX0Ez5sosEDQSvEGsxRwEBsO1Mif2b2a1IERpUqCafAjo
-rfN6DbKhWUINOGsDcRvZFWcR1dGuboopxpTxwXNhZxKb_0WPraLBkdzWC2rF7_JQc0o6LetalSUZ
-HjbMIsyvME5sA0JF5dLXEdPmHKs4XQOQPYi6yMz78wz7qNwvGI_qAQEK3cAriBJx7mxZry7DRa7Z
-UvmaESHb3j80InnqiEcC_gF-smViBsyxIZzGPdXD7mwa91829obATzs08769bXh_MlCYkVqrXM-A
-Il2NI0ocRziAkRnyFk1NzL9sghQ_9EIarjTGJv8xQCHfUibksmk0pQJFt8Z8_gXPOprLZB3DZytT
-6mNiawvv0H5phK9Fdm2seytkouSfmgDcY5wSeytgmtZSwGe12BoQUrtTJoOGV6BmYxOCMTC1
\ No newline at end of file