Skip to content

Resolve NPEs in demo installer #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phrocker merged 1 commit into from
Oct 10, 2025
Merged

Resolve NPEs in demo installer #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .local.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SENTRIUS_VERSION=1.1.507
SENTRIUS_VERSION=1.1.510
SENTRIUS_SSH_VERSION=1.1.45
SENTRIUS_KEYCLOAK_VERSION=1.1.60
SENTRIUS_AGENT_VERSION=1.1.51
Expand All @@ -7,4 +7,4 @@ LLMPROXY_VERSION=1.0.88
LAUNCHER_VERSION=1.0.91
AGENTPROXY_VERSION=1.0.92
SSHPROXY_VERSION=1.0.91
RDPPROXY_VERSION=1.0.121
RDPPROXY_VERSION=1.0.122
4 changes: 2 additions & 2 deletions .local.env.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SENTRIUS_VERSION=1.1.507
SENTRIUS_VERSION=1.1.510
SENTRIUS_SSH_VERSION=1.1.45
SENTRIUS_KEYCLOAK_VERSION=1.1.60
SENTRIUS_AGENT_VERSION=1.1.51
Expand All @@ -7,4 +7,4 @@ LLMPROXY_VERSION=1.0.88
LAUNCHER_VERSION=1.0.91
AGENTPROXY_VERSION=1.0.92
SSHPROXY_VERSION=1.0.91
RDPPROXY_VERSION=1.0.121
RDPPROXY_VERSION=1.0.122
9 changes: 4 additions & 5 deletions api/src/main/java/io/sentrius/sso/startup/ConfigurationApplicationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ protected List<User> createUsers(
throws SQLException, GeneralSecurityException {
List<User> users = new ArrayList<>();
Map<Long, Set<Long>> assignments = new HashMap<>();
if (null != installConfiguration.getUsers()) {
if (null != installConfiguration.getNpes()) {
for (var userDTO : installConfiguration.getUsers()) {
if (userDTO.getPassword() == null || userDTO.getPassword().isEmpty()) {
log.warn("User {} has no password");
Expand Down Expand Up @@ -613,8 +613,6 @@ protected List<User> createUsers(

User user = User.from(userDTO, type.get());

user.setIdentityType(IdentityType.NON_PERSON_ENTITY);



User finalUser = user;
Expand Down Expand Up @@ -714,8 +712,8 @@ protected List<User> createNPEs(
throws SQLException, GeneralSecurityException {
List<User> users = new ArrayList<>();
Map<Long, Set<Long>> assignments = new HashMap<>();
if (null != installConfiguration.getUsers()) {
for (var userDTO : installConfiguration.getUsers()) {
if (null != installConfiguration.getNpes()) {
for (var userDTO : installConfiguration.getNpes()) {
if (userDTO.getPassword() == null || userDTO.getPassword().isEmpty()) {
log.warn("User {} has no password");
userDTO.setPassword(UUID.randomUUID().toString());
Expand All @@ -742,6 +740,7 @@ protected List<User> createNPEs(
}

User user = User.from(userDTO, type.get());
user.setIdentityType(IdentityType.NON_PERSON_ENTITY);



Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/io/sentrius/sso/core/dto/HostSystemDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ public class HostSystemDTO {

private String authorizedKeys;

private boolean isRdp;
@Builder.Default
private boolean isRdp = false;
private boolean rdpUser;
private boolean rdpPassword;

Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/io/sentrius/sso/core/dto/UserDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ public class UserDTO {
public String team;
public String password;

@Builder.Default
public Boolean isNpe= false;

@Builder.Default
public String status = "ACTIVE";

Expand Down
6 changes: 6 additions & 0 deletions dataplane/src/main/java/io/sentrius/sso/core/model/HostSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@ public static HostSystem fromDTO(HostSystemDTO dto) {
hostSystem.setErrorMsg(dto.getErrorMsg());
hostSystem.setPort(dto.getPort());
hostSystem.setSshUser(dto.getSshUser());
if (dto.isRdp()) {
hostSystem.setRdpEnabled(dto.isRdp());
hostSystem.setRdpUser(dto.isRdpUser() ? dto.getSshUser() : "");
hostSystem.setRdpPassword(dto.isRdpPassword() ? dto.getPassword() : "");
}

return hostSystem;
}

Expand Down
6 changes: 6 additions & 0 deletions docker/sentrius/demoInstaller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ systems:
port: 22
host: sentrius-bad-ssh
authorizedKeys: ~/.ssh/authorized_keys
- displayName: sentrius-rdp-test
sshUser: ubuntu
password: ubuntu
rdp: true
host: sentrius-rdp

## Define groups of users who are assigned to systems
## also entails the configuration that is applied to groupf
Expand All @@ -63,6 +68,7 @@ managementGroups:
description: test group
systems:
- SSH-HOST
- sentrius-rdp-test
configuration:
configurationName: testConfig
terminalsLocked: false
Expand Down