upd: factor out and optimize api-access-tests

Change-Id: I89e22ddc5be175e3c0d56adcfc9533aef764d9cc

diff --git a/tests/org/cacert/gigi/api/ImportCATSResult.java b/tests/org/cacert/gigi/api/ImportCATSResult.java
index 3fe6a63c52ecd668d3104baae06b731e09c93a6f..e16657a08523859cf0819988f39c9b7d774116c4 100644 (file)
--- a/tests/org/cacert/gigi/api/ImportCATSResult.java
+++ b/tests/org/cacert/gigi/api/ImportCATSResult.java
@@ -3,18 +3,13 @@ package org.cacert.gigi.api;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

-import java.io.OutputStream;

 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;

-import java.net.URL;

 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;

-import java.security.KeyPair;

 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchAlgorithmException;

-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;

 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.CATS.CATSType;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.CATS.CATSType;


@@ -23,34 +18,12 @@ import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.dbObjects.Certificate.SANType;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.dbObjects.Certificate.SANType;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Digest;

-import org.cacert.gigi.dbObjects.Group;
-import org.cacert.gigi.dbObjects.Organisation;

 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.dbObjects.User;

-import org.cacert.gigi.testUtils.ClientTest;

 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.IOUtils;

+import org.cacert.gigi.testUtils.RestrictedApiTest;

 import org.junit.Test;
 
 import org.junit.Test;
 

