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

fix codecov

Browse source
This commit is contained in:
anhefti 2020-01-14 14:56:33 +01:00
parent 56a23544df
commit a2c631e8f8
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
codecov.yml
View file

@ -2,3 +2,6 @@ coverage:
range: "40...75" range: "40...75"
round: down round: down
precision: 2 precision: 2
fixes:
-"::seb-server/"

33
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigServiceImpl.java
View file

@ -13,8 +13,11 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PipedInputStream; import java.io.PipedInputStream;
import java.io.PipedOutputStream; import java.io.PipedOutputStream;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -54,6 +57,36 @@ public class ExamConfigServiceImpl implements ExamConfigService {
private static final Logger log = LoggerFactory.getLogger(ExamConfigServiceImpl.class); 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<String> 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 ExamConfigIO examConfigIO;
private final ConfigurationAttributeDAO configurationAttributeDAO; private final ConfigurationAttributeDAO configurationAttributeDAO;
private final ExamConfigurationMapDAO examConfigurationMapDAO; private final ExamConfigurationMapDAO examConfigurationMapDAO;