Skip to content

Fix audits in case of no ast binary found #20

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

Open
vfateev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix audits in case of no ast binary found #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 21 additions & 17 deletions openapi-plugin/src/main/java/com/xliic/openapi/graphql/GraphQlService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,30 +95,34 @@ public void reject(@NotNull String error) {
}
};
if (type == Credentials.Type.AnondToken) {
CliService.getInstance().downloadOrUpdateIfNecessary(project, new CliService.Callback() {
@Override
public void complete(@NotNull String cliPath) {
startAuditTask(file, new GraphQlCliTask(project, file, type, callback));
}
@Override
public void reject(@NotNull String error) {
callback.reject(error);
}
@Override
public void cancel() {
pendingAudits.remove(file.getPath());
MsgUtils.notifyInfo(project, "42Crunch API Security Testing Binary is required to run Audit.");
}
}, true);
runAuditCliTask(file, type, callback);
} else if (type == Credentials.Type.ApiToken) {
String auditRuntime = SettingsService.getInstance().getValue(Settings.Audit.AUDIT_RUNTIME);
if (Objects.equals(auditRuntime, AUDIT_RUNTIME_CLI)) {
startAuditTask(file, new GraphQlCliTask(project, file, type, callback));
runAuditCliTask(file, type, callback);
} else {
startAuditTask(file, new PlatformGraphQlAuditTask(project, file, type, callback));
startAuditTask(file, new PlatformGraphQlAuditTask(project, file, type, callback));
}
}
}

private void runAuditCliTask(VirtualFile file, Credentials.Type type, GraphQlCallback callback) {
CliService.getInstance().downloadOrUpdateIfNecessary(project, new CliService.Callback() {
@Override
public void complete(@NotNull String cliPath) {
startAuditTask(file, new GraphQlCliTask(project, file, type, callback));
}
@Override
public void reject(@NotNull String error) {
callback.reject(error);
}
@Override
public void cancel() {
pendingAudits.remove(file.getPath());
MsgUtils.notifyInfo(project, "42Crunch API Security Testing Binary is required to run Audit.");
}
}, true);
}

private void startAuditTask(VirtualFile file, Task.Backgroundable task) {
ApplicationManager.getApplication().invokeLater(() -> {
Expand Down
40 changes: 22 additions & 18 deletions openapi-plugin/src/main/java/com/xliic/openapi/services/AuditService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,34 +438,38 @@ public void cancel() {
boolean isFullAudit = payload == null || payload.isFull();
// Paid users always run audit using the platform, free users use CLI or fallback to anond
if (type == Credentials.Type.AnondToken) {
CliService.getInstance().downloadOrUpdateIfNecessary(project, new CliService.Callback() {
@Override
public void complete(@NotNull String cliPath) {
startAuditTask(file, isFullAudit ?
new AuditCliTask(project, type, file, callback) : new AuditCliTask(project, type, payload, callback));
}
@Override
public void reject(@NotNull String error) {
callback.reject(error);
}
@Override
public void cancel() {
pendingAudits.remove(file.getPath());
MsgUtils.notifyInfo(project, "42Crunch API Security Testing Binary is required to run Audit.");
}
}, true);
runAuditCliTask(file, payload, type, callback);
} else if (type == Credentials.Type.ApiToken) {
String auditRuntime = SettingsService.getInstance().getValue(Settings.Audit.AUDIT_RUNTIME);
if (Objects.equals(auditRuntime, AUDIT_RUNTIME_CLI)) {
startAuditTask(file, isFullAudit ?
new AuditCliTask(project, type, file, callback) : new AuditCliTask(project, type, payload, callback));
runAuditCliTask(file, payload, type, callback);
} else {
startAuditTask(file, isFullAudit ?
new PlatformAuditTask(project, file, type, callback) : new PlatformAuditTask(project, payload, type, callback));
}
}
}

private void runAuditCliTask(VirtualFile file, AuditOperation payload, Credentials.Type type, Callback callback) {
CliService.getInstance().downloadOrUpdateIfNecessary(project, new CliService.Callback() {
@Override
public void complete(@NotNull String cliPath) {
boolean isFullAudit = payload == null || payload.isFull();
startAuditTask(file, isFullAudit ? new AuditCliTask(project, type, file, callback) :
new AuditCliTask(project, type, payload, callback));
}
@Override
public void reject(@NotNull String error) {
callback.reject(error);
}
@Override
public void cancel() {
pendingAudits.remove(file.getPath());
MsgUtils.notifyInfo(project, "42Crunch API Security Testing Binary is required to run Audit.");
}
}, true);
}

private void startAuditTask(VirtualFile file, Task.Backgroundable task) {
ApplicationManager.getApplication().invokeLater(() -> {
cleanAuditReport(file);
Expand Down