v5.7.3 into main #703

vinnybod · 2023-10-17T03:23:46Z

This PR was automatically generated by the release-public-start workflow.
This PR should be merged with a merge commit, not a squash commit.
Merging this PR will trigger a tag and release automatically.

* add a coverage report to pull requests * typo * add extra exclusions * update changelog * bump black on pre-commit and github actions to match poetry lock * use pre-commit mirror for faster runs

#675) * update embedded plugins to not abuse notifications, update plugin docs * update plugin service test * Update .pre-commit-config.yaml * update changelog * add a fix for agent task socket event * move thread instantiation * fix plugin changes

* Add user avatar uploads * Update empire/test/test_user_api.py

#688) * Fixed issue with multiple parameters not executing in IronPython for C# tasks * changelog

Co-authored-by: Vincent Rose <[email protected]>

v5.7.0 into private-main

v5.7.1 into private-main

* change ruff config * replace isort with ruff * pass pyflakes * pass pycodestyle errors * run W293 * run W291 * run pycodestyle errors * run UP010 * run UP029 * run UP004 * run UP015 * run UP024 * run UP030 * run UP032 * run UP012 * run E721 * run UP034 * run UP031 * changelog and contributing.md * run black * set pipefail so | tee doesn't suppress the error * auto-fix bugbear * B028 * B006 * B904 * B005 * update contributing * fix launcher tests

* fixed obfuscation for ironpython and python stagers * Fixed obfuscation for ironpython and python stagers

* added bypass module and fixed module obfuscation * Update empire/server/modules/powershell/management/invoke_bypass.py Co-authored-by: Vincent Rose <[email protected]> * reformat --------- Co-authored-by: Vincent Rose <[email protected]>

v5.7.3 into private-main

CHANGELOG.md

github-actions · 2023-10-17T03:45:51Z

Coverage Report

