security-tools/atomic-red-team
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into t1078_tf

Browse Source
This commit is contained in:
Hare Sudhan
2023-05-24 17:59:28 -04:00
committed by GitHub
parent aef9160e90 b262c88ac8
commit e555d6e124
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/generate_labels.py
+6 -2
View File
@@ -41,7 +41,9 @@ class GithubAPI:
"containers": "containers",
"iaas:gcp": "cloud",
"iaas:aws": "cloud",
"iaas:azure": "cloud"
"iaas:azure": "cloud",
"office-365": "cloud",
"google-workspace":"cloud"
}
maintainers = {
@@ -52,7 +54,9 @@ class GithubAPI:
"iaas:gcp": ["patel-bhavin"],
"iaas:aws": ["patel-bhavin"],
"iaas:azure": ["patel-bhavin"],
"azure-ad": ["patel-bhavin"]
"azure-ad": ["patel-bhavin"],
"google-workspace": ["patel-bhavin"],
"office-365": ["patel-bhavin"]
}
def __init__(self, token):
bin/validate/validate.py
+14 -9
View File
@@ -64,9 +64,11 @@ class Validator:
executor = t.get("executor", {})
deps = t.get("dependencies", [])
commands = [executor.get("command"), executor.get("cleanup_command"), executor.get("steps")]
commands += [d.get("get_prereq_command") for d in deps]
commands += [d.get("prereq_command") for d in deps]
if executor:
commands = [executor.get("command"), executor.get("cleanup_command"), executor.get("steps")]
if deps:
commands += [d.get("get_prereq_command") for d in deps]
commands += [d.get("prereq_command") for d in deps]
commands = filter(lambda x: x is not None, commands)
if not any([variable in c for c in commands]):
@@ -107,13 +109,16 @@ class Validator:
if isinstance(error, BaseError):
print(f"\n\t{error}\n")
elif isinstance(error, ValidationError):
if (context := error.context) and len(context) > 0:
print("\n\tIt failed because of one of the following reasons:")
messages = '\n\t\t'.join([c.message for c in context])
print(f"\n\t\t{messages}")
if "auto_generated_guid" in error.json_path:
print(f"\n\tGUIDs are auto generated. You can remove {error.json_path}\n")
else:
print(f"\n\t{error}\n")
print(f"\nThe JSON Path is {error.json_path}")
if (context := error.context) and len(context) > 0:
print("\n\tIt failed because of one of the following reasons:")
messages = '\n\t\t'.join([c.message for c in context])
print(f"\n\t\t{messages}")
else:
print(f"\n\t{error}\n")
print(f"\nThe JSON Path is {error.json_path}\n")
else:
print(f"\n\t{error}\n")