Commit Graph

1479 Commits (8cfd54ff516050564e8de4d147227eaf1190cc48)

Author SHA1 Message Date
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
lilyus 1e67c6f48a
Set branch to master
# TODO: When we merge to master set branch to master
2018-03-12 11:36:19 +01:00
xorrior e65e15c982 Removed ls_m and shellb modules for python 2018-03-11 15:23:37 -04:00
import-au dd257aeb88 Cleaned up commits 2018-03-08 10:39:42 -05:00
import-au 1f2c9324d2 Modified verbiage for Version. Added exception handling. 2018-03-08 10:36:20 -05:00
import-au 81cbcf890e Renamed new keychain module 2018-03-08 10:36:20 -05:00
import-au 2999dbbf13 Keychain dump fixed. 2018-03-08 10:36:20 -05:00
import-au bc310d9c0e Fixed osx/situationalawareness
osx/macro now properly supports older and newer variants of Office
Working on keychaindump_sandbox
2018-03-08 10:36:20 -05:00
Adam Gold c17f06251c Fixed SA for OSX 2018-03-08 10:36:20 -05:00
Adam Gold 496806824e Macro changes 2018-03-08 10:35:56 -05:00
Adam Gold cde713ccca Trying new macro 2018-03-08 10:35:56 -05:00
Adam Gold de83f8d8d2 Fixed Macro to accomodate newer versions 2018-03-08 10:35:56 -05:00
Adam Gold ec2e453de1 Added Wireless Info 2018-03-08 10:34:36 -05:00
Adam Gold 691882a84f Dump decrypted keychain 2018-03-08 10:34:36 -05:00
Adam Gold ffffb59a21 Adding support for newer versions of Office 2018-03-08 10:34:36 -05:00
Dakota Nelson 0ba7febf1a Add reference to wiki in readme 2018-03-08 10:34:36 -05:00
import-au 38c6b2333f Modified verbiage for Version. Added exception handling. 2018-03-08 10:16:47 -05:00
import-au 654acd9215 Renamed new keychain module 2018-03-07 14:40:28 -05:00
mr64bit 14468216b7 Add link to setup instructions to listener.
Add warning about stager file.
2018-03-06 15:38:32 -05:00
Sander def50cdb66 Fixed to perform sleep on every ticket request instead of only when a ticket request was succesful 2018-03-06 20:29:11 +00:00
Retrospected 0279541337
Renamed Sleep to Delay and added a Jitter option 2018-03-06 21:16:07 +01:00
mr64bit 159e835b67 Add comments, fix function declaration in comms code 2018-03-06 14:14:22 -05:00