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

SEBSERV-414 signature + removed firefox as permitted process

Browse source
This commit is contained in:
anhefti 2024-01-17 15:13:05 +01:00
parent 23643b0f0a
commit f3d2976045
5 changed files with 13 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
View file

@ -473,7 +473,7 @@ public class MonitoringRunningExam implements TemplateComposer {
final ActionDefinition hideActionDef) {
final int numOfConnections = filter.getNumOfConnections(status);
PageAction action;
final PageAction action;
if (filter.isStatusHidden(status)) {
action = actionBuilder.newAction(showActionDef)
.withExec(showStateViewAction(filter, clientTable, status))
@ -514,7 +514,7 @@ public class MonitoringRunningExam implements TemplateComposer {
final ActionDefinition hideActionDef) {
final int numOfConnections = filter.getNumOfConnections(clientGroup.id);
PageAction action;
final PageAction action;
if (filter.isClientGroupHidden(clientGroup.id)) {
action = actionBuilder.newAction(showActionDef)
.withExec(showClientGroupAction(filter, clientTable, clientGroup.id))

3
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java
View file

@ -320,7 +320,8 @@ public class ExamMonitoringController {
required = false) final String hiddenClientGroups) {
// TODO respond this within another Thread-pool (Executor)
// TODO try to cache some monitoring data throughout multiple requests (for about 2 sec.)
// TODO try to cache some MonitoringSEBConnectionData throughout multiple requests (for about 2 sec.)
// problem: different filter settings, maybe cache unfiltered data and then just filter cached data per request
final Exam runningExam = checkPrivileges(institutionId, examId);

30
src/main/resources/config/initialPermittedProcesses.xml
View file

@ -4,36 +4,6 @@
<dict>
<key>permittedProcesses</key>
<array>
<dict>
<key>active</key>
<true />
<key>allowUserToChooseApp</key>
<false />
<key>arguments</key>
<array></array>
<key>autostart</key>
<true />
<key>description</key>
<string />
<key>executable</key>
<string>firefox.exe</string>
<key>iconInTaskbar</key>
<true />
<key>identifier</key>
<string>Firefox</string>
<key>os</key>
<integer>1</integer>
<key>path</key>
<string>../xulrunner/</string>
<key>runInBackground</key>
<false />
<key>strongKill</key>
<true />
<key>title</key>
<string>SEB</string>
<key>originalName</key>
<string>firefox.exe</string>
</dict>
</array>
</dict>
</plist>

9
src/main/resources/config/sql/base/V27__exam_config_gui_additions_v1_6.sql
View file

@ -53,4 +53,11 @@ INSERT IGNORE INTO configuration_attribute VALUES
(1583, 'systemAlwaysOn', 'CHECKBOX', null, null, null, null, 'true'),
(1584, 'displayAlwaysOn', 'CHECKBOX', null, null, null, null, 'true'),
(1585, 'disableSessionChangeLockScreen', 'CHECKBOX', null, null, null, null, 'false')
;
;
-- ----------------------------------------------------------------
-- Add new SEB Settings GUI (SEBSERV-405)
-- ----------------------------------------------------------------
INSERT IGNORE INTO orientation (config_attribute_id, template_id, view_id, group_id, x_position, y_position, width, height, title) VALUES
(1200, 0, 6, null, 0, 6, 1, 1, 'LEFT');

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

@ -1454,6 +1454,7 @@ sebserver.examconfig.props.label.permittedProcesses.description.tooltip=Optional
sebserver.examconfig.props.label.permittedProcesses.executable=Executable
sebserver.examconfig.props.label.permittedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path,<br/> only the filename of the exe file (like calc.exe).
sebserver.examconfig.props.label.permittedProcesses.originalName=Original Name
sebserver.examconfig.props.label.permittedProcesses.signature=Signature
sebserver.examconfig.props.label.permittedProcesses.allowedExecutables=Window handling process
sebserver.examconfig.props.label.permittedProcesses.path=Path
sebserver.examconfig.props.label.permittedProcesses.arguments=Arguments