Skip to content
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.

Sign up for GitHub

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

[backend] Simulations never ends if no inject / disabled injects / deleted injects (#1586) #1711

Merged
merged 2 commits into from
Oct 23, 2024
Merged

[backend] Simulations never ends if no inject / disabled injects / deleted injects (#1586) #1711

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21489d4
[backend] handle inject with no injector contract
isselparra Oct 21, 2024
3d525b2
[backend] verify if inject does not have another status
isselparra Oct 23, 2024
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
93 changes: 53 additions & 40 deletions openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,62 +167,75 @@
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
} else {
inject.getInjectorContract().ifPresent(injectorContract -> {
setInjectStatusAndExecuteInject(executableInject, inject);

Check warning on line 170 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L170 

Added line #L170 was not covered by tests
}
}

Check warning on line 172 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L172 

Added line #L172 was not covered by tests

private void setInjectStatusAndExecuteInject(ExecutableInject executableInject, Inject inject) {
inject.getInjectorContract().ifPresentOrElse(injectorContract -> {

Check warning on line 175 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L175 

Added line #L175 was not covered by tests
if (!inject.isReady()) {
// Status
if (inject.getStatus().isEmpty()) {
InjectStatus status = new InjectStatus();
status.getTraces().add(InjectStatusExecution.traceError("The inject is not ready to be executed (missing mandatory fields)"));
status.setName(ExecutionStatus.ERROR);
status.setTrackingSentDate(Instant.now());
status.setInject(inject);
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
} else {
InjectStatus status = inject.getStatus().get();
status.getTraces().add(InjectStatusExecution.traceError("The inject is not ready to be executed (missing mandatory fields)"));
status.setName(ExecutionStatus.ERROR);
status.setTrackingSentDate(Instant.now());
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);

Check warning on line 192 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L179-L192 

Added lines #L179 - L192 were not covered by tests
}
return;

Check warning on line 194 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L194 

Added line #L194 was not covered by tests
}

if (!inject.isReady()) {
Injector externalInjector = injectorRepository.findByType(injectorContract.getInjector().getType()).orElseThrow();
LOGGER.log(Level.INFO, "Executing inject " + inject.getInject().getTitle());

Check warning on line 198 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L197-L198 

Added lines #L197 - L198 were not covered by tests
// Executor logics
ExecutableInject newExecutableInject = executableInject;

Check warning on line 200 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L200 

Added line #L200 was not covered by tests
if (Boolean.TRUE.equals(injectorContract.getNeedsExecutor())) {
try {
// Status
if (inject.getStatus().isEmpty()) {
InjectStatus status = new InjectStatus();
status.getTraces().add(InjectStatusExecution.traceError("The inject is not ready to be executed (missing mandatory fields)"));
status.setName(ExecutionStatus.ERROR);
status.setName(ExecutionStatus.EXECUTING);

Check warning on line 206 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L206 

Added line #L206 was not covered by tests
status.setTrackingSentDate(Instant.now());
status.setInject(inject);
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
} else {
InjectStatus status = inject.getStatus().get();
status.getTraces().add(InjectStatusExecution.traceError("The inject is not ready to be executed (missing mandatory fields)"));
status.setName(ExecutionStatus.ERROR);
status.setName(ExecutionStatus.EXECUTING);

Check warning on line 213 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L213 

Added line #L213 was not covered by tests
status.setTrackingSentDate(Instant.now());
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
}
return;
newExecutableInject = this.executionExecutorService.launchExecutorContext(executableInject, inject);
} catch (InterruptedException e) {
throw new RuntimeException(e);

Check warning on line 220 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L218-L220 

Added lines #L218 - L220 were not covered by tests
}
}
if (externalInjector.isExternal()) {
executeExternal(newExecutableInject);

Check warning on line 224 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L224 

Added line #L224 was not covered by tests
} else {
executeInternal(newExecutableInject);

Check warning on line 226 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L226 

Added line #L226 was not covered by tests
}
}, () -> setInjectStatusWhenNoInjectorContractExists(inject));
}

Check warning on line 229 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L228-L229 

Added lines #L228 - L229 were not covered by tests

Injector externalInjector = injectorRepository.findByType(injectorContract.getInjector().getType()).orElseThrow();
LOGGER.log(Level.INFO, "Executing inject " + inject.getInject().getTitle());
// Executor logics
ExecutableInject newExecutableInject = executableInject;
if (Boolean.TRUE.equals(injectorContract.getNeedsExecutor())) {
try {
// Status
if (inject.getStatus().isEmpty()) {
InjectStatus status = new InjectStatus();
status.setName(ExecutionStatus.EXECUTING);
status.setTrackingSentDate(Instant.now());
status.setInject(inject);
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
} else {
InjectStatus status = inject.getStatus().get();
status.setName(ExecutionStatus.EXECUTING);
status.setTrackingSentDate(Instant.now());
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);
}
newExecutableInject = this.executionExecutorService.launchExecutorContext(executableInject, inject);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
if (externalInjector.isExternal()) {
executeExternal(newExecutableInject);
} else {
executeInternal(newExecutableInject);
}
});
}
private void setInjectStatusWhenNoInjectorContractExists(Inject inject) {
InjectStatus status = new InjectStatus();
status.getTraces().add(InjectStatusExecution.traceError("The inject has no injector contract"));
isselparra marked this conversation as resolved.
Show resolved Hide resolved
status.setName(ExecutionStatus.ERROR);
isselparra marked this conversation as resolved.
Show resolved Hide resolved
status.setTrackingSentDate(Instant.now());
status.setInject(inject);
status.setCommandsLines(atomicTestingService.getCommandsLinesFromInject(inject));
injectStatusRepository.save(status);

Check warning on line 238 in openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/scheduler/jobs/InjectsExecutionJob.java#L232-L238 

Added lines #L232 - L238 were not covered by tests
}

public void updateExercise(String exerciseId) {
Expand Down