File	Stmts	Miss	Cover	Missing
empire/server
server.py	110	26	76%	84, 102–108, 117–118, 125–128, 134–137, 148, 153, 157–158, 170–188
empire/server/api
app.py	99	99	0%	1–164
jwt_auth.py	69	10	86%	53, 55, 57, 66, 84, 86–87, 90, 98, 106
middleware.py	12	12	0%	1–40
empire/server/api/v2
shared_dto.py	54	3	94%	58, 74, 80
empire/server/api/v2/agent
agent_api.py	52	1	98%	90
agent_file_api.py	36	1	97%	79
agent_task_api.py	172	20	88%	108–134, 203, 298, 307, 324, 345, 374, 389, 408, 425, 442, 461, 480, 503, 518, 532, 547, 553
empire/server/api/v2/download
download_api.py	39	1	97%	59
empire/server/api/v2/listener
listener_api.py	60	4	93%	90, 95, 109, 121
listener_dto.py	51	2	96%	306, 309
listener_template_api.py	18	1	94%	49
empire/server/api/v2/obfuscation
obfuscation_api.py	69	1	99%	135
empire/server/api/v2/plugin
plugin_task_api.py	46	4	91%	83–106, 171
empire/server/api/v2/profile
profile_api.py	47	2	96%	64, 79
empire/server/api/v2/stager
stager_dto.py	47	2	96%	232, 235
stager_template_api.py	18	1	94%	46
empire/server/api/v2/tag
tag_api.py	38	1	97%	79
empire/server/api/v2/user
user_api.py	69	5	93%	59, 82–84, 136, 160
empire/server/api/v2/websocket
socketio.py	85	85	0%	1–174
empire/server/common
agents.py	731	644	12%	102–107, 121, 136–142, 164–202, 209–219, 225–239, 256–340, 346–398, 405, 435–448, 463–479, 485–503, 510–523, 529–542, 548–569, 575–613, 643–693, 722–737, 743–746, 758–776, 782–793, 818–1093, 1109–1179, 1189–1245, 1254–1302, 1310–1813
credentials.py	44	30	32%	38–51, 60–121, 129–160
encryption.py	174	117	33%	41–43, 47, 56–58, 66–67, 76–80, 95–108, 112–117, 124–126, 134–143, 150–157, 165–171, 178–192, 199–203, 210–211, 241, 266–287, 293–308, 314–325, 331, 337, 344–347, 354–358, 364–377, 383
helpers.py	360	192	47%	83–87, 94–98, 113, 132–133, 198–199, 241, 248–250, 392–427, 437–568, 589, 596–609, 622–632, 637–641, 644–653, 667–675, 681–691, 713, 725–726, 749–751, 758, 781, 784–787, 790–793, 800–802
packets.py	113	75	34%	160, 181–186, 211–248, 256–294, 321–375, 428–431
plugins.py	17	3	82%	27, 32, 37
pylnk.py	592	444	25%	202, 206, 210, 214, 218–223, 227–235, 239–243, 247–251, 255–263, 267, 271, 275, 279, 284–287, 291–292, 296–301, 305–311, 315, 319–327, 337–338, 342–344, 364–366, 369–370, 375–378, 383, 386–388, 391, 394–399, 402, 407, 410–414, 419–452, 455–457, 473, 478–485, 488, 493, 498–526, 529–537, 542–556, 559–594, 599, 604–612, 615–634, 637–642, 645–652, 657, 662–690, 695–718, 721–736, 739–756, 759–792, 795–823, 826, 829–830, 835, 838–840, 845, 848–849, 854, 857–858, 863, 866–867, 872, 875–876, 881, 884–885, 890, 893–897, 902, 907–929, 936–938, 942–957
socks.py	43	30	30%	12–13, 17–19, 25–31, 35–42, 46–57, 60
stagers.py	342	282	18%	51–59, 89, 96–97, 126, 149, 157–178, 186–195, 203–240, 248–269, 277–286, 293–339, 345–411, 417–582, 586–656, 659–697, 700–712, 715–814
templating.py	30	9	70%	62–64, 73–75, 84–86
empire/server/common/converter
convert_authors.py	20	20	0%	1–64
module_converter.py	18	18	0%	1–51
empire/server/common/malleable
implementation.py	236	26	89%	162, 164, 347, 351, 356, 476–495, 527
profile.py	127	17	87%	103–104, 144–145, 154, 195, 206, 220, 226, 237, 250, 261, 293, 316–319
transaction.py	374	80	79%	167–186, 199, 214–218, 261, 270, 286–290, 294, 304, 353, 404, 430, 441–442, 448, 469–497, 606–612, 631, 644–646, 753–760, 773, 784, 879, 881, 892, 894, 896
transformation.py	373	121	68%	182, 184, 186, 211, 222–223, 225, 233–234, 236, 282, 288, 292, 323–349, 354–394, 402–439, 454, 465–466, 468, 476–477, 479, 681, 683, 685, 687, 697–698, 722–726, 730, 734, 758, 771, 776, 788, 790–792, 794, 809, 811–813, 815, 833–838, 854, 859, 875–882, 898, 903
utility.py	43	13	70%	29, 45–48, 60–66, 120, 128
empire/server/core
agent_service.py	103	16	84%	84, 87, 90, 139, 165–183, 198
agent_task_service.py	191	36	81%	67–70, 86, 88, 94, 97, 100, 108, 110, 112, 117, 122, 142–147, 176, 207–210, 222, 227–230, 238, 240, 269–286, 372–380
bypass_service.py	65	4	94%	31, 37, 60–61
config.py	82	6	93%	102–105, 114–115
credential_service.py	46	1	98%	27
download_service.py	100	22	78%	46, 52, 58, 62, 68–71, 74, 94, 96, 98, 100, 105, 110, 131–145
hooks.py	66	17	74%	73–75, 84–86, 100–108, 111–112, 120, 123
hooks_internal.py	100	55	45%	25, 28, 109–132, 142–170, 183–202, 212–236
listener_service.py	185	29	84%	107, 135–136, 146, 156, 187–194, 244–253, 274, 284–286, 289–293, 324–328
module_models.py	58	8	86%	61–72, 76–78
module_service.py	296	68	77%	92, 120, 133, 141–145, 155–159, 163–193, 273–275, 310, 331, 334, 397–421, 432–434, 478–479, 496, 510, 516, 540, 560–579, 588–589, 607
obfuscation_service.py	136	18	87%	96–98, 108, 120, 125–127, 144–148, 155–158, 191–192, 249–254
plugin_service.py	163	30	82%	59, 76–77, 89, 128, 134–138, 157–170, 220–223, 239, 245, 248, 251, 259, 261, 263, 268, 273
profile_service.py	61	2	97%	41, 85
stager_service.py	99	5	95%	54, 89, 133, 138, 163
stager_template_service.py	48	1	98%	58
tag_service.py	71	17	76%	37, 39, 41, 43, 45, 47, 51–54, 57, 60, 68–71, 76, 79
user_service.py	41	2	95%	15, 50
empire/server/core/db
base.py	88	18	80%	26–28, 36–41, 59, 73–82, 158–164
defaults.py	43	5	88%	87–91, 100–101
models.py	297	10	97%	264–268, 280, 283, 331, 355, 358, 419, 422
empire/server/listeners
dbx.py	459	369	20%	144, 151–162, 184–185, 214–218, 239, 250–254, 289–293, 299, 311–314, 337–338, 344–356, 366–369, 374–381, 398–503, 519–604, 614–667, 718–1024, 1033–1050, 1057–1064
http.py	560	350	38%	231–234, 281, 294, 302–313, 324–330, 353–360, 400, 410–412, 440–443, 451–452, 461–475, 485–488, 493–499, 504–540, 557–558, 573–630, 654–655, 659, 662–664, 672, 689–690, 702–727, 731, 755, 759, 765–766, 769–774, 821–825, 833–1277, 1297–1304
http_com.py	375	293	22%	166, 173–187, 208–209, 235–240, 249–255, 285–292, 298, 316–320, 326, 349–432, 448–491, 501–527, 533–859, 866–883, 890–897
http_foreign.py	172	72	58%	141, 148–153, 175–178, 203–207, 218, 232–234, 241–246, 252–255, 283–287, 293, 302, 306–309, 336–337, 349–365, 375–378, 383–392, 397, 414–415, 424–425, 433–474, 480, 486
http_hop.py	240	148	38%	99, 106, 128–129, 153–157, 167, 181–183, 190–195, 232–236, 242, 253, 261–264, 292–293, 302–315, 325–328, 333–337, 342, 359–490, 501–502, 510–551, 559–609, 615
http_malleable.py	650	507	22%	163, 190, 234, 241–246, 272–273, 297–303, 309, 312, 315, 361, 371–374, 381–392, 402, 411, 421–426, 433, 445–449, 454, 465–466, 470, 479–480, 491–507, 547–552, 559, 567–568, 571–580, 585, 602–734, 748–841, 852–1329, 1337–1736, 1743–1764, 1771–1778
onedrive.py	386	316	18%	159, 162–192, 211–212, 230–234, 256–258, 264–269, 290–294, 299, 323–385, 392–429, 443–487, 490–897, 904–921, 928–935
port_forward_pivot.py	372	267	28%	76–77, 83, 105–106, 131–135, 146, 160–163, 170–181, 192–198, 224–232, 248–252, 258, 269, 273–276, 306–310, 319–320, 332–348, 358–361, 366–373, 377–413, 430–540, 556–644, 655–696, 704–872, 879–972
smb.py	210	183	13%	68–69, 75, 94–230, 247–311, 327–381, 392–425, 433–490, 497
empire/server/modules/csharp
Assembly.Covenant.py	19	13	32%	17–46
AssemblyReflect.Covenant.py	19	13	32%	17–46
Inject_BOF.Covenant.py	31	21	32%	24–67
ProcessInjection.Covenant.py	62	53	15%	21–115
Shellcode.Covenant.py	22	16	27%	17–49
empire/server/modules/powershell/code_execution
invoke_ntsd.py	55	49	11%	16–104
invoke_reflectivepeinjection.py	34	26	24%	19–69
invoke_shellcode.py	22	3	86%	30–31, 37
invoke_shellcodemsil.py	18	12	33%	17–42
empire/server/modules/powershell/collection
SharpChromium.py	28	20	29%	20–61
WireTap.py	21	15	29%	17–48
get_sql_column_sample_data.py	40	34	15%	16–77
minidump.py	23	17	26%	17–50
packet_capture.py	18	13	28%	15–38
screenshot.py	24	18	25%	17–51
empire/server/modules/powershell/credentials
credential_injection.py	36	29	19%	18–78
tokens.py	32	26	19%	17–79
empire/server/modules/powershell/credentials/mimikatz
dcsync_hashdump.py	22	16	27%	17–49
golden_ticket.py	35	26	26%	21–66
lsadump.py	16	10	38%	17–41
mimitokens.py	35	29	17%	17–65
pth.py	34	25	26%	21–68
silver_ticket.py	40	32	20%	19–74
trust_keys.py	15	9	40%	17–38
empire/server/modules/powershell/exfiltration
PSRansom.py	25	19	24%	17–53
empire/server/modules/powershell/exploitation
exploit_eternalblue.py	18	12	33%	17–44
empire/server/modules/powershell/lateral_movement
inveigh_relay.py	36	30	17%	17–92
invoke_dcom.py	36	30	17%	17–91
invoke_executemsbuild.py	54	47	13%	18–113
invoke_psexec.py	38	32	16%	17–99
invoke_psremoting.py	43	36	16%	18–97
invoke_smbexec.py	40	34	15%	17–97
invoke_sqloscmd.py	46	39	15%	17–89
invoke_sshcommand.py	32	25	22%	18–66
invoke_wmi.py	48	41	15%	18–109
invoke_wmi_debugger.py	59	51	14%	18–167
jenkins_script_console.py	28	21	25%	18–68
new_gpo_immediate_task.py	37	30	19%	18–104
empire/server/modules/powershell/management
invoke_bypass.py	14	8	43%	16–32
invoke_script.py	19	13	32%	16–39
logoff.py	11	6	45%	15–28
psinject.py	35	29	17%	17–85
reflective_inject.py	45	37	18%	18–97
runas.py	34	27	21%	18–73
shinject.py	28	21	25%	18–69
spawn.py	29	23	21%	17–78
spawnas.py	44	37	16%	18–78
switch_listener.py	15	9	40%	17–47
user_to_sid.py	8	3	62%	15–25
empire/server/modules/powershell/management/mailraider
disable_security.py	25	19	24%	16–63
get_emailitems.py	17	11	35%	16–51
empire/server/modules/powershell/persistence/elevated
registry.py	69	61	12%	19–170
schtasks.py	83	75	10%	19–210
wmi.py	93	84	10%	20–264
wmi_updater.py	75	67	11%	19–221
empire/server/modules/powershell/persistence/misc
add_sid_history.py	16	10	38%	17–40
debugger.py	39	33	15%	17–122
empire/server/modules/powershell/persistence/powerbreach
deaduser.py	39	31	21%	18–142
eventlog.py	36	28	22%	18–120
resolver.py	39	31	21%	18–129
empire/server/modules/powershell/persistence/userland
backdoor_lnk.py	51	43	16%	19–130
registry.py	77	69	10%	19–208
schtasks.py	78	70	10%	19–201
empire/server/modules/powershell/privesc
ask.py	23	17	26%	17–73
bypassuac.py	25	19	24%	17–65
bypassuac_env.py	26	20	23%	17–64
bypassuac_eventvwr.py	26	20	23%	17–66
bypassuac_fodhelper.py	26	20	23%	17–65
bypassuac_sdctlbypass.py	26	20	23%	17–65
bypassuac_tokenmanipulation.py	29	21	28%	19–65
bypassuac_wscript.py	25	19	24%	17–65
ms16-032.py	19	13	32%	17–53
ms16-135.py	19	13	32%	17–53
empire/server/modules/powershell/privesc/powerup
service_exe_stager.py	31	25	19%	17–68
service_stager.py	26	20	23%	17–59
write_dllhijacker.py	29	23	21%	17–78
empire/server/modules/powershell/recon
fetch_brute_local.py	26	20	23%	16–49
find_fruit.py	24	18	25%	17–61
get_sql_server_login_default_pw.py	23	18	22%	15–51
empire/server/modules/powershell/situational_awareness/host
computerdetails.py	55	49	11%	17–120
empire/server/modules/powershell/situational_awareness/network
get_sql_server_info.py	30	25	17%	15–65
empire/server/modules/powershell/situational_awareness/network/powerview
get_gpo_computer.py	42	34	19%	19–92
get_subnet_ranges.py	38	30	21%	18–77
empire/server/modules/python/collection/osx
imessage_dump.py	15	10	33%	15–177
native_screenshot_mss.py	13	7	46%	16–46
prompt.py	14	9	36%	15–50
search_email.py	12	1	92%	20
sniffer.py	23	18	22%	15–152
empire/server/modules/python/lateral_movement/multi
ssh_launcher.py	18	12	33%	16–68
empire/server/modules/python/management/multi
spawn.py	14	8	43%	17–31
empire/server/modules/python/management/osx
shellcodeinject64.py	19	11	42%	18–139
empire/server/modules/python/persistence/multi
desktopfile.py	15	9	40%	16–60
empire/server/modules/python/persistence/osx
CreateHijacker.py	21	14	33%	23–484
LaunchAgent.py	22	15	32%	17–103
LaunchAgentUserLandPersistence.py	17	11	35%	16–82
loginhook.py	13	8	38%	15–65
mail.py	30	22	27%	18–197
empire/server/modules/python/privesc/multi
CVE-2021-3560.py	17	10	41%	18–43
CVE-2021-4034.py	22	14	36%	19–49
bashdoor.py	12	7	42%	16–48
sudo_spawn.py	19	13	32%	17–42
empire/server/modules/python/privesc/osx
dyld_print_to_file.py	18	11	39%	24–56
piggyback.py	18	12	33%	17–56
empire/server/modules/python/situational_awareness/host/osx
situational_awareness.py	14	9	36%	15–197
empire/server/plugins
basic_reporting.plugin	77	54	30%	43–74, 86–99, 102–115, 118–134, 148–152
csharpserver.plugin	127	86	32%	48–53, 56, 71–117, 120–127, 130–159, 162–192, 203–207
reverseshell_stager_server.plugin	111	84	24%	123–130, 133, 148–211, 216, 222–231, 234–250, 253–266
websockify_server.plugin	57	31	46%	68–76, 79, 94–128
empire/server/plugins/ChiselServer-Plugin
chiselserver.plugin	101	71	30%	66–71, 89–184
empire/server/plugins/Report-Generation-Plugin
advanced_reporting.plugin	147	107	27%	67–111, 134–151, 155–176, 179–188, 191–201, 204–220, 227–259, 262–276, 282–285, 298–300
mitre.py	124	85	31%	17–18, 21, 24, 28, 31–40, 44–58, 62–65, 69–71, 74–75, 78–80, 84–103, 106–107, 110–111, 114–115, 118–119, 124–128, 131–135, 138, 143, 146–147, 155–156, 165–181, 189–201, 209, 217–225, 236–237, 245–259, 262–272, 275
empire/server/plugins/SocksProxyServer-Plugin
socksproxyserver.plugin	136	104	24%	83–88, 103–122, 125–130, 137–141, 146–177, 180–188, 191–214, 217–232
empire/server/stagers/multi
bash.py	22	14	36%	67–92
generate_agent.py	30	22	27%	93–133
launcher.py	34	6	82%	116–124, 147–148
macro.py	53	43	19%	120–257
pyinstaller.py	54	5	91%	100–102, 113–114
war.py	44	34	23%	91–183
empire/server/stagers/osx
applescript.py	19	11	42%	62–83
application.py	26	17	35%	81–113
ducky.py	25	18	28%	60–88
dylib.py	26	18	31%	73–103
jar.py	18	11	39%	60–79
macho.py	18	11	39%	60–83
macro.py	40	32	20%	85–187
pkg.py	28	20	29%	72–109
safari_launcher.py	23	16	30%	67–107
shellcode.py	24	17	29%	68–158
teensy.py	76	69	9%	61–144
empire/server/stagers/windows
backdoorLnkMacro.py	148	129	13%	151–159, 163–484
bunny.py	48	39	19%	107–176
cmd_exec.py	46	35	24%	105–164, 167–179
csharp_exe.py	51	43	16%	102–172
dll.py	41	11	73%	107–108, 112, 115–118, 121–132, 156–157
ducky.py	42	34	19%	94–163
hta.py	37	29	22%	86–145
launcher_bat.py	54	11	80%	86, 93, 96–97, 116, 131–141, 150–151
launcher_lnk.py	39	30	23%	118–182
launcher_sct.py	52	44	15%	96–174
launcher_vbs.py	34	26	24%	82–138
launcher_xml.py	83	75	10%	82–192
macro.py	70	59	16%	114–218
ms16-051.py	35	27	23%	95–283
nim.py	52	43	17%	83–170
reverseshell.py	23	13	43%	61–67, 70–86
shellcode.py	48	39	19%	102–169
teensy.py	113	105	7%	82–218
wmic.py	42	34	19%	96–159
empire/server/utils
data_util.py	50	10	80%	34–44, 57–58, 60, 64
file_util.py	13	1	92%	24
listener_util.py	30	11	63%	13–19, 99–112
log_util.py	40	21	48%	11–39
math_util.py	5	3	40%	9–12
module_util.py	10	3	70%	16–18
option_util.py	74	22	70%	15–16, 96, 99, 119–133, 142–151, 162, 169
TOTAL	17546	9652	45%