-public class ImportCATSResult extends ClientTest {
-
-    private PrivateKey pk;
-
-    private X509Certificate ce;
-
-    public ImportCATSResult() throws IOException, GeneralSecurityException, InterruptedException, GigiApiException {
-        makeAssurer(id);
-
-        grant(u.getEmail(), Group.ORGASSURER);
-        clearCaches();
-        u = User.getById(u.getId());
-        Organisation o = new Organisation(Organisation.SELF_ORG_NAME, "NA", "NA", "NA", "contact@cacert.org", "", "", u);
-        assertTrue(o.isSelfOrganisation());
-        KeyPair kp = generateKeypair();
-        String key1 = generatePEMCSR(kp, "EMAIL=cats@cacert.org");
-        Certificate c = new Certificate(o, u, Certificate.buildDN("EMAIL", "cats@cacert.org"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getByName("client-orga"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@cacert.org"));
-        pk = kp.getPrivate();
-        await(c.issue(null, "2y", u));
-        ce = c.cert();
-    }
+public class ImportCATSResult extends RestrictedApiTest {

 
     @Test
     public void testLookupSerial() throws GigiApiException, IOException, GeneralSecurityException, InterruptedException {
 
     @Test
     public void testLookupSerial() throws GigiApiException, IOException, GeneralSecurityException, InterruptedException {


@@ -101,24 +74,16 @@ public class ImportCATSResult extends ClientTest {
         }
     }
 
         }
     }
 

-    private HttpURLConnection executeImportQuery(String query) throws IOException, MalformedURLException, NoSuchAlgorithmException, KeyManagementException, UnsupportedEncodingException, Error {
-        HttpURLConnection connection = (HttpURLConnection) new URL("https://" + getServerName().replaceFirst("^www.", "api.") + CATSImport.PATH).openConnection();
-        authenticateClientCert(pk, ce, connection);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        os.write(query.getBytes("UTF-8"));
-        return connection;
+    private HttpURLConnection executeImportQuery(String query) throws IOException, GeneralSecurityException {
+        return doApi(CATSImport.PATH, query);

     }
 
     }
 

-    private String apiLookup(Certificate target) throws IOException, MalformedURLException, NoSuchAlgorithmException, KeyManagementException, UnsupportedEncodingException, GeneralSecurityException {
-        HttpURLConnection connection = (HttpURLConnection) new URL("https://" + getServerName().replaceFirst("^www.", "api.") + CATSResolve.PATH).openConnection();
-        authenticateClientCert(pk, ce, connection);
-        connection.setDoOutput(true);
-        OutputStream os = connection.getOutputStream();
-        os.write(("serial=" + target.cert().getSerialNumber().toString(16).toLowerCase()).getBytes());
+    private String apiLookup(Certificate target) throws IOException, GeneralSecurityException {
+        HttpURLConnection connection = doApi(CATSResolve.PATH, "serial=" + target.cert().getSerialNumber().toString(16).toLowerCase());

         if (connection.getResponseCode() != 200) {
             throw new Error(connection.getResponseMessage());
         }
         return IOUtils.readURL(connection);
     }
         if (connection.getResponseCode() != 200) {
             throw new Error(connection.getResponseMessage());
         }
         return IOUtils.readURL(connection);
     }

+

 }
 }

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 326cd975ab22e656c28c5fdd1344d1c98eeba937..b87585223867cb5e4ebef556e41900ef4112cf7b 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -157,7 +157,7 @@ public class ManagedTest extends ConfiguredTest {
 
     }
 
 
     }
 

-    protected void await(Job j) throws InterruptedException {
+    protected static void await(Job j) throws InterruptedException {

         SimpleSigner.ping();
         j.waitFor(5000);
     }
         SimpleSigner.ping();
         j.waitFor(5000);
     }

diff --git a/tests/org/cacert/gigi/testUtils/RestrictedApiTest.java b/tests/org/cacert/gigi/testUtils/RestrictedApiTest.java
new file mode 100644 (file)
index 0000000..e9fbcb6
--- /dev/null
+++ b/tests/org/cacert/gigi/testUtils/RestrictedApiTest.java
@@ -0,0 +1,71 @@
+package org.cacert.gigi.testUtils;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
+import org.cacert.gigi.dbObjects.Certificate.SANType;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.Organisation;
+import org.cacert.gigi.dbObjects.User;
+import org.junit.BeforeClass;
+
+public class RestrictedApiTest extends ClientTest {
+
+    protected static PrivateKey pk;
+
+    protected static X509Certificate ce;
+
+    public RestrictedApiTest() {
+        makeAssurer(id);
+    }
+
+    @BeforeClass
+    public static void initCert() {
+        initEnvironment();
+        try {
+            User u = User.getById(createAssuranceUser("f", "l", createUniqueName() + "@email.com", TEST_PASSWORD));
+            grant(u.getEmail(), Group.ORGASSURER);
+            clearCaches();
+            u = User.getById(u.getId());
+            Organisation o = new Organisation(Organisation.SELF_ORG_NAME, "NA", "NA", "NA", "contact@cacert.org", "", "", u);
+            assertTrue(o.isSelfOrganisation());
+            KeyPair kp = generateKeypair();
+            String key1 = generatePEMCSR(kp, "EMAIL=cats@cacert.org");
+            Certificate c = new Certificate(o, u, Certificate.buildDN("EMAIL", "cats@cacert.org"), Digest.SHA256, key1, CSRType.CSR, CertificateProfile.getByName("client-orga"), new Certificate.SubjectAlternateName(SANType.EMAIL, "cats@cacert.org"));
+            pk = kp.getPrivate();
+            await(c.issue(null, "2y", u));
+            ce = c.cert();
+        } catch (IOException e) {
+            throw new Error(e);
+        } catch (GigiApiException e) {
+            throw new Error(e);
+        } catch (GeneralSecurityException e) {
+            throw new Error(e);
+        } catch (InterruptedException e) {
+            throw new Error(e);
+        }
+
+    }
+
+    public HttpURLConnection doApi(String path, String content) throws IOException, GeneralSecurityException {
+        HttpURLConnection connection = (HttpURLConnection) new URL("https://" + getServerName().replaceFirst("^www.", "api.") + path).openConnection();
+        authenticateClientCert(pk, ce, connection);
+        connection.setDoOutput(true);
+        OutputStream os = connection.getOutputStream();
+        os.write(content.getBytes());
+        return connection;
+    }
+}