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

allow updating client connection in active state

Browse source
This commit is contained in:
anhefti 2021-02-22 13:05:59 +01:00
parent fa327e4e29
commit 290ca046c3
1 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
View file

@ -201,7 +201,12 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
final ClientConnection clientConnection = getClientConnection(connectionToken); final ClientConnection clientConnection = getClientConnection(connectionToken);
checkInstitutionalIntegrity(institutionId, clientConnection); checkInstitutionalIntegrity(institutionId, clientConnection);
checkExamIntegrity(examId, clientConnection); checkExamIdIntegrity(examId, clientConnection);
// If we have an active connection, update the connection data if requested
if (clientConnection.status == ConnectionStatus.ACTIVE) {
return updateActiveConnection(clientConnection, clientAddress, userSessionId);
}
// connection integrity check // connection integrity check
if (clientConnection.status != ConnectionStatus.CONNECTION_REQUESTED) { if (clientConnection.status != ConnectionStatus.CONNECTION_REQUESTED) {
@ -262,6 +267,45 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
}); });
} }
private ClientConnection updateActiveConnection(
final ClientConnection clientConnection,
final String clientAddress,
final String userSessionId) {
final String virtualClientAddress = getVirtualClientAddress(
clientConnection.examId,
clientAddress,
clientConnection.clientAddress);
final ClientConnection updatedClientConnection = this.clientConnectionDAO
.save(new ClientConnection(
clientConnection.id,
null,
null,
null,
null,
(StringUtils.isNotBlank(userSessionId)) ? userSessionId : null,
(StringUtils.isNotBlank(clientAddress)) ? clientAddress : null,
virtualClientAddress,
null,
null,
null,
null))
.getOrThrow();
final ClientConnectionDataInternal activeClientConnection =
reloadConnectionCache(clientConnection.connectionToken);
if (activeClientConnection == null) {
log.warn("Failed to load ClientConnectionDataInternal into cache on update");
} else if (log.isDebugEnabled()) {
log.debug("SEB client connection, successfully updated ClientConnection: {}",
updatedClientConnection);
}
return updatedClientConnection;
}
@Override @Override
public Result<ClientConnection> establishClientConnection( public Result<ClientConnection> establishClientConnection(
final String connectionToken, final String connectionToken,
@ -289,7 +333,7 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
ClientConnection clientConnection = getClientConnection(connectionToken); ClientConnection clientConnection = getClientConnection(connectionToken);
checkInstitutionalIntegrity(institutionId, clientConnection); checkInstitutionalIntegrity(institutionId, clientConnection);
checkExamIntegrity(examId, clientConnection); checkExamIdIntegrity(examId, clientConnection);
clientConnection = updateUserSessionId(userSessionId, clientConnection, examId); clientConnection = updateUserSessionId(userSessionId, clientConnection, examId);
// connection integrity check // connection integrity check
@ -624,7 +668,7 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
.getOrThrow().institutionId; .getOrThrow().institutionId;
} }
private void checkExamIntegrity(final Long examId, final ClientConnection clientConnection) { private void checkExamIdIntegrity(final Long examId, final ClientConnection clientConnection) {
if (examId != null && if (examId != null &&
clientConnection.examId != null && clientConnection.examId != null &&
!examId.equals(clientConnection.examId)) { !examId.equals(clientConnection.examId)) {
@ -703,7 +747,7 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
"Exam is currently on update and locked for new SEB Client connections"); "Exam is currently on update and locked for new SEB Client connections");
} }
// check Exam has an default SEB Exam configuration attached // check Exam has a default SEB Exam configuration attached
if (!this.examSessionService.hasDefaultConfigurationAttached(examId)) { if (!this.examSessionService.hasDefaultConfigurationAttached(examId)) {
throw new APIConstraintViolationException( throw new APIConstraintViolationException(
"Exam is currently running but has no default SEB Exam configuration attached"); "Exam is currently running but has no default SEB Exam configuration attached");