Tests	Skipped	Failures	Errors	Time
317	0 💤	0 ❌	0 🔥	10m 20s ⏱️

vinnybod and others added 21 commits September 12, 2023 21:57

add a coverage report to pull requests (#674)

eef291f

* add a coverage report to pull requests * typo * add extra exclusions * update changelog * bump black on pre-commit and github actions to match poetry lock * use pre-commit mirror for faster runs

Add user avatar uploads (#687)

3bb06b8

* Add user avatar uploads * Update empire/test/test_user_api.py

Fixed issue with multiple parameters not executing in IronPython for … (

6226f2e

#688) * Fixed issue with multiple parameters not executing in IronPython for C# tasks * changelog

Fix for spawnas not generating bat file (#689)

4050a35

Fixed taskings for OneDrive listener (#691)

31ee108

Co-authored-by: Vincent Rose <[email protected]>

Prepare release 5.7.0 private

54e1790

Merge pull request #692 from BC-SECURITY/release/5.7.0-private

2da1f41

v5.7.0 into private-main

Prepare release 5.7.1 private

b514ff7

Merge pull request #699 from BC-SECURITY/release/5.7.1-private

b598b94

v5.7.1 into private-main

updated dbx with new dropbox apis (#695)

04cc06d

standardized workinghours and killdate for ps agent (#702)

4c44216

Prepare release 5.7.2 private

78be144

move string functions

69e3bed

Merge pull request #703 from BC-SECURITY/release/5.7.2-private

e727917

Fixed obfuscation for ironpython and python stagers (#712)

f0e8d06

* fixed obfuscation for ironpython and python stagers * Fixed obfuscation for ironpython and python stagers

Prepare release 5.7.3 private

6de8167

Merge pull request #713 from BC-SECURITY/release/5.7.3-private

2241871

v5.7.3 into private-main

Update starkiller version to v2.6.1

c3bf52f

vinnybod commented Oct 17, 2023

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

vinnybod added 2 commits October 16, 2023 20:24

Update CHANGELOG.md

7c39fb7

Merge branch 'main' into release/5.7.3

d4849e6

vinnybod merged commit 9bc4550 into main Oct 17, 2023
10 checks passed

vinnybod deleted the release/5.7.3 branch October 17, 2023 04:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

v5.7.3 into main #703

v5.7.3 into main #703

vinnybod commented Oct 17, 2023

github-actions bot commented Oct 17, 2023

v5.7.3 into main #703

v5.7.3 into main #703

Conversation

vinnybod commented Oct 17, 2023

github-actions bot commented Oct 17, 2023