From cfb02143cfbfa6c4d06a6a7ad8d0bf831ef96087 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 15 Dec 2022 14:51:57 +0100 Subject: [PATCH] minor fixes, SEB Server Admin rights for reading foreign client connections --- .../authorization/impl/AuthorizationServiceImpl.java | 2 +- .../sebserver/webservice/servicelayer/lms/LmsAPIService.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java index d4d40e1c..dc4fef82 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java @@ -197,7 +197,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { // grants for SEB client connections addPrivilege(EntityType.CLIENT_CONNECTION) .forRole(UserRole.SEB_SERVER_ADMIN) - .withInstitutionalPrivilege(PrivilegeType.READ) + .withBasePrivilege(PrivilegeType.READ) .andForRole(UserRole.INSTITUTIONAL_ADMIN) .withInstitutionalPrivilege(PrivilegeType.READ) .andForRole(UserRole.EXAM_ADMIN) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java index 187c144b..ec2a4c63 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java @@ -114,8 +114,6 @@ public interface LmsAPIService { from == null || (q.startTime != null && (q.startTime.isEqual(from) || q.startTime.isAfter(from))); final DateTime endTime = now.isAfter(from) ? now : from; final boolean fromTimeFilter = (endTime == null || q.endTime == null || endTime.isBefore(q.endTime)); - System.out - .println("************ name: " + name + " " + (nameFilter && (startTimeFilter || fromTimeFilter))); return nameFilter && (startTimeFilter || fromTimeFilter); }; }