Merge branch 'master' into fix-log-abilityid

mitre · Sep 15, 2022 · 4654ec9 · 4654ec9
2 parents 66c02c8 + 08f164d
commit 4654ec9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/plugins/atomic b/plugins/atomic
diff --git a/plugins/debrief b/plugins/debrief
diff --git a/plugins/human b/plugins/human
diff --git a/plugins/manx b/plugins/manx
diff --git a/plugins/sandcat b/plugins/sandcat
diff --git a/plugins/stockpile b/plugins/stockpile
diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@ docker==4.2.0
 donut-shellcode==0.9.2
 marshmallow-enum==1.5.1
 ldap3==2.8.1
-lxml~=4.6.2  # debrief
+lxml~=4.9.1  # debrief
 reportlab==3.5.67  # debrief
 svglib==1.0.1  # debrief
 Markdown==3.3.3  # training
+1 −5		.github/workflows/testing.yml
+2 −2		app/atomic_svc.py
+51 −0		tests/test_atomic_svc.py
+1 −9		tox.ini
+1 −1		app/debrief-sections/facts_table.py
+4 −0		static/css/debrief.css
+5 −4		static/js/graph.js
+4 −1		README.md
+1 −1		app/human_svc.py
+7 −1		pyhuman/app/utility/webdriver_helper.py
+58 −11		pyhuman/app/workflows/browse_web.py
+82 −0		pyhuman/app/workflows/browse_youtube.py
+82 −7		pyhuman/app/workflows/google_search.py
+78 −0		pyhuman/app/workflows/open_office_calc.py
+138 −0		pyhuman/app/workflows/open_office_writer.py
+4 −0		pyhuman/data/browse_youtube.txt
+1 −0		pyhuman/requirements.txt
+1 −0		requirements.txt
+43 −41		gocat-extensions/execute/donut/donut.go
+8 −6		gocat-extensions/execute/native/native.go
+3 −3		gocat-extensions/execute/shellcode/shellcode.go
+1 −2		gocat-extensions/execute/shells/osascript.go
+1 −2		gocat-extensions/execute/shells/powershell_core.go
+1 −2		gocat-extensions/execute/shells/python.go
+7 −6		gocat/agent/agent.go
+14 −16		gocat/execute/execute.go
+1 −2		gocat/execute/shells/cmd.go
+1 −2		gocat/execute/shells/powershell.go
+9 −9		gocat/execute/shells/proc.go
+9 −3		gocat/execute/shells/proc_test.go
+1 −2		gocat/execute/shells/shell.go
+7 −6		gocat/execute/shells/shells_shared.go
+544 −0		app/guided.py
+172 −0		app/look_ahead.py
+2 −2		data/abilities/collection/4e97e699-93d7-4040-b5a3-2e906a58199e.yml
+16 −4		data/abilities/execution/ece5dde3-d370-4c20-b213-a1f424aa8d03.yml
+1 −0		data/adversaries/78e7504d-968f-477d-8806-4d6c04b94431.yml
+14 −0		data/planners/254c7035-de7d-4d76-a888-2c09ba594eca.yml
+15 −0		data/planners/5bdec528-07ce-44cc-8997-09fe41aa2007.yml
+2 −0		requirements.txt