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

SEBSERV-574 on access denied check if admin and show hinted message

Browse source
This commit is contained in:
anhefti 2024-08-20 11:22:55 +02:00
parent 2d5baeba1c
commit bb0df16a56
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/MonitoringProctoringService.java
View file

@ -12,6 +12,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import ch.ethz.seb.sebserver.gbl.model.user.UserRole;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -348,6 +349,17 @@ public class MonitoringProctoringService {
httpEntity, httpEntity,
String.class); String.class);
if (tokenRequest.getStatusCode() == HttpStatus.UNAUTHORIZED &&
currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER, UserRole.INSTITUTIONAL_ADMIN)) {
log.warn("No Access to Screen Proctoring for user: {}", currentUser.get().username);
_action
.pageContext()
.notifyError(
new LocTextKey("sebserver.monitoring.sps.noaccess"),
new RuntimeException("Please make sure you are assigned as supporter for this Exam"));
return _action;
}
// Open SPS Gui redirect URL with login token (jwt token) in new browser tab // Open SPS Gui redirect URL with login token (jwt token) in new browser tab
final String redirectLocation = redirect.getBody() + "/jwt?token=" + tokenRequest.getBody(); final String redirectLocation = redirect.getBody() + "/jwt?token=" + tokenRequest.getBody();
// final String script = "var win = window.open('', 'seb_screen_proctoring'); win.location.href = '"+ redirectLocation + "';"; // final String script = "var win = window.open('', 'seb_screen_proctoring'); win.location.href = '"+ redirectLocation + "';";
@ -359,7 +371,7 @@ public class MonitoringProctoringService {
} catch (final Exception e) { } catch (final Exception e) {
log.error("Failed to open screen proctoring service group gallery view: ", e); log.error("Failed to open screen proctoring service group gallery view: ", e);
_action.pageContext() _action.pageContext()
.notifyError(new LocTextKey("Failed to open screen proctoring service group gallery view"), e); .notifyError(new LocTextKey("sebserver.monitoring.sps.opengallery.fail"), e);
} }
return _action; return _action;
} }

3
src/main/resources/messages.properties
View file

@ -2423,6 +2423,9 @@ sebserver.monitoring.signaturegrant.signature=App Signature Key Hash
sebserver.monitoring.signaturegrant.tag=Tag sebserver.monitoring.signaturegrant.tag=Tag
sebserver.monitoring.signaturegrant.message.granted=This App Signature Key is already granted for this exam sebserver.monitoring.signaturegrant.message.granted=This App Signature Key is already granted for this exam
sebserver.monitoring.sps.opengallery.fail=Failed to open screen proctoring service group gallery view
sebserver.monitoring.sps.noaccess=No Access to Screen Proctoring
################################ ################################
# Finished Exams # Finished Exams
################################ ################################