From 55872b0314314f1e4e5c033adc5dc7d93c4cf433 Mon Sep 17 00:00:00 2001 From: Guillaume Paris Date: Fri, 17 Jan 2025 10:14:55 +0100 Subject: [PATCH 1/3] [backend] fix python injector missing callback route --- .../src/main/java/io/openbas/rest/inject/InjectApi.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java index 724202f449..f8b853393f 100644 --- a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java +++ b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java @@ -109,10 +109,17 @@ public Inject injectExecutionReception( return injectRepository.save(inject); } + @Secured(ROLE_ADMIN) + @PostMapping(INJECT_URI + "/execution/callback/{injectId}") + public Inject injectExecutionCallback( + @PathVariable String injectId, @Valid @RequestBody InjectExecutionInput input) { + return injectExecutionCallback(null, injectId, input); + } + @Secured(ROLE_ADMIN) @PostMapping(INJECT_URI + "/execution/{agentId}/callback/{injectId}") public Inject injectExecutionCallback( - @PathVariable String agentId, + @PathVariable String agentId, // must allow null @PathVariable String injectId, @Valid @RequestBody InjectExecutionInput input) { Inject inject = injectRepository.findById(injectId).orElseThrow(ElementNotFoundException::new); From b0f814545841ef0374e1689b66bb702987356fa3 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Fri, 17 Jan 2025 10:28:50 +0100 Subject: [PATCH 2/3] Update openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java Co-authored-by: Romuald Lemesle --- openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java index f8b853393f..fc34c3ffb6 100644 --- a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java +++ b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java @@ -119,7 +119,7 @@ public Inject injectExecutionCallback( @Secured(ROLE_ADMIN) @PostMapping(INJECT_URI + "/execution/{agentId}/callback/{injectId}") public Inject injectExecutionCallback( - @PathVariable String agentId, // must allow null + @PathVariable String agentId, // must allow null because http injector used also this method to work. @PathVariable String injectId, @Valid @RequestBody InjectExecutionInput input) { Inject inject = injectRepository.findById(injectId).orElseThrow(ElementNotFoundException::new); From d8505a36ee52d64b0bd47632110b1529fbe4144f Mon Sep 17 00:00:00 2001 From: Guillaume Paris Date: Fri, 17 Jan 2025 10:36:11 +0100 Subject: [PATCH 3/3] [backend] spotless --- .../src/main/java/io/openbas/rest/inject/InjectApi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java index fc34c3ffb6..4e25769e18 100644 --- a/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java +++ b/openbas-api/src/main/java/io/openbas/rest/inject/InjectApi.java @@ -119,7 +119,8 @@ public Inject injectExecutionCallback( @Secured(ROLE_ADMIN) @PostMapping(INJECT_URI + "/execution/{agentId}/callback/{injectId}") public Inject injectExecutionCallback( - @PathVariable String agentId, // must allow null because http injector used also this method to work. + @PathVariable + String agentId, // must allow null because http injector used also this method to work. @PathVariable String injectId, @Valid @RequestBody InjectExecutionInput input) { Inject inject = injectRepository.findById(injectId).orElseThrow(ElementNotFoundException::new);