Fix issue with registry links

Author: phrocker

.local.env

@@ -1,8 +1,8 @@
-SENTRIUS_VERSION=1.1.170
+SENTRIUS_VERSION=1.1.171
 SENTRIUS_SSH_VERSION=1.1.33
 SENTRIUS_KEYCLOAK_VERSION=1.1.46
 SENTRIUS_AGENT_VERSION=1.1.33
 SENTRIUS_AI_AGENT_VERSION=1.1.60
 LLMPROXY_VERSION=1.0.43
-LAUNCHER_VERSION=1.0.49
+LAUNCHER_VERSION=1.0.50
 AGENTPROXY_VERSION=1.0.60

.local.env.bak

@@ -1,8 +1,8 @@
-SENTRIUS_VERSION=1.1.170
+SENTRIUS_VERSION=1.1.171
 SENTRIUS_SSH_VERSION=1.1.33
 SENTRIUS_KEYCLOAK_VERSION=1.1.46
 SENTRIUS_AGENT_VERSION=1.1.33
 SENTRIUS_AI_AGENT_VERSION=1.1.60
 LLMPROXY_VERSION=1.0.43
-LAUNCHER_VERSION=1.0.49
+LAUNCHER_VERSION=1.0.50
 AGENTPROXY_VERSION=1.0.60

agent-launcher/src/main/java/io/sentrius/agent/launcher/service/PodLauncherService.java

@@ -43,17 +43,18 @@ private String buildAgentCallbackUrl(String agentId) {
 
 
     public V1Pod launchAgentPod(String agentId, String callbackUrl) throws Exception {
+        var myAgentRegistry = "";
         if (agentRegistry != null ) {
             if ("local".equalsIgnoreCase(agentRegistry)) {
-                agentRegistry = "";
+                myAgentRegistry = "";
             } else if (!agentRegistry.endsWith("/")) {
-                agentRegistry += "/";
+                myAgentRegistry += "/";
             }
         }
 
         var constructedCallbackUrl = buildAgentCallbackUrl(agentId);
 
-        String image = String.format("%ssentrius-launchable-agent:%s", agentRegistry, agentVersion);
+        String image = String.format("%ssentrius-launchable-agent:%s", myAgentRegistry, agentVersion);
 
         log.info("Launching agent pod with ID: {}, Image: {}, Callback URL: {}", agentId, image, callbackUrl);
         V1Pod pod = new V1Pod()

api/src/main/java/io/sentrius/sso/controllers/api/AgentBootstrapController.java

@@ -5,6 +5,8 @@
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.Map;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import io.sentrius.sso.config.ApiPaths;
 import io.sentrius.sso.core.annotations.LimitAccess;
 import io.sentrius.sso.core.config.SystemOptions;
@@ -27,6 +29,7 @@
 import io.sentrius.sso.core.services.security.ZeroTrustAccessTokenService;
 import io.sentrius.sso.core.services.security.ZeroTrustRequestService;
 import io.sentrius.sso.core.services.terminal.SessionTrackingService;
+import io.sentrius.sso.core.trust.ATPLPolicy;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.transaction.Transactional;
@@ -52,7 +55,7 @@ public class AgentBootstrapController extends BaseController {
     final ZeroTrustRequestService ztrService;
     final AgentService agentService;
     private final ZeroTrustClientService zeroTrustClientService;
-
+    private final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
 
     @Value("${sentrius.agent.register.bootstrap.allow:false}")
     private boolean allowRegistration;
@@ -133,9 +136,19 @@ public ResponseEntity<AgentRegistrationDTO> bootstrap(
                         throw new RuntimeException(defaultPolicyFile + "not found on classpath");
 
                     }
+
+
                     String defaultYaml = new String(terminalHelperStream.readAllBytes());
+                    ATPLPolicy policy = yamlMapper.readValue(defaultYaml, ATPLPolicy.class);
+                    var latest = atplPolicyService.getLatestPolicyEntity( policy.getPolicyId() );
+                    if (latest.isEmpty() ) {
+                        var addedPolicy = atplPolicyService.createPolicy(user, defaultYaml);
+                    }
+                    else {
+                        atplPolicyService.assignPolicyToUser(user, latest.get());
+                    }
                     log.info("Default policy file: {}", defaultPolicyFile);
-                    var policy = atplPolicyService.createPolicy(user, defaultYaml);
+
                 }
 
             }

dataplane/src/main/java/io/sentrius/sso/core/services/ATPLPolicyService.java

@@ -74,6 +74,17 @@ public Optional<ATPLPolicy> getLatestPolicy(String policyId) {
             .orElse(Optional.empty());
     }
 
+    @Transactional
+    public Optional<ATPLPolicyEntity> getLatestPolicyEntity(String policyId) {
+        return repository.findAllByPolicyId(policyId).stream()
+            .max(Comparator.comparingInt(entity -> {
+                String v = entity.getVersion();
+                return v != null && v.startsWith("v")
+                    ? Integer.parseInt(v.substring(1))
+                    : 0;
+            }));
+    }
+
     public Optional<ATPLPolicy> getPolicy(User operatingUser) {
         List<AgentPolicyAssignment> assignments = agentPolicyAssignmentRepository.findByUserUsernameOrderByAssignedAtDesc(operatingUser.getUsername());