diff --git a/codecov.yml b/codecov.yml index e06bfdbf..de337b64 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,3 +2,6 @@ coverage: range: "40...75" round: down precision: 2 + +fixes: + -"::seb-server/" diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java index 36bcf565..7c872d1a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java @@ -13,8 +13,11 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; +import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.concurrent.Future; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -54,6 +57,36 @@ public class ExamConfigServiceImpl implements ExamConfigService { private static final Logger log = LoggerFactory.getLogger(ExamConfigServiceImpl.class); + // comma separated list of SEB exam config keys that can be ignored on imports + // See: https://jira.let.ethz.ch/browse/SEBSERV-100 + private static final Set SEB_EXAM_CONFIG_KEYS_TO_IGNORE = new HashSet<>(Arrays.asList( + + // These keys don't exist anymore: + "examConfigKeyContainedKeys", + "allowWLAN", + "insideSebEnableEnableNetworkConnectionSelector", + "ignoreQuitPassword", + "oskBehavior", + "outsideSebEnableChangeAPassword", + "outsideSebEnableEaseOfAccess", + "outsideSebEnableLockThisComputer", + "outsideSebEnableLogOff", + "outsideSebEnableShutDownurlFilterRegex", + "outsideSebEnableStartTaskManager", + "outsideSebEnableSwitchUser", + "outsideSebEnableVmWareClientShade", + "enableURLContentFilter", + "enableURLFilter", + "prohibitedProcesses.windowHandlingProcess", + "backgroundOpenSEBConfig", + + // These keys are only used internally + "urlFilterRegex", + "urlFilterTrustedContent", + "blacklistURLFilter", + "whitelistURLFilter", + "URLFilterIgnoreList")); + private final ExamConfigIO examConfigIO; private final ConfigurationAttributeDAO configurationAttributeDAO; private final ExamConfigurationMapDAO examConfigurationMapDAO;