X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fadmin%2FTestSEAdminTicketSetting.java;h=7562ed0076d6eac643423019287c4b92a4c10efa;hb=6ffbf3917844ee6e20f65db7f0b15cfc42315e5e;hp=e85b03e9a810b86dd62bccaa38381e3038782955;hpb=7fbed5d72877a442af2f1290b60c5d3e7d5c0d23;p=gigi.git

diff --git a/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java b/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java
index e85b03e9..7562ed00 100644
--- a/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java
+++ b/tests/club/wpia/gigi/pages/admin/TestSEAdminTicketSetting.java
@@ -7,19 +7,14 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
 import java.util.Random;
 
 import org.junit.Test;
 
 import club.wpia.gigi.GigiApiException;
-import club.wpia.gigi.dbObjects.Certificate;
-import club.wpia.gigi.dbObjects.Certificate.CSRType;
-import club.wpia.gigi.dbObjects.Digest;
+import club.wpia.gigi.dbObjects.CATS.CATSType;
 import club.wpia.gigi.dbObjects.Group;
+import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.pages.admin.support.FindCertPage;
 import club.wpia.gigi.pages.admin.support.FindUserByDomainPage;
 import club.wpia.gigi.pages.admin.support.FindUserByEmailPage;
@@ -32,22 +27,8 @@ public class TestSEAdminTicketSetting extends ClientTest {
 
     public TestSEAdminTicketSetting() throws IOException, GigiApiException {
         grant(u, Group.SUPPORTER);
-        try {
-            KeyPair kp = generateKeypair();
-            String csr = generatePEMCSR(kp, "CN=" + u.getPreferredName().toString());
-            Certificate c = new Certificate(u, u, Certificate.buildDN("CN", u.getPreferredName().toString()), Digest.SHA256, csr, CSRType.CSR, getClientProfile());
-            final PrivateKey pk = kp.getPrivate();
-            await(c.issue(null, "2y", u));
-            final X509Certificate ce = c.cert();
-            c.setLoginEnabled(true);
-            cookie = login(pk, ce);
-            loginCertificate = c;
-            loginPrivateKey = pk;
-        } catch (InterruptedException e) {
-            throw new GigiApiException(e.toString());
-        } catch (GeneralSecurityException e) {
-            throw new GigiApiException(e.toString());
-        }
+        addChallenge(u.getId(), CATSType.SUPPORT_DP_CHALLENGE_NAME);
+        cookie = cookieWithCertificateLogin(u);
     }
 
     @Test
@@ -133,4 +114,17 @@ public class TestSEAdminTicketSetting extends ClientTest {
         assertEquals(403, get(cookiePW, FindCertPage.PATH).getResponseCode());
     }
 
+    @Test
+    public void testNoSupportChallenge() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
+        User supporter1 = User.getById(createVerificationUser("testworker", "testname", createUniqueName() + "@testdom.com", TEST_PASSWORD));
+        grant(supporter1, Group.SUPPORTER);
+        loginCertificate = null;
+        cookie = cookieWithCertificateLogin(supporter1);
+
+        assertEquals(403, get(SupportEnterTicketPage.PATH).getResponseCode());
+        assertEquals(403, get(FindUserByEmailPage.PATH).getResponseCode());
+        assertEquals(403, get(FindUserByDomainPage.PATH).getResponseCode());
+        assertEquals(403, get(FindCertPage.PATH).getResponseCode());
+    }
+
 }