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

Jump to bottom

AF-161 Fix Build #104

Merged
merged 9 commits into from
Aug 31, 2023
Merged

AF-161 Fix Build #104

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
131dc47
Changed validate to make sure the json are published through the CLI …
tleef42 Aug 22, 2023
f0204a4
AF-161 Fix build
mehaase Aug 30, 2023
71139f2
Fix build
mehaase Aug 31, 2023
890aca9
Make this flaky test more robust
mehaase Aug 31, 2023
b087e43
Fix build
mehaase Aug 31, 2023
a3fa2be
Update some vulnerable dependencies based on safety check
mehaase Aug 31, 2023
05d3947
Update README badges
mehaase Aug 31, 2023
bffee95
Fix logic for artifact's payload url, and hashes
mehaase Aug 31, 2023
6aab2cb
fix artifact validation
mikecarenzo Aug 31, 2023
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
8 changes: 4 additions & 4 deletions src/attack_flow_builder/src/assets/builder.config.validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ class AttackFlowValidator extends DiagramValidator {
this.addError(id, "Invalid MIME Type.");
}
// Validate Payload Bin, URL, and Hashes
if (payloadBin?.isDefined() && (url?.isDefined() || hashes?.isDefined()) ||
(url?.isDefined() && !hashes?.isDefined()) ||
(hashes?.isDefined() && !url?.isDefined())) {
this.addError(id, "An artifact must have either a payload or a URL + hash, but not both.");
if (payloadBin?.isDefined() === url?.isDefined()) {
mikecarenzo marked this conversation as resolved.
Show resolved Hide resolved
this.addError(id, "An artifact must have either a payload or a URL, but not both.");
} else if (url?.isDefined() && !hashes?.isDefined()) {
this.addError(id, "An artifact with a URL must have at least one hash.");
}
// Validate hashes
if(hashes?.isDefined()) {
Expand Down
Loading