ujpdates

Author: phrocker

.gcp.env

@@ -1,4 +1,4 @@
-SENTRIUS_VERSION=1.0.39
+SENTRIUS_VERSION=1.0.44
 SENTRIUS_SSH_VERSION=1.0.4
 SENTRIUS_KEYCLOAK_VERSION=1.0.7
-SENTRIUS_AGENT_VERSION=1.0.17
+SENTRIUS_AGENT_VERSION=1.0.18

analyagents/pom.xml

@@ -67,6 +67,11 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.snowflake</groupId>
+      <artifactId>snowflake-ingest-sdk</artifactId>
+      <version>${snowflake-ingest-version}</version>
+    </dependency>
   </dependencies>
 
   <build>

analyagents/src/main/java/io/sentrius/agent/analysis/agents/sessions/SessionAnalyticsAgent.java

@@ -61,8 +61,9 @@ public void processSessions() {
         List<TerminalSessionMetadata> unprocessedSessions = sessionMetadataService.getSessionsByState("CLOSED").stream()
             .filter(session -> !processedSessionIds.contains(session.getId()))
             .collect(Collectors.toList());
-
+        long count = 0;
         for (TerminalSessionMetadata session : unprocessedSessions) {
+            count++;
             try {
                 processSession(session);
                 // ACTIVE -> INACTIVE -> CLOSED -> PROCESSED
@@ -75,7 +76,7 @@ public void processSessions() {
             sessionMetadataService.saveSession(session);
         }
 
-        log.info("Finished processing sessions");
+        log.info("Finished processing {} sessions ", count);
     }
 /* TODO - Implement this
     @Scheduled(fixedDelay = 60000) // Waits 60 seconds after the previous run completes

analyagents/src/main/java/io/sentrius/agent/analysis/sinks/log/LogSink.java

@@ -0,0 +1,9 @@
+package io.sentrius.agent.analysis.sinks.log;
+
+import java.util.List;
+import io.sentrius.sso.core.model.sessions.TerminalLogs;
+
+public interface LogSink {
+
+    void process(List<TerminalLogs> logs);
+}

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

@@ -34,8 +34,8 @@ public static String createErrorHash(StackTraceElement[] trace, String t) {
     @RequestMapping("/error")
     public String handleError(HttpServletRequest request, Model model) {
         // Retrieve error details
-        Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
-        Throwable ex = (Throwable) request.getAttribute("javax.servlet.error.exception");
+        Integer statusCode = (Integer) request.getAttribute("jakarta.servlet.error.status_code");
+        Throwable ex = (Throwable) request.getAttribute("jakarta.servlet.error.exception");
 
         // Log error details (optional)
         if (ex != null) {

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

@@ -22,8 +22,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Slf4j
 @Controller
@@ -76,9 +78,10 @@ public ResponseEntity<ExternalIntegrationDTO> addJiraIntegration(HttpServletRequ
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_MANAGE_APPLICATION})
     public ResponseEntity<ExternalIntegrationDTO> addOpenaiIntegration(HttpServletRequest request,
                                                                   HttpServletResponse response,
-                                                                     ExternalIntegrationDTO integrationDTO)
+                                                                    @RequestBody ExternalIntegrationDTO integrationDTO)
         throws JsonProcessingException {
 
+        log.info("ahh");
 
         var json = JsonUtil.MAPPER.writeValueAsString(integrationDTO);
         IntegrationSecurityToken token = IntegrationSecurityToken.builder()

api/src/main/resources/templates/sso/integrations/add_openai.html

@@ -64,12 +64,13 @@
             const form = event.target;
             const formData = new FormData(form);
             const jsonData = Object.fromEntries(formData.entries());
-
+            var csrf = "[[${_csrf.token}]]"
             try {
                 const response = await fetch(form.action, {
                     method: "POST",
                     headers: {
-                        "Content-Type": "application/json"
+                        "Content-Type": "application/json",
+                        "X-CSRF-TOKEN": csrf
                     },
                     body: JSON.stringify(jsonData)
                 });

core/src/main/java/io/sentrius/sso/automation/auditing/rules/TwoPartyAIMonitor.java

@@ -183,7 +183,8 @@ public Optional<Trigger> onMessage(Session.TerminalMessage text) {
                 analysis.get();
 
                 if (llmResponse.get() != null && llmQuestion.get() != null) {
-                    Trigger trg = llmQuestion.get() != null ? new Trigger(TriggerAction.PROMPT_ACTION, llmResponse.get(),
+                    Trigger trg = llmQuestion.get() != null && enableLLMQuestions ? new Trigger(TriggerAction.PROMPT_ACTION,
+                        llmResponse.get(),
                         llmQuestion.get()) :
                         new Trigger(TriggerAction.PERSISTENT_MESSAGE, llmResponse.get());
                     return Optional.of(trg);

core/src/main/java/io/sentrius/sso/core/config/SystemOptions.java

@@ -236,7 +236,7 @@ public Map<String, SystemOption> getOptions() throws IllegalAccessException {
         String fieldName = field.getName();
         Object fieldValue = field.get(this);
 
-        log.debug("Field: {} Value: {}", fieldName, fieldValue);
+        log.trace("Field: {} Value: {}", fieldName, fieldValue);
 
         // Create a SystemOption object with the field details
         var sysOpt = SystemOption.builder()

core/src/main/java/io/sentrius/sso/core/model/security/AccessControlAspect.java

@@ -12,6 +12,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
@@ -25,6 +26,7 @@
 
 @Aspect
 @Component
+@Slf4j
 @RequiredArgsConstructor
 public class AccessControlAspect {
 
@@ -44,18 +46,21 @@ public void checkLimitAccess(LimitAccess limitAccess) throws SQLException, Gener
             // Get the required roles from the annotation
             for (var userAccess : accessAnnotation.userAccess()) {
                 if (!canAccess(operatingUser, userAccess)) {
+                    log.info("Access Denied to {} at {}", operatingUser, userAccess);
                     canAccess = false;
                     break;
                 }
             }
             for (var appAccess : accessAnnotation.applicationAccess()) {
                 if (!canAccess(operatingUser, appAccess)) {
+                    log.info("Access Denied to {} at {}", operatingUser, appAccess);
                     canAccess = false;
                     break;
                 }
             }
 
             if (!canAccess) {
+
                 throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Access Denied to ");
             }
         }