zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more tests

Browse source
This commit is contained in:
anhefti 2019-12-03 16:23:42 +01:00
parent 67f3396fe9
commit 43554b8215
9 changed files with 218 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java
View file

@ -23,6 +23,7 @@ import org.springframework.web.util.HtmlUtils;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.util.Utils;
/** This class defines API error messages that are created and responded on error and/or exceptional
@ -201,39 +202,13 @@ public class APIMessage implements Serializable {
final StringBuilder builder = new StringBuilder();
builder.append("<b>Failure: </b>").append("<br/><br/>").append(errorMessage).append("<br/><br/>");
builder.append("<b>Detail Messages:</b><br/><br/>");
messages.stream()
.forEach(message -> {
builder
.append("&nbsp;&nbsp;code&nbsp;:&nbsp;")
.append(message.messageCode)
.append("<br/>")
.append("&nbsp;&nbsp;system message&nbsp;:&nbsp;")
.append(HtmlUtils.htmlEscape(message.systemMessage))
.append("<br/>")
.append("&nbsp;&nbsp;details&nbsp;:&nbsp;")
.append(HtmlUtils.htmlEscape(StringUtils.abbreviate(message.details, 100)))
.append("<br/><br/>");
});
return builder.toString();
return buildHTML(messages, builder);
}
public static String toHTML(final Collection<APIMessage> messages) {
final StringBuilder builder = new StringBuilder();
builder.append("<b>Messages:</b><br/><br/>");
messages.stream()
.forEach(message -> {
builder
.append("&nbsp;&nbsp;code&nbsp;:&nbsp;")
.append(message.messageCode)
.append("<br/>")
.append("&nbsp;&nbsp;system message&nbsp;:&nbsp;")
.append(HtmlUtils.htmlEscape(message.systemMessage))
.append("<br/>")
.append("&nbsp;&nbsp;details&nbsp;:&nbsp;")
.append(HtmlUtils.htmlEscape(StringUtils.abbreviate(message.details, 100)))
.append("<br/><br/>");
});
return builder.toString();
return buildHTML(messages, builder);
}
/** This exception can be internal used to wrap a created APIMessage
@ -257,12 +232,12 @@ public class APIMessage implements Serializable {
}
public APIMessageException(final ErrorMessage errorMessage) {
super();
super(errorMessage.systemMessage);
this.apiMessages = Arrays.asList(errorMessage.of());
}
public APIMessageException(final ErrorMessage errorMessage, final String detail, final String... attributes) {
super();
super(errorMessage.systemMessage);
this.apiMessages = Arrays.asList(errorMessage.of(detail, attributes));
}
@ -286,4 +261,23 @@ public class APIMessage implements Serializable {
}
}
private static String buildHTML(final Collection<APIMessage> messages, final StringBuilder builder) {
messages.stream()
.forEach(message -> {
builder
.append("&nbsp;&nbsp;code&nbsp;:&nbsp;")
.append(message.messageCode)
.append("<br/>")
.append("&nbsp;&nbsp;system message&nbsp;:&nbsp;")
.append(HtmlUtils.htmlEscape(message.systemMessage))
.append("<br/>")
.append("&nbsp;&nbsp;details&nbsp;:&nbsp;")
.append((message.details != null)
? HtmlUtils.htmlEscape(StringUtils.abbreviate(message.details, 100))
: Constants.EMPTY_NOTE)
.append("<br/><br/>");
});
return builder.toString();
}
}

2
src/main/java/ch/ethz/seb/sebserver/gbl/api/authorization/PrivilegeType.java
View file

@ -36,8 +36,6 @@ public enum PrivilegeType {
}
switch (this) {
case NONE:
return false;
case READ:
return type == READ;
case MODIFY:

6
src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceConfig.java
View file

@ -10,21 +10,15 @@ package ch.ethz.seb.sebserver.webservice;
import org.cryptonode.jncryptor.AES256JNCryptor;
import org.cryptonode.jncryptor.JNCryptor;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Lazy;
import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
//TODO check if DataSourceAutoConfiguration and TokenStore bean definition is really needed here
//or if it is possible to move them to the WebServiceSecurityConfig.
//test with starting web and gui separately as well as together
@Configuration
@WebServiceProfile
@Import(DataSourceAutoConfiguration.class)
public class WebserviceConfig {
@Lazy

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/PasswordEncryptor.java
View file

@ -17,10 +17,10 @@ import java.io.SequenceInputStream;
import java.util.Set;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.cryptonode.jncryptor.AES256JNCryptor;
import org.cryptonode.jncryptor.AES256JNCryptorInputStream;
import org.cryptonode.jncryptor.AES256JNCryptorOutputStream;
import org.cryptonode.jncryptor.CryptorException;
import org.cryptonode.jncryptor.JNCryptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
@ -44,6 +44,12 @@ public class PasswordEncryptor implements SebConfigCryptor {
Strategy.PASSWORD_PSWD,
Strategy.PASSWORD_PWCC);
private final JNCryptor cryptor;
protected PasswordEncryptor(final JNCryptor cryptor) {
this.cryptor = cryptor;
}
@Override
public Set<Strategy> strategies() {
return STRATEGIES;
@ -139,9 +145,9 @@ public class PasswordEncryptor implements SebConfigCryptor {
final ByteArrayOutputStream out = new ByteArrayOutputStream();
IOUtils.copy(sequenceInputStream, out);
final byte[] ciphertext = out.toByteArray();
final AES256JNCryptor cryptor = new AES256JNCryptor();
cryptor.setPBKDFIterations(Constants.JN_CRYPTOR_ITERATIONS);
final byte[] decryptData = cryptor.decryptData(ciphertext, Utils.toCharArray(password));
//cryptor.setPBKDFIterations(Constants.JN_CRYPTOR_ITERATIONS);
final byte[] decryptData = this.cryptor.decryptData(ciphertext, Utils.toCharArray(password));
final ByteArrayInputStream decryptedIn = new ByteArrayInputStream(decryptData);
IOUtils.copyLarge(decryptedIn, output);

29
src/test/java/ch/ethz/seb/sebserver/TestUtils.java Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public final class TestUtils {
private static final Object SOME_OBJECT = new Object();
public static final <T> void genericObjectTest(final T testObject) {
assertFalse(testObject.equals(null));
assertFalse(testObject.equals(SOME_OBJECT));
assertTrue(testObject.equals(testObject));
}
public static final <T> void genericObjectTest(final T testObject, final T other) {
genericObjectTest(testObject);
assertFalse(testObject.equals(other));
}
}

105
src/test/java/ch/ethz/seb/sebserver/gbl/api/APIMessageTest.java Normal file
View file

@ -0,0 +1,105 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.gbl.api;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException;
public class APIMessageTest {
@Test
public void testInit() {
final APIMessage message = APIMessage.ErrorMessage.GENERIC.of();
assertEquals(
"APIMessage [messageCode=0, systemMessage=Generic error message, details=null, attributes=[]]",
message.toString());
assertTrue(APIMessage.ErrorMessage.GENERIC.isOf(message));
final APIMessage message2 = APIMessage.ErrorMessage.GENERIC.of(
new RuntimeException("Some Exception"),
"attribute1",
"attribute2");
assertEquals(
"APIMessage [messageCode=0, systemMessage=Generic error message, details=Some Exception, attributes=[attribute1, attribute2]]",
message2.toString());
final APIMessage message3 = new APIMessage("test", "test");
assertEquals(
"APIMessage [messageCode=test, systemMessage=test, details=null, attributes=[]]",
message3.toString());
}
@Test
public void testCreateErrorResponse() {
final ResponseEntity<List<APIMessage>> errorResponse = APIMessage.ErrorMessage.GENERIC.createErrorResponse();
assertTrue(errorResponse.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR);
final List<APIMessage> body = errorResponse.getBody();
assertNotNull(body);
assertFalse(body.isEmpty());
assertTrue(body.size() == 1);
assertEquals(
"APIMessage [messageCode=0, systemMessage=Generic error message, details=null, attributes=[]]",
body.get(0).toString());
}
@Test
public void testToHTML() {
final List<APIMessage> messages = Arrays.asList(
APIMessage.ErrorMessage.GENERIC.of(),
APIMessage.ErrorMessage.ILLEGAL_API_ARGUMENT.of());
final String html = APIMessage.toHTML("title message", messages);
assertEquals(
"<b>Failure: </b><br/><br/>title message<br/><br/><b>Detail Messages:</b><br/><br/>&nbsp;&nbsp;code&nbsp;:&nbsp;0<br/>&nbsp;&nbsp;system message&nbsp;:&nbsp;Generic error message<br/>&nbsp;&nbsp;details&nbsp;:&nbsp;--<br/><br/>&nbsp;&nbsp;code&nbsp;:&nbsp;1010<br/>&nbsp;&nbsp;system message&nbsp;:&nbsp;Illegal API request argument<br/>&nbsp;&nbsp;details&nbsp;:&nbsp;--<br/><br/>",
html);
final String html2 = APIMessage.toHTML(messages);
assertEquals(
"<b>Messages:</b><br/><br/>&nbsp;&nbsp;code&nbsp;:&nbsp;0<br/>&nbsp;&nbsp;system message&nbsp;:&nbsp;Generic error message<br/>&nbsp;&nbsp;details&nbsp;:&nbsp;--<br/><br/>&nbsp;&nbsp;code&nbsp;:&nbsp;1010<br/>&nbsp;&nbsp;system message&nbsp;:&nbsp;Illegal API request argument<br/>&nbsp;&nbsp;details&nbsp;:&nbsp;--<br/><br/>",
html2);
}
@Test
public void testAPIMessageException() {
final APIMessageException apiMessageException =
new APIMessage.APIMessageException(APIMessage.ErrorMessage.FORBIDDEN);
assertEquals("FORBIDDEN", apiMessageException.getMessage());
Collection<APIMessage> apiMessages = apiMessageException.getAPIMessages();
assertNotNull(apiMessages);
assertFalse(apiMessages.isEmpty());
assertTrue(apiMessages.size() == 1);
final APIMessageException apiMessageException2 =
new APIMessage.APIMessageException(APIMessage.ErrorMessage.FORBIDDEN, "detail", "attribute1",
"attribute2");
assertEquals("FORBIDDEN", apiMessageException2.getMessage());
apiMessages = apiMessageException2.getAPIMessages();
assertNotNull(apiMessages);
assertFalse(apiMessages.isEmpty());
assertTrue(apiMessages.size() == 1);
assertEquals(
"APIMessage [messageCode=1001, systemMessage=FORBIDDEN, details=detail, attributes=[attribute1, attribute2]]",
apiMessages.iterator().next().toString());
}
}

44
src/test/java/ch/ethz/seb/sebserver/gbl/api/ExamAPIDiscoveryTest.java Normal file
View file

@ -0,0 +1,44 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.gbl.api;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.Arrays;
import org.junit.Test;
public class ExamAPIDiscoveryTest {
@Test
public void testCreation() throws IOException {
final JSONMapper jsonMapper = new JSONMapper();
final ExamAPIDiscovery examAPIDiscovery = new ExamAPIDiscovery(
"title",
"description",
"serverURL",
new ExamAPIDiscovery.ExamAPIVersion(
"v1",
Arrays.asList(new ExamAPIDiscovery.Endpoint("name", "desc", "loc", "auth"))),
new ExamAPIDiscovery.ExamAPIVersion(
"v2",
Arrays.asList(new ExamAPIDiscovery.Endpoint("name", "desc", "loc", "auth"))));
final String asString = jsonMapper.writeValueAsString(examAPIDiscovery);
assertEquals(
"{\"title\":\"title\",\"description\":\"description\",\"server-location\":\"serverURL\",\"api-versions\":[{\"name\":\"v1\",\"endpoints\":[{\"name\":\"name\",\"description\":\"desc\",\"location\":\"loc\",\"authorization\":\"auth\"}]},{\"name\":\"v2\",\"endpoints\":[{\"name\":\"name\",\"description\":\"desc\",\"location\":\"loc\",\"authorization\":\"auth\"}]}]}",
asString);
final ExamAPIDiscovery examAPIDiscovery2 = jsonMapper.readValue(asString, ExamAPIDiscovery.class);
assertEquals(asString, jsonMapper.writeValueAsString(examAPIDiscovery2));
}
}

3
src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/PasswordEncryptorTest.java
View file

@ -64,7 +64,8 @@ public class PasswordEncryptorTest {
@Test
public void test2() throws IOException {
final PasswordEncryptor encryptor = new PasswordEncryptor();
final JNCryptor cryptor = new AES256JNCryptor();
final PasswordEncryptor encryptor = new PasswordEncryptor(cryptor);
final String config = "<TestConfig></TestConfig>";
final String pwd = "password";

5
src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebConfigEncryptionServiceImplTest.java
View file

@ -18,6 +18,8 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.cryptonode.jncryptor.AES256JNCryptor;
import org.cryptonode.jncryptor.JNCryptor;
import org.junit.Test;
import ch.ethz.seb.sebserver.gbl.util.Utils;
@ -95,8 +97,9 @@ public class SebConfigEncryptionServiceImplTest {
}
private SebConfigEncryptionServiceImpl sebConfigEncryptionServiceImpl() {
final JNCryptor cryptor = new AES256JNCryptor();
final List<SebConfigCryptor> encryptors = Arrays.asList(
new PasswordEncryptor(),
new PasswordEncryptor(cryptor),
new NoneEncryptor());
return new SebConfigEncryptionServiceImpl(encryptors);
}