Commit Graph

1500 Commits (master)

Author SHA1 Message Date
Rahmat Nurfauzi ad7ccf7a60
Create bash.py 2019-04-04 13:41:29 +07:00
chris c7a3eb6b25 Agent display improvements 2018-05-16 17:52:29 -04:00
chris f674b2b64a Fix macho generation logic 2018-05-16 14:49:51 -04:00
Petr Medonos 9b16997aba preserve #1071 2018-05-04 22:58:47 -04:00
xorrior da4ff2f9b7 Fix conflict 2018-05-04 12:20:30 -04:00
xorrior 1924c60336 Fix conflict 2018-05-04 12:19:51 -04:00
xorrior f1c3d7020b mirrored dev version 2018-05-04 12:15:18 -04:00
Kevin Gonzalvo 6fa643d34c
Fixed docker conflicts
Fixed conflicts in Dockerfile in the last merge
2018-04-23 08:38:13 +02:00
Petr Medonos b90899627b hotfix for encoding problem - issue #542 2018-04-22 14:12:53 -04:00
lilyus 8b27c0f071 Merge docker python fix 2018-04-22 13:54:18 -04:00
Justin d1172a7179 Finish effort to use complete python path 2018-04-21 13:53:26 -04:00
Chris Ross 1193518a8a
Merge pull request #1065 from interhack86/master
Fix Docker
2018-04-21 13:46:58 -04:00
xorrior b99bc0e30d Merge branch 'prompt-fix' of https://github.com/gparent/Empire into gparent-prompt-fix 2018-04-21 13:29:50 -04:00
Kevin Gonzalvo a3ec06ef93 Fix Docker
Fix File exists on Docker
2018-04-09 12:32:32 +02:00
xorrior efba9bc368 Fix for #1059. Fixed launcher string, which caused macho to crash. Removed unnecessary call to launchctl. Plist will be loaded automatically during the boot process 2018-04-08 14:25:18 -04:00
johneiser 45c08bb9b6 Fixes #1053 - Syntax error in http_hop launcher 2018-04-08 12:16:22 -04:00
xorrior 1d4d3bde87 Added python-dev package to Dockerfile
Merge fix for #1033
2018-04-08 11:12:04 -04:00
SadProcessor 9bc829f803 Merge kali install fix from dev 2018-03-19 17:01:02 -04:00
xorrior 3b2a7320f1 Merge branch 'mr64bit-2.5-fixes' into dev 2018-03-19 16:52:55 -04:00
xorrior 5b20a787a6 Fix for #1030 2018-03-18 14:10:25 -04:00
Chris Ross becfc94578
Update version 2018-03-16 08:32:57 -04:00
Chris Ross 8cfd54ff51
Update changelog 2018-03-15 17:10:47 -04:00
chris cfd3eafaf2 Update Master to 2.5 2018-03-15 16:58:39 -04:00
chris 7166a6d5bf Update changelog 2018-03-15 16:54:20 -04:00
chris 87a5595ff6 Merge branch 'mr64bit-onedrive-pr' into dev 2018-03-15 16:00:18 -04:00
chris e45da8c838 Merge branch 'onedrive-pr' of https://github.com/mr64bit/Empire into mr64bit-onedrive-pr 2018-03-15 15:48:25 -04:00
chris 16563120c3 Updated events 2018-03-15 15:48:22 -04:00
mr64bit ee9c51448d TIL default args in python don't eval each method call. 2018-03-14 21:33:20 -04:00
Chris Ross 6b1c322207
Merge pull request #1026 from PierrickV/patch-7
Fix merge conflict
2018-03-14 18:38:44 -04:00
chris 89a73c0d10 Merge branch 'DakotaNelson-events' into dev 2018-03-14 18:36:28 -04:00
chris a7d2dddc91 Resolved conflicts & fixed agent output 2018-03-14 18:35:24 -04:00
lilyus 52b18e6743
Fix merge conflict
Fix merge conflict and remove `-b master` which is for branch:master
2018-03-14 23:16:20 +01:00
chris 5ad40ad388 Resolved Conflicts 2018-03-14 16:35:51 -04:00
mr64bit c6d006272e Merge branch 'onedrive-pr' of github.com:mr64bit/empire into onedrive-pr 2018-03-14 15:47:56 -04:00
mr64bit 4281e98c24 Fix agent last-seen issue with other listeners, decrease verbosity of error messages 2018-03-14 15:47:48 -04:00
xorrior d2bdd9a47c Merge branch 'PierrickV-patch-5' into dev 2018-03-14 14:33:15 -04:00
xorrior d673b1cd73 Fix conflict in #1023 2018-03-14 14:32:54 -04:00
Chris Ross 451530f9c2
Merge pull request #1024 from PierrickV/patch-6
Reduce size and layers (Dev branch)
2018-03-14 14:28:57 -04:00
Chris Ross b64a3fa059
Merge pull request #1022 from PierrickV/patch-4
Set branch to master
2018-03-14 14:09:22 -04:00
xorrior 2e04538d7d Merge branch 'dev' of https://github.com/EmpireProject/Empire into dev 2018-03-14 14:06:00 -04:00
xorrior ea08326c72 Merge branch 'import-au-master' into dev 2018-03-14 14:03:36 -04:00
Chris Ross 58ed8a4e99
Update situational_awareness.py
minor typo
2018-03-14 13:54:31 -04:00
xorrior 1957c28368 Merge branch 'master' of https://github.com/import-au/Empire into import-au-master 2018-03-14 13:43:02 -04:00
Chris Ross 5028e29879
Replace poll_interval var with agent_delay 2018-03-14 13:40:40 -04:00
Chris Ross c37874a546
Fix line 302 & 305 in onedrive.py listener class
agent_delay variable cannot be used in place of the REPLACE_POLLING_INTERVAL string. working_hours was not being used.
2018-03-14 01:43:09 -04:00
Chris Ross 69d6e27c85
Merge pull request #1012 from Retrospected/dev
Added Kerberoast feature to perform a sleep between ticket requests
2018-03-13 23:56:46 -04:00
xorrior 23c4d40ee5 Merge branch 'Strazzom-master' into dev #994 2018-03-13 23:53:50 -04:00
xorrior 20462fccc8 Updated install, requirements, and reset files 2018-03-13 23:53:06 -04:00
lilyus 05813e8416
Reduce size and layers (Dev branch)
Hello,

The clean command should be in the same layer as the install command. Otherwise, the APT cache is stored in the layer of "RUN apt install" and the "RUN apt clean" instruction is not reducing image size.

For more info see : https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run

Regards
2018-03-13 11:29:48 +01:00
lilyus cda4927a85
Reduce image size (Dev Branch)
Hello,

Because we don't need to pull all the git repository, we should use --depth=1 (https://www.git-scm.com/docs/git-clone#git-clone---depthltdepthgt).

This is reducing image size and improving build speed.

Regards
2018-03-13 11:25:31 +01:00