fix issues with jira controller

Author: phrocker

.local.env

@@ -1,8 +1,8 @@
-SENTRIUS_VERSION=1.1.320
-SENTRIUS_SSH_VERSION=1.1.40
-SENTRIUS_KEYCLOAK_VERSION=1.1.52
-SENTRIUS_AGENT_VERSION=1.1.41
-SENTRIUS_AI_AGENT_VERSION=1.1.255
-LLMPROXY_VERSION=1.0.74
-LAUNCHER_VERSION=1.0.81
-AGENTPROXY_VERSION=1.0.74
+SENTRIUS_VERSION=1.1.323
+SENTRIUS_SSH_VERSION=1.1.41
+SENTRIUS_KEYCLOAK_VERSION=1.1.53
+SENTRIUS_AGENT_VERSION=1.1.42
+SENTRIUS_AI_AGENT_VERSION=1.1.258
+LLMPROXY_VERSION=1.0.76
+LAUNCHER_VERSION=1.0.82
+AGENTPROXY_VERSION=1.0.75

.local.env.bak

@@ -1,8 +1,8 @@
-SENTRIUS_VERSION=1.1.319
-SENTRIUS_SSH_VERSION=1.1.40
-SENTRIUS_KEYCLOAK_VERSION=1.1.52
-SENTRIUS_AGENT_VERSION=1.1.41
-SENTRIUS_AI_AGENT_VERSION=1.1.254
-LLMPROXY_VERSION=1.0.73
-LAUNCHER_VERSION=1.0.81
-AGENTPROXY_VERSION=1.0.74
+SENTRIUS_VERSION=1.1.323
+SENTRIUS_SSH_VERSION=1.1.41
+SENTRIUS_KEYCLOAK_VERSION=1.1.53
+SENTRIUS_AGENT_VERSION=1.1.42
+SENTRIUS_AI_AGENT_VERSION=1.1.258
+LLMPROXY_VERSION=1.0.76
+LAUNCHER_VERSION=1.0.82
+AGENTPROXY_VERSION=1.0.75

ai-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/VerbRegistry.java

@@ -17,6 +17,7 @@
 import io.sentrius.sso.core.services.agents.ZeroTrustClientService;
 import io.sentrius.sso.core.services.capabilities.EndpointScanningService;
 import io.sentrius.sso.core.utils.JsonUtil;
+import io.sentrius.sso.genai.Message;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
@@ -236,6 +237,7 @@ public VerbResponse execute(AgentExecution agentExecution,
             } catch (Exception e) {
                 log.info(method.getName() + " failed", e);
                 e.printStackTrace();
+                contextDTO.addMessages(Message.builder().role("system").content("Previous request failed: " + e.getMessage()).build());
                 throw new RuntimeException("Failed to execute verb: " + verb, e);
             }
         }

ai-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/TerminalVerbs.java

