Skip to content

[frontend/backend] chunk 1 scenario assistant #3225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ private ContractSelect obfuscatorField() {

private ContractExpectations expectations() {
return expectationsField(
"expectations",
"Expectations",
List.of(
this.expectationBuilderService.buildPreventionExpectation(),
this.expectationBuilderService.buildDetectionExpectation()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ public List<Contract> contracts() {
""";
// We include the expectations for challenges
ContractExpectations expectationsField =
expectationsField(
"expectations",
"Expectations",
List.of(this.expectationBuilderService.buildChallengeExpectation()));
expectationsField(List.of(this.expectationBuilderService.buildChallengeExpectation()));
List<ContractElement> publishInstance =
contractBuilder()
.mandatory(challengeField("challenges", "Challenges", Multiple))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,7 @@ public List<Contract> contracts() {
""";
ContractCheckbox emailingField = checkboxField("emailing", "Send email", true);
ContractExpectations expectationsField =
expectationsField(
"expectations",
"Expectations",
List.of(this.expectationBuilderService.buildArticleExpectation()));
expectationsField(List.of(this.expectationBuilderService.buildArticleExpectation()));
List<ContractElement> publishInstance =
contractBuilder()
// built in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public List<Contract> contracts() {
VariableType.String,
One);
// Contracts
ContractExpectations expectationsField = expectationsField("expectations", "Expectations");
ContractExpectations expectationsField = expectationsField();
ContractConfig contractConfig = getConfig();
// Standard contract
List<ContractElement> standardInstance =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ManualContract extends Contractor {
public ManualContract() {

ContractElement teams = teamField("teams", "Teams", Multiple);
ContractElement expectations = expectationsField("expectations", "Expectations");
ContractElement expectations = expectationsField();

Map<SupportedLanguage, String> label = Map.of(en, "Manual", fr, "Manuel");
config = new ContractConfig(TYPE, label, "#009688", "#009688", "/img/manual.png", isExpose());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
VariableType.String,
One);
// Contracts
ContractExpectations expectationsField = expectationsField("expectations", "Expectations");
ContractExpectations expectationsField = expectationsField();

Check warning on line 74 in openbas-api/src/main/java/io/openbas/injectors/opencti/OpenCTIContract.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/injectors/opencti/OpenCTIContract.java#L74

Added line #L74 was not covered by tests
ContractConfig contractConfig = getConfig();
List<ContractElement> createCaseInstance =
contractBuilder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
@Override
public List<Contract> contracts() {
ContractConfig contractConfig = getConfig();
ContractExpectations expectationsField = expectationsField("expectations", "Expectations");
ContractExpectations expectationsField = expectationsField();

Check warning on line 60 in openbas-api/src/main/java/io/openbas/injectors/ovh/OvhSmsContract.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/injectors/ovh/OvhSmsContract.java#L60

Added line #L60 was not covered by tests
List<ContractElement> instance =
contractBuilder()
.mandatory(teamField("teams", "Teams", Multiple))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static io.openbas.database.model.User.ROLE_ADMIN;
import static io.openbas.database.model.User.ROLE_USER;
import static io.openbas.database.specification.EndpointSpecification.fromIds;
import static io.openbas.helper.StreamHelper.fromIterable;

import io.openbas.aop.LogExecutionTime;
Expand Down Expand Up @@ -131,7 +130,7 @@
@PostMapping(ENDPOINT_URI + "/find")
@Transactional(readOnly = true)
public List<Endpoint> findEndpoints(@RequestBody @Valid @NotNull final List<String> endpointIds) {
return this.endpointRepository.findAll(fromIds(endpointIds));
return this.endpointService.endpoints(endpointIds);

Check warning on line 133 in openbas-api/src/main/java/io/openbas/rest/asset/endpoint/EndpointApi.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/rest/asset/endpoint/EndpointApi.java#L133

Added line #L133 was not covered by tests
}

@Secured(ROLE_ADMIN)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
import io.openbas.database.repository.*;
import io.openbas.rest.exception.ElementNotFoundException;
import io.openbas.rest.helper.RestBehavior;
import io.openbas.rest.inject.form.InjectAssistantInput;
import io.openbas.rest.inject.form.InjectInput;
import io.openbas.rest.inject.form.InjectUpdateActivationInput;
import io.openbas.rest.inject.output.InjectOutput;
import io.openbas.rest.inject.output.InjectTestStatusOutput;
import io.openbas.rest.inject.service.InjectAssistantService;
import io.openbas.rest.inject.service.InjectDuplicateService;
import io.openbas.rest.inject.service.InjectService;
import io.openbas.service.*;
import io.openbas.utils.pagination.SearchPaginationInput;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.persistence.criteria.Join;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
Expand All @@ -33,6 +36,7 @@
@RequiredArgsConstructor
public class ScenarioInjectApi extends RestBehavior {

private final InjectAssistantService injectAssistantService;
private final InjectSearchService injectSearchService;
private final InjectTestStatusService injectTestStatusService;
private final InjectRepository injectRepository;
Expand Down Expand Up @@ -89,6 +93,19 @@ public Inject createInjectForScenario(
return this.injectService.createInject(null, scenario, input);
}

@PostMapping(SCENARIO_URI + "/{scenarioId}/injects/assistant")
@PreAuthorize("isScenarioPlanner(#scenarioId)")
@Transactional(rollbackFor = Exception.class)
@Operation(
summary = "Assistant to generate injects for scenario",
description = "Generates injects based on the provided attack pattern and targets.")
public List<Inject> generateInjectsForScenario(
@PathVariable @NotBlank final String scenarioId,
@Valid @RequestBody InjectAssistantInput input) {
Scenario scenario = this.scenarioService.scenario(scenarioId);
return this.injectAssistantService.generateInjectsForScenario(scenario, input);
}

@PostMapping(SCENARIO_URI + "/{scenarioId}/injects/{injectId}")
@PreAuthorize("isScenarioPlanner(#scenarioId)")
public Inject duplicateInjectForScenario(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package io.openbas.rest.inject.form;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;

@Data
@Schema(
description =
"Input model for automatically generating injects, based on the provided attack pattern IDs and target asset or asset group IDs.")
public class InjectAssistantInput {

@JsonProperty("asset_ids")
@Schema(
description =
"List of asset IDs to target. Either asset_ids or asset_group_ids must be provided.")
private List<String> assetIds = new ArrayList<>();

@JsonProperty("asset_group_ids")
@Schema(
description =
"List of asset group IDs to target. Either asset_ids or asset_group_ids must be provided.")
private List<String> assetGroupIds = new ArrayList<>();

@NotEmpty
@JsonProperty("attack_pattern_ids")
@Schema(description = "List of attack pattern used to generate injects")
private List<String> attackPatternIds = new ArrayList<>();

@NotNull
@JsonProperty("inject_by_ttp_number")
@Schema(description = "Number of injects to generate for each TTP")
private Integer injectByTTPNumber;
}
Loading