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

124 Commits (1d4d3bde87793aa718e968235252cdd3fd4a6495)

Author SHA1 Message Date
chris 5ad40ad388 Resolved Conflicts 2018-03-14 16:35:51 -04:00
xorrior a853e0724a Fixed conflict in install.sh 2018-03-02 09:13:56 -05:00
Dan c8d4d2aa27 fixed unicode listener options 2018-02-25 20:42:02 -07:00
Dan b7cff0456b fixed unicode errors in api 2018-02-25 20:35:38 -07:00
Dan McInerney e751a6d1ee
Update empire 2018-02-12 12:29:19 -07:00
matthewneeley 7a8c24ecdc Return taskIDs on upload/download through the REST API 2018-02-09 16:40:48 -05:00
matthewneeley b9d1ccbe8e Added download functionality to empire RESTAPI 2018-02-09 13:15:41 -05:00
Dan c8eaf07949 fixed API listener for int values 2018-02-01 15:26:49 -07:00
Dan 39b26e95d7 fixed API listener options handling to prevent unicode errors 2018-02-01 14:09:52 -07: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
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
Dakota Nelson 0e5f391363 overhaul Empire events system 2018-01-15 09:03:46 -07: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
shakagoolu f3c434cd4d Fix to properly assign taskIDs for deathstar and custom code 2018-01-08 11:38:44 -05:00
xorrior 4d7ae9bae0 Updated circleci test 2018-01-03 13:47:09 -05:00
xorrior 4e69d01b88 Resolve conflict 2018-01-03 00:07:07 -05:00
xorrior 8895e13a6c Merge branch 'dev' into kerberoast-fix 
Conflicts:
	.circleci/config.yml
	changelog
	empire
	lib/common/stagers.py
 2018-01-02 15:42:08 -05:00
Dakota Nelson 20932318fb add CORS * header to all REST api responses 2018-01-01 16:19:24 -07:00
xorrior 0cc5ea6a70 Fix for #859 2017-12-29 13:02:24 -05:00
Alexander Rymdeko-Harvey 0430ee7f58 docker 2017-12-20 09:44:38 -05:00
Alexander Rymdeko-Harvey ef600762ef docker 2017-12-20 09:24:46 -05:00
Alexander Rymdeko-Harvey 0a9af0e382 docker 2017-12-20 09:18:29 -05:00
Alexander Rymdeko-Harvey 6f3593510c docker 2017-12-20 08:59:14 -05:00
Alexander Rymdeko-Harvey 9a9646d300 docker 2017-12-20 08:46:00 -05:00
Alexander Rymdeko-Harvey 3f5efeb516 docker 2017-12-19 23:03:16 -05:00
Chris Ross c1be55709f
Merge pull request #866 from utkusen/master 
Fix for Unicode Error for session_key variable (Issue #821)
 2017-12-18 10:39:57 -05:00
xorrior 6932decba3 Merge branch 'pycrypto-rm' of https://github.com/elitest/Empire into elitest-pycrypto-rm 2017-12-18 01:49:19 -05:00
utkusen eaf2f5122b Fix for unicode error 2017-12-15 11:11:08 +03:00
byt3bl33d3r a6381a23b2 Resolves #822 2017-12-08 04:04:25 -07:00
Chris Ross f07a188ecc
Merge pull request #772 from DakotaNelson/creds-post-endpoint 
Add REST endpoint to allow adding creds to DB via POST request
 2017-10-29 10:23:05 -04:00
Dakota Nelson 8306cbbae3 Include better error messages for credentials POST endpoint 2017-10-29 11:36:13 +00:00
xorrior 5f02ee8c45 Minor bug fixes with rest/headless 2017-10-28 12:09:58 -04:00
Dakota Nelson 0f1bbc2ac8 Add REST endpoint to allow adding creds to DB via POST request 2017-10-21 20:40:55 +01:00
Jim Shaver 47570ee92a Change out Pycrypto for Cryptography 2017-10-19 13:50:04 -05:00
Chris Ross 1cb3e1e375 Merge pull request #750 from clr2of8/dev 
Added resource file and auto run functionality as in Metasploit
 2017-10-18 16:31:17 -04:00
xorrior c814fc942b Reverted back to support any version of TLS 2017-10-18 08:22:21 -04:00
Carrie Roberts 69dbc89422 add autorun feature to agents menu to run all commands in a resource file on incoming agents 2017-10-16 09:55:48 -06:00
Chris Ross 62b26c38bc Merge pull request #744 from byt3bl33d3r/dev 
TLS version too low fix
 2017-10-14 00:50:14 -04:00
xorrior 7031103caa Fix conflicts 2017-10-12 12:24:51 -04:00
xorrior 442fbbb86d Fix conflict 2017-10-12 12:21:37 -04:00
xorrior 4aea7272f0 Merged with master 2017-10-12 12:15:44 -04:00
byt3bl33d3r a965fdb2d4 Re-added TLS fix (#712) 2017-10-10 20:04:42 -06:00
xorrior 5c76a34f01 Fixed #675,#697, and #710 2017-10-07 22:39:41 -04:00
xorrior eccdbfb7cd Adjust cert path 2017-09-26 11:49:25 -07:00
xorrior 61d62d22da Adjusted cert path 2017-09-26 11:48:23 -07:00
xorrior df64b1e6d1 Rest fix from #657 2017-09-06 11:14:36 -04:00
xorrior 2973bfe0c9 Rest fix for Deleting agent results 2017-09-06 10:57:58 -04:00
Chris Ross 2677363e50 Merge pull request #657 from byt3bl33d3r/master 
Removed GroupName as required option in get_group_member module,  reverted a commit that broke the RESTful API
 2017-09-06 10:41:45 -04:00
root a67b733f2b Fixed global name 'ssl' is not defined 2017-09-03 16:05:19 -04:00