@@ -50,13 +50,13 @@ public TerminalVerbs(ZeroTrustClientService zeroTrustClientService, LLMService l
     /**
      * Retrieves a list of currently open terminals.
      *
-     * @param args A map of arguments for the operation (currently unused).
+
      * @return An `ArrayNode` containing the list of open terminals.
      * @throws ZtatException If there is an error during the operation.
      */
     @Verb(name = "list_open_terminals", description = "Retrieves a list of currently open terminals.",
          requiresTokenManagement = true)
-    public ArrayNode listTerminals(TokenDTO token, Map<String, Object> args) throws ZtatException {
+    public ArrayNode listTerminals(TokenDTO token, AgentExecutionContextDTO execution) throws ZtatException {
         try {
             String response = zeroTrustClientService.callGetOnApi(token, "/ssh/terminal/list/all");
             if (response == null) {
@@ -72,13 +72,12 @@ public ArrayNode listTerminals(TokenDTO token, Map<String, Object> args) throws
     /**
      * Retrieves a list of currently open terminals.
      *
-     * @param args A map of arguments for the operation (currently unused).
      * @return An `ArrayNode` containing the list of open terminals.
      * @throws ZtatException If there is an error during the operation.
      */
     @Verb(name = "list_systems", description = "Retrieves a list of available systems. These are not connected " +
-        "sessions.", requiresTokenManagement = true)
-    public List<HostSystemDTO> listSystem(AgentExecution execution, Map<String, Object> args) throws ZtatException {
+        "sessions.", returnName = "systems", requiresTokenManagement = true)
+    public List<HostSystemDTO> listSystem(AgentExecution execution, AgentExecutionContextDTO dto) throws ZtatException {
         try {
             List<HostSystemDTO> response = zeroTrustClientService.callGetOnApi(execution, "/api/v1/enclaves/hosts/list/all");
 

ai-agent/src/test/java/io/sentrius/sentrius/analysis/agents/verbs/TerminalVerbsTest.java

@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.sentrius.agent.analysis.agents.verbs.TerminalVerbs;
 import io.sentrius.sso.core.dto.HostSystemDTO;
+import io.sentrius.sso.core.dto.agents.AgentExecutionContextDTO;
 import io.sentrius.sso.core.exceptions.ZtatException;
 import io.sentrius.sso.core.services.agents.LLMService;
 import io.sentrius.sso.core.services.agents.ZeroTrustClientService;
@@ -42,7 +43,7 @@ void listTerminalsReturnsArrayNodeWhenApiCallSucceeds() throws Exception, ZtatEx
         String mockResponse = "[{\"id\":1,\"name\":\"Terminal1\"},{\"id\":2,\"name\":\"Terminal2\"}]";
 
         when(zeroTrustClientService.callGetOnApi(isNull(), "/ssh/terminal/list/all")).thenReturn(mockResponse);
-        ArrayNode result = terminalVerbs.listTerminals(null, new HashMap<>());
+        ArrayNode result = terminalVerbs.listTerminals(null, AgentExecutionContextDTO.builder().build());
 
         assertNotNull(result);
         assertEquals(2, result.size());
@@ -53,7 +54,7 @@ void listTerminalsReturnsArrayNodeWhenApiCallSucceeds() throws Exception, ZtatEx
     void listTerminalsThrowsRuntimeExceptionWhenApiCallFails() throws ZtatException {
         when(zeroTrustClientService.callGetOnApi(isNull(), "/ssh/terminal/list/all")).thenThrow(new RuntimeException("API error"));
 
-        assertThrows(RuntimeException.class, () -> terminalVerbs.listTerminals(null, new HashMap<>()));
+        assertThrows(RuntimeException.class, () -> terminalVerbs.listTerminals(null, AgentExecutionContextDTO.builder().build()));
     }
 
   //  @Test

integration-proxy/src/main/java/io/sentrius/sso/controllers/api/JiraProxyController.java

@@ -16,7 +16,6 @@
 import io.sentrius.sso.core.integrations.ticketing.JiraService;
 import io.sentrius.sso.core.model.security.IntegrationSecurityToken;
 import io.sentrius.sso.core.model.security.enums.ApplicationAccessEnum;
-import io.sentrius.sso.core.model.verbs.Verb;
 import io.sentrius.sso.core.services.ErrorOutputService;
 import io.sentrius.sso.core.services.UserService;
 import io.sentrius.sso.core.services.security.IntegrationSecurityTokenService;
@@ -61,12 +60,6 @@ protected JiraProxyController(
 
     @GetMapping("/rest/api/3/search")
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_LOG_IN})
-    @Verb( name="search_jira",
-           description="Search for JIRA tickets using JQL or query parameters",
-           paramDescriptions = {
-               "jql - JIRA Query Language string to search for tickets",
-               "query - Alternative search query string",
-           }, requiresTokenManagement = true)
     public ResponseEntity<?> searchForJiraIssue(
         @RequestHeader("Authorization") String token,
         @RequestParam(value = "jql", required = false) String jql,
@@ -123,11 +116,6 @@ public ResponseEntity<?> searchForJiraIssue(
     }
 
     @GetMapping("/rest/api/3/issue")
-    @Verb( name="retrieve_jira_issue",
-        description="Retrieves jira issue by key",
-        paramDescriptions = {
-            "issueKey - issue key to retrieve",
-        }, requiresTokenManagement = true)
     @LimitAccess(applicationAccess = {ApplicationAccessEnum.CAN_LOG_IN})
     public ResponseEntity<?> getJiraIssue(
         @RequestHeader("Authorization") String token,