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

fixed connection authenticated status warning

Browse source
This commit is contained in:
anhefti 2019-09-09 10:20:04 +02:00
parent e64d2a63e8
commit 2e4e6d4164
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java
View file

@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl;
import java.security.Principal;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
@ -239,10 +240,36 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
userSessionId);
}
final ClientConnection clientConnection = getClientConnection(connectionToken);
ClientConnection clientConnection = getClientConnection(connectionToken);
checkInstitutionalIntegrity(institutionId, clientConnection);
checkExamIntegrity(examId, clientConnection);
if (StringUtils.isNoneBlank(userSessionId)) {
if (StringUtils.isNoneBlank(clientConnection.userSessionId)) {
log.error(
"ClientConnection integrity violation: clientConnection has already a userSessionId: {} : {}",
userSessionId, clientConnection);
throw new IllegalArgumentException(
"ClientConnection integrity violation: clientConnection has already a userSessionId");
}
// create new ClientConnection for update
final ClientConnection authenticatedClientConnection = new ClientConnection(
clientConnection.id,
null,
null,
ConnectionStatus.AUTHENTICATED,
null,
userSessionId,
null,
null,
null);
clientConnection = this.clientConnectionDAO
.save(authenticatedClientConnection)
.getOrThrow();
}
// connection integrity check
if (clientConnection.status == ConnectionStatus.CONNECTION_REQUESTED) {
// TODO discuss if we need a flag on exam domain level that indicates whether unauthenticated connection