Skip to content

Commit 424e659

Browse files
committed
fix document service
1 parent 6f5c610 commit 424e659

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.azure.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
SENTRIUS_VERSION=1.1.105
1+
SENTRIUS_VERSION=1.1.108
22
SENTRIUS_SSH_VERSION=1.1.12
33
SENTRIUS_KEYCLOAK_VERSION=1.1.15
44
SENTRIUS_AGENT_VERSION=1.1.24
55
SENTRIUS_AI_AGENT_VERSION=1.1.5
66
LLMPROXY_VERSION=1.1.5
77
LAUNCHER_VERSION=1.1.6
8-
AGENTPROXY_VERSION=1.1.6
8+
AGENTPROXY_VERSION=1.1.8
99
SSHPROXY_VERSION=1.1.5
1010
RDPPROXY_VERSION=1.1.5
1111
GITHUB_MCP_VERSION=1.1.5

api/src/main/java/io/sentrius/sso/controllers/api/users/UserApiController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.List;
88
import java.util.Map;
99
import java.util.Optional;
10+
import java.util.stream.Collectors;
1011
import com.fasterxml.jackson.core.JsonProcessingException;
1112
import com.fasterxml.jackson.databind.JsonNode;
1213
import com.fasterxml.jackson.databind.node.BooleanNode;
@@ -347,7 +348,8 @@ public ResponseEntity<List<UserTypeDTO>> getUserTypes() throws GeneralSecurityEx
347348
var userDtos = userService.getUserTypeList();
348349
userDtos.forEach( userDto -> {
349350
try {
350-
351+
// remove the zero base access set items.
352+
userDto.setAccessSet(userDto.getAccessSet().stream().filter(x -> !x.contains("CANNOT")).collect(Collectors.toSet()));
351353
if (userDto.getId() > 0) {
352354
userDto.setDtoId(cryptoService.encrypt(userDto.getId().toString()));
353355
}

api/src/main/java/io/sentrius/sso/controllers/view/UserController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ public void processUserSettings(String jsonConfig, List<SystemOption> userOption
167167

168168
@GetMapping("/list")
169169
public String listUsers(Model model) {
170-
model.addAttribute("globalAccessSet", UserType.createSuperUser().getAccessSet());
170+
model.addAttribute("globalAccessSet",
171+
UserType.createSuperUser().getAccessSet().stream().filter(x -> !x.startsWith("CANNOT")).collect(Collectors.toSet()));
171172

172173
return "sso/users/list_users";
173174
}

dataplane/src/main/java/io/sentrius/sso/core/services/documents/DocumentService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import lombok.extern.slf4j.Slf4j;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Value;
13+
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
1314
import org.springframework.data.domain.Page;
1415
import org.springframework.data.domain.PageRequest;
1516
import org.springframework.data.domain.Pageable;
@@ -36,6 +37,7 @@
3637
*/
3738
@Slf4j
3839
@Service
40+
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
3941
public class DocumentService {
4042

4143
private final DocumentRepository documentRepository;

0 commit comments

Comments
 (0)