infosecn1nja
/
Empire
mirror of https://github.com/infosecn1nja/Empire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,318 Commits
11 Branches
13 Tags
21 MiB
Commit Graph

1318 Commits (d65badfd1674871322879060fe63adcb6fe327e1)

Author SHA1 Message Date
xorrior d65badfd16 Merge branch 'dev' of https://github.com/bneg/Empire into bneg-dev 2018-02-10 22:44:04 -05:00
xorrior eb11c50691 Removed circleci folder 2018-02-08 20:22:56 -05:00
Chris Ross e7389dedcd Merge pull request #975 from EmpireProject/downloads_fix 
Reverted to old downloads method. Removed unnecessary code. fixed log…
 2018-02-08 20:17:49 -05:00
Chris Ross 1f9aada0ca
Merge pull request #972 from EmpireProject/powerview_fix 
Powerview fix
 2018-02-07 01:41:09 -05:00
xorrior ef7c414ee9 Fix for #940 2018-02-07 01:38:12 -05:00
bneg 7388fed540 Fixed db connection 2018-01-27 21:11:32 -08:00
xorrior 8d32813aae Merge branch 'mr64bit-listener-management' into dev 2018-01-27 21:48:11 -05:00
xorrior e27bf23db6 Added tab completion for enable, disable, and delete 2018-01-27 21:47:40 -05:00
xorrior 113ccb2a48 Merge branch 'listener-management' of https://github.com/mr64bit/Empire into mr64bit-listener-management 2018-01-27 21:09:14 -05:00
xorrior eb48a51370 Merge branch 'retro-engineer-dev' into dev 2018-01-27 18:56:21 -05:00
xorrior df0d1927a2 Change Background to True for both modules 2018-01-27 18:56:08 -05:00
bneg aa9e4584a6 Add "report" to main menu, adding some simple reporting 2018-01-27 15:53:44 -08:00
xorrior 184208c964 Merge branch 'dev' of https://github.com/retro-engineer/Empire into retro-engineer-dev 2018-01-27 18:38:51 -05:00
mr64bit 3ff2e610ab Oops, should be empty string for un-setting option 2018-01-25 14:40:29 -05:00
mr64bit 017498e37e Add feature to directly delete a listener from the database 
Add feature to unset listener option
Move edit warning do_edit() so it's not shown when edits are called
directly by the user
 2018-01-25 14:40:29 -05:00
mr64bit 3bff4e6ef2 Added ability to enable/disable listeners, so they are still stored in the 
database, but will not start automatically.
Also, listener options can now be edited without deleting the listener
and starting a new one from scratch.
 2018-01-25 14:40:29 -05:00
Chris Ross 8a27017d43
Merge pull request #942 from jrobles-r7/dev 
Fixed Return Value
 2018-01-19 22:22:46 -05:00
xorrior eee43b595a Merge branch 'whoot-patch-1' into dev 2018-01-19 22:14:20 -05:00
xorrior f33a425dfb Merge #930 2018-01-19 22:13:38 -05:00
jrobles-r7 a9986dcdac Fixed Return Value 
Fixed the return value for a condition that may not happen...
 2018-01-18 21:36:54 -06:00
xorrior d656f82fb3 Merge branch 'nikaiw-master' into dev 2018-01-15 22:18:29 -05:00
xorrior 0bd067c380 Fix stager generation logic 2018-01-15 22:18:08 -05:00
xorrior a34fdcfeb0 Merge branch 'master' of https://github.com/nikaiw/Empire into nikaiw-master 2018-01-15 21:55:05 -05:00
Chris Ross 4469f61ec2 Merge pull request #923 from shakagoolu/master 
TaskIDs fix for RESTAPI
 2018-01-15 20:58:23 -05:00
Chris Ross f4e4bf6085
Merge pull request #923 from shakagoolu/master 
TaskIDs fix for RESTAPI
 2018-01-15 19:56:59 -06:00
Chris Ross 851653f48d
Merge pull request #917 from SadProcessor/dev 
Proposed fix for Kali Install in install.sh
 2018-01-15 19:48:43 -06:00
xorrior ffa736064e Merge branch 'dev' of https://github.com/EmpireProject/Empire into dev 2018-01-15 20:46:32 -05:00
xorrior 29d7bebed0 Merge branch 'G0ldenGunSec-backdoorLnkMacro' into dev 2018-01-15 20:45:50 -05:00
xorrior eb8d4b8ad1 Resolved conflict 2018-01-15 20:45:33 -05:00
Chris Ross c837bf15d7
Add OS support note. 2018-01-15 19:21:49 -05:00
Jan Rude f22a0a421e
Update install.sh 2018-01-15 12:35:13 +01:00
Jan Rude 17ca6ba2d0
Update install.sh 
Added download link to powershell and updated libssl
 2018-01-15 11:25:08 +01:00
Chris Ross 5c3edbbdff
Merge pull request #895 from DakotaNelson/cors 
add CORS * header to all REST API responses
 2018-01-11 17:55:52 -06:00
xorrior 7303a4e089 Merge branch 'DakotaNelson-template-path' into dev 2018-01-11 18:31:54 -05:00
NK bfc793a7f6 Fix: none proxy value really means no proxy 
Usefull when outgoing connexion is less filtered than proxy ones.
 2018-01-10 19:41:22 +01:00
SadProcessor 0fa28e65cf
Merge pull request #1 from SadProcessor/SadProcessor-patch-1 
Update install.sh
 2018-01-08 22:36:44 +01:00
SadProcessor 2852513062
Update install.sh 
Fix Kali Install
 2018-01-08 22:35:30 +01:00
Chris Ross cf8f761875
Merge pull request #916 from EmpireProject/requirements.txt-change 
update requirements file
 2018-01-08 13:32:50 -06:00
xorrior 171427a616 update requirements file 2018-01-08 14:18:21 -05:00
shakagoolu 4ba6a267c5 Merge remote-tracking branch 'upstream/master' 2018-01-08 11:43:07 -05:00
shakagoolu f3c434cd4d Fix to properly assign taskIDs for deathstar and custom code 2018-01-08 11:38:44 -05:00
xorrior cd023ae597 Merge branch 'DakotaNelson-template-path' into dev 2018-01-07 19:24:25 -05:00
xorrior aba0cbfb94 Additional patch for launcher generation with dbx listener 2018-01-07 19:24:06 -05:00
xorrior 58ccf93246 Merge branch 'template-path' of https://github.com/DakotaNelson/Empire into DakotaNelson-template-path 2018-01-07 19:15:23 -05:00
xorrior 064e1e2ffd Update changelog 2018-01-07 19:13:26 -05:00
Chris Ross e2ea55835a
Merge pull request #893 from s0lst1c3/dev 
Module Added: osx_mic_record (resolves #865)
 2018-01-07 19:05:31 -05:00
xorrior 28cd295a35 Merge #907 fix into dev 2018-01-07 14:43:33 -05:00
xorrior 058be55394 Last. commit. for #907 2018-01-07 14:43:03 -05:00
xorrior a144bf31f1 Added missing listenerName var, #907 2018-01-07 14:31:15 -05:00
xorrior 88825c1c13 Added missing listenerOptions var for 2nd function, for #907 2018-01-07 04:22:01 -05:00