Merge pull request #108 from SentriusLLC/fix_npes

Resolve NPEs in demo installer

Author: phrocker

.local.env

@@ -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
@@ -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

.local.env.bak

@@ -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
@@ -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

api/src/main/java/io/sentrius/sso/startup/ConfigurationApplicationTask.java

@@ -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");
@@ -613,8 +613,6 @@ protected List<User> createUsers(
 
                 User user = User.from(userDTO, type.get());
 
-                user.setIdentityType(IdentityType.NON_PERSON_ENTITY);
-
 
 
                 User finalUser = user;
@@ -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());
@@ -742,6 +740,7 @@ protected List<User> createNPEs(
                 }
 
                 User user = User.from(userDTO, type.get());
+                user.setIdentityType(IdentityType.NON_PERSON_ENTITY);
 
 
 

core/src/main/java/io/sentrius/sso/core/dto/HostSystemDTO.java

@@ -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;
 

core/src/main/java/io/sentrius/sso/core/dto/UserDTO.java

@@ -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";
 

dataplane/src/main/java/io/sentrius/sso/core/model/HostSystem.java

@@ -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;
     }
 

docker/sentrius/demoInstaller.yml

@@ -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
@@ -63,6 +68,7 @@ managementGroups:
     description: test group
     systems:
       - SSH-HOST
+      - sentrius-rdp-test
     configuration:
       configurationName: testConfig
       terminalsLocked: false