Merge pull request #813 from Stueypoo/Remove-EE-certs-after-web-systemtests

Remove ee certs after web systemtests and enable OCSP test port config

Author: primetomas

modules/systemtests/src-test/org/cesecore/CaTestUtils.java

@@ -231,6 +231,7 @@ public static void removeCa(AuthenticationToken authenticationToken, CAInfo caIn
             if (caInfo.getCAToken() != null) {
                 cryptoTokenManagementSession.deleteCryptoToken(authenticationToken, caInfo.getCAToken().getCryptoTokenId());
             }
+            internalCertificateStoreSession.removeCertificatesByIssuer(caInfo.getSubjectDN());
             internalCertificateStoreSession.removeCertificatesBySubject(caInfo.getSubjectDN());
             internalCertificateStoreSession.removeCRLs(authenticationToken, caInfo.getSubjectDN());            
         }

modules/systemtests/src-test/org/cesecore/certificates/ocsp/OcspTestUtils.java

@@ -33,6 +33,7 @@
 
 import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
 import org.bouncycastle.operator.OperatorCreationException;
+import org.cesecore.SystemTestsConfiguration;
 import org.cesecore.authentication.tokens.AuthenticationToken;
 import org.cesecore.authorization.AuthorizationDeniedException;
 import org.cesecore.certificates.ca.CADoesntExistsException;
@@ -353,7 +354,8 @@ public static void removeInternalKeyBinding(AuthenticationToken alwaysAllowtoken
 
     public static void clearOcspSigningCache() {
         try {
-            final URL url = new URL("http://localhost:8080/ejbca/clearcache?command=clearcaches&excludeactivects=true");
+            final String httpPort = SystemTestsConfiguration.getRemotePortHttp("8080");
+            final URL url = new URL("http://localhost:"+httpPort+"/ejbca/clearcache?command=clearcaches&excludeactivects=true");
             final HttpURLConnection con = (HttpURLConnection) url.openConnection();
             if (con.getResponseCode() != HttpURLConnection.HTTP_OK) {
                 Assert.fail("Failed to clear caches using URL: http://localhost:8080/ejbca/clearcache?command=clearcaches&excludeactivects=true"

modules/systemtests/src-test/org/cesecore/junit/util/CryptoTokenRunner.java

@@ -155,9 +155,15 @@ public void tearDownCa(X509CAInfo ca) {
             if (caCertificate != null) {
                 internalCertificateStoreSession.removeCertificate(caCertificate);
             }
+            
+            // Delete certs and CRLs issued by the CA
+            internalCertificateStoreSession.removeCertificatesByIssuer(ca.getSubjectDN());
+            internalCertificateStoreSession.removeCertificatesBySubject(ca.getSubjectDN());
+            internalCertificateStoreSession.removeCRLs(alwaysAllowToken, ca.getSubjectDN());
         } catch (AuthorizationDeniedException e) {
             throw new IllegalStateException(e);
         }
+
         casToRemove.remove(ca.getCAId());
     }
 

modules/systemtests/src-test/org/ejbca/core/protocol/ocsp/OcspJunitHelper.java

@@ -370,7 +370,7 @@ private void servletGetWithParam(String param) throws IOException, URISyntaxExce
 				*/
         final URI uriWithParam = new URI(
                 this.baseURI.getScheme(), this.baseURI.getUserInfo(), "127.0.0.1",
-                8080, this.baseURI.getPath(), param, this.baseURI.getFragment());
+                this.baseURI.getPort(), this.baseURI.getPath(), param, this.baseURI.getFragment());
 		final URL url = uriWithParam.toURL();
 		final HttpURLConnection con = (HttpURLConnection)url.openConnection();
 		log.debug("Connection to " + url.toExternalForm() + " resulted in HTTP " + con.getResponseCode());