[Test] Fixed HTTPSWebServerAuthTest

This commit is contained in:
Rsl1122 2018-10-13 13:40:18 +03:00
parent 40c6b09801
commit a2325a0e12

View File

@ -1,10 +1,18 @@
package com.djrapitops.plan.system.webserver; package com.djrapitops.plan.system.webserver;
import com.djrapitops.plan.Plan; import com.djrapitops.plan.DaggerPlanBukkitComponent;
import com.djrapitops.plan.PlanBukkitComponent;
import com.djrapitops.plan.api.exceptions.connection.*; import com.djrapitops.plan.api.exceptions.connection.*;
import com.djrapitops.plan.data.WebUser;
import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.system.settings.config.PlanConfig;
import com.djrapitops.plan.utilities.Base64Util; import com.djrapitops.plan.utilities.Base64Util;
import org.junit.*; import com.djrapitops.plan.utilities.PassEncryptUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
@ -27,30 +35,32 @@ public class HTTPSWebServerAuthTest {
@BeforeClass @BeforeClass
public static void setUpClass() throws Exception { public static void setUpClass() throws Exception {
PlanBukkitMocker mockUtil = PlanBukkitMocker.setUp() PlanBukkitMocker mocker = PlanBukkitMocker.setUp()
.withDataFolder(temporaryFolder.getRoot()) .withDataFolder(temporaryFolder.getRoot())
.withLogging()
.withPluginDescription() .withPluginDescription()
.withResourceFetchingFromJar() .withResourceFetchingFromJar()
.withServer(); .withServer();
Plan planMock = mockUtil.getPlanMock(); PlanBukkitComponent component = DaggerPlanBukkitComponent.builder().plan(mocker.getPlanMock()).build();
URL resource = HTTPSWebServerAuthTest.class.getResource("/Cert.keystore"); URL resource = HTTPSWebServerAuthTest.class.getResource("/Cert.keystore");
String keyStore = resource.getPath(); String keyStore = resource.getPath();
String absolutePath = new File(keyStore).getAbsolutePath(); String absolutePath = new File(keyStore).getAbsolutePath();
// Settings.WEBSERVER_CERTIFICATE_PATH.setTemporaryValue(absolutePath); bukkitSystem = component.system();
// Settings.WEBSERVER_CERTIFICATE_KEYPASS.setTemporaryValue("MnD3bU5HpmPXag0e");
// Settings.WEBSERVER_CERTIFICATE_STOREPASS.setTemporaryValue("wDwwf663NLTm73gL");
// Settings.WEBSERVER_CERTIFICATE_ALIAS.setTemporaryValue("DefaultPlanCert");
//
// Settings.WEBSERVER_PORT.setTemporaryValue(9005);
bukkitSystem = null; //TODO PlanConfig config = bukkitSystem.getConfigSystem().getConfig();
// bukkitSystem.enable();
// config.set(Settings.WEBSERVER_CERTIFICATE_PATH, absolutePath);
// bukkitSystem.getDatabaseSystem().getDatabase().save() config.set(Settings.WEBSERVER_CERTIFICATE_KEYPASS, "MnD3bU5HpmPXag0e");
// .webUser(new WebUser("test", PassEncryptUtil.createHash("testPass"), 0)); config.set(Settings.WEBSERVER_CERTIFICATE_STOREPASS, "wDwwf663NLTm73gL");
config.set(Settings.WEBSERVER_CERTIFICATE_ALIAS, "DefaultPlanCert");
config.set(Settings.WEBSERVER_PORT, 9005);
bukkitSystem.enable();
bukkitSystem.getDatabaseSystem().getDatabase().save()
.webUser(new WebUser("test", PassEncryptUtil.createHash("testPass"), 0));
} }
@AfterClass @AfterClass
@ -89,7 +99,6 @@ public class HTTPSWebServerAuthTest {
* Test case against "Perm level 0 required, got 0". * Test case against "Perm level 0 required, got 0".
*/ */
@Test @Test
@Ignore // TODO
public void testHTTPSAuthForPages() throws IOException, WebException, KeyManagementException, NoSuchAlgorithmException { public void testHTTPSAuthForPages() throws IOException, WebException, KeyManagementException, NoSuchAlgorithmException {
String address = "https://localhost:9005"; String address = "https://localhost:9005";
URL url = new URL(address); URL url = new URL(address);
@ -114,6 +123,7 @@ public class HTTPSWebServerAuthTest {
switch (responseCode) { switch (responseCode) {
case 200: case 200:
case 302:
return; return;
case 400: case 400:
throw new BadRequestException("Bad Request: " + url.toString()); throw new BadRequestException("Bad Request: " + url.toString());