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

added config attribute (primitive) type check on import

Browse source
This commit is contained in:
anhefti 2020-07-06 09:41:00 +02:00
parent cc543f79da
commit 61a232630b
2 changed files with 66 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigXMLParser.java
View file

@ -413,7 +413,7 @@ public class ExamConfigXMLParser extends DefaultHandler {
name, name,
attribute, attribute,
listIndex, listIndex,
value); checkValueType(value, attribute));
if (configurationValue != null) { if (configurationValue != null) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
@ -424,6 +424,67 @@ public class ExamConfigXMLParser extends DefaultHandler {
} }
} }
private String checkValueType(final String value, final ConfigurationAttribute attribute) {
if (attribute == null) {
return value;
}
if (attribute.type == null) {
log.warn(
"Invalid attribute type detected. Name: {} type: {} value: {} : import with default value for this attribute",
attribute.name,
attribute.type,
value);
return attribute.defaultValue;
}
switch (attribute.type) {
case CHECKBOX: {
try {
Boolean.parseBoolean(value);
return value;
} catch (final Exception e) {
log.warn(
"Invalid attribute value detected. Name: {} type: {} value: {} : import with default value for this attribute",
attribute.name,
attribute.type,
value);
return attribute.defaultValue;
}
}
case INTEGER:
case RADIO_SELECTION:
case SINGLE_SELECTION: {
try {
Integer.parseInt(value);
return value;
} catch (final Exception e) {
log.warn(
"Invalid attribute value detected. Name: {} type: {} value: {} : import with default value for this attribute",
attribute.name,
attribute.type,
value);
return attribute.defaultValue;
}
}
case DECIMAL: {
try {
Double.parseDouble(value);
return value;
} catch (final Exception e) {
log.warn(
"Invalid attribute value detected. Name: {} type: {} value: {} : import with default value for this attribute",
attribute.name,
attribute.type,
value);
return attribute.defaultValue;
}
}
default:
return value;
}
}
private ConfigurationValue createConfigurationValue( private ConfigurationValue createConfigurationValue(
final String name, final String name,
final ConfigurationAttribute attribute, final ConfigurationAttribute attribute,

7
src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigImportHandlerTest.java
View file

@ -15,20 +15,21 @@ import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import ch.ethz.seb.sebserver.gbl.util.Cryptor;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.AttributeType; import ch.ethz.seb.sebserver.gbl.model.sebconfig.AttributeType;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue;
import org.mockito.Mockito; import ch.ethz.seb.sebserver.gbl.util.Cryptor;
public class ExamConfigImportHandlerTest { public class ExamConfigImportHandlerTest {
private static final Function<String, ConfigurationAttribute> attributeResolver = private static final Function<String, ConfigurationAttribute> attributeResolver =
name -> new ConfigurationAttribute( name -> new ConfigurationAttribute(
getId(name), getId(name),
null, name, (name.contains("array")) ? AttributeType.MULTI_SELECTION : null, null, null, null, null, name, (name.contains("array")) ? AttributeType.MULTI_SELECTION : AttributeType.TEXT_FIELD,
null, null, null,
null); null);
private static final Long getId(final String name) { private static final Long getId(final String name) {