Commit Graph

71 Commits (b720b7996e5a82a10a595622926dcc3eec3a4c0b)

Author SHA1 Message Date
xorrior df64b1e6d1 Rest fix from #657 2017-09-06 11:14:36 -04:00
Chris Ross 6ec96ee1aa Merge pull request #547 from n0clues/creds_args
RESTfulAPI - api/admin/login fix
2017-09-02 11:00:18 -04:00
xorrior a6ae921f29 Update rest ssl.SSLContext object 2017-09-02 10:52:05 -04:00
xorrior 1f8364c69c Fix for #631 2017-09-02 10:15:45 -04:00
Chris Ross 58a6af027d Update empire 2017-08-31 21:16:10 -04:00
Drew Varner 332b78d07c Fix shebangs
Move shebangs to /usr/bin/env foo
2017-08-16 01:41:22 -04:00
dchrastil ec13f26056 Revert "Fixed RESTAPI (issue #507)"
This reverts commit b539e12347.

Merged changes
2017-06-12 10:04:22 -07:00
dchrastil c25fea4e70 Updated SSL context to use the split empire-chain.pem and empire-priv.key files. 2017-06-08 08:48:42 -07:00
byt3bl33d3r 425cb7fedc Merge branch 'dev' into restfulapi_fixes 2017-05-30 22:07:20 -06:00
n0clues 9e4eeca433 RESTfulAPI login fixes 2017-05-30 17:30:32 +02:00
byt3bl33d3r 6ee85e73f2 Fixed RESTAPI (issue #507) 2017-05-26 11:58:52 -04:00
byt3bl33d3r 4bf792e4e0 Addresses issue #526 2017-05-26 11:58:52 -04:00
byt3bl33d3r b4d24f43f4 More RESTfulAPI fixes
- Fixed a bug where wrong id value was being instered into the results
and reporting table causing a mismatch between the reporting entry and
the results entry

- task_agent_shell() API call now returnes TaskID as well
2017-05-22 08:14:10 -06:00
byt3bl33d3r 70d88dd3a8 Addresses issue #526 2017-05-21 00:04:54 -06:00
433f2b46c4 Fix task_shell api call 2017-05-13 10:17:18 -04:00
chris 65a2018bd2 Even more REST api fixes 2017-05-03 17:46:35 -04:00
chris 1d451e95c5 Moooore REST API fixes 2017-05-03 17:14:46 -04:00
chris 10b215b797 Rest API fix 2017-05-03 13:51:09 -04:00
chris e581551424 More Rest API fixes 2017-05-01 23:37:21 -04:00
chris 5cadd7b6e9 More Rest API fixes 2017-05-01 00:47:42 -04:00
chris b28ebbf969 REST Api fixes 2017-04-30 00:58:32 -04:00
chris 48116d35d6 Re-implemented /api/listeners/options GET Rest call 2017-04-28 22:04:10 -04:00
Chris Ross 1546b6b484 Merge branch '2.0_beta' into 2.0_beta 2017-04-24 19:57:38 -04:00
bneg da01ad2cc1 Minor bugfixes 2017-04-22 14:29:23 -07:00
bneg 4325b27eb3 API list stager by name 2017-04-22 14:20:10 -07:00
bneg 31ef020f79 Retrieving token via user/pass fixed 2017-04-22 13:09:41 -07:00
bneg 073f7428d9 Setting REST API user/pass now works 2017-04-22 13:02:58 -07:00
bneg 6280d9e64f config API GET fixes 2017-04-22 12:34:35 -07:00
bneg b488e2f3e0 reporting API GET fixes 2017-04-22 12:01:48 -07:00
bneg e66b62ba42 reporting API GET fixes 2017-04-22 11:43:48 -07:00
bneg 72c7d73a00 Results API GET fixes 2017-04-22 11:31:53 -07:00
bneg 58e8a2cfa9 Re-mapping database fields in API 2017-04-22 07:58:39 -07:00
bneg d41d961cb4 Fixed API "Listener" GET, now displays options in JSON 2017-04-21 22:57:11 -07:00
Chris a6499372fb Merge branch 'patch-1' of https://github.com/bneg/Empire into bneg-patch-1 2017-04-20 20:21:29 -07:00
bneg fc70107f08 API call listener_name fixed, need to review SQL stmt for SQLi 2017-04-18 14:25:34 -07:00
bneg b89b7fc1f9 Fixing listeners API 2017-04-18 12:59:39 -07:00
Jeremy 4aaccc5903 Fixes the listeners API call
The backend database changed, and now many of the details are kept in a new 'options' field.  This options field contents needs to be parsed for human readability. At a later date.
2017-04-18 11:23:23 -07:00
HarmJ0y 26cd0089dd 2.0.0 beta, DerbyCon release 2016-09-23 14:04:35 -04:00
HarmJ0y fa2700b9b9 fix for issue #300 2016-08-11 17:01:10 -04:00
Christopher Jones bd72328bb3 Cast port from string to int when starting REST service
The REST API won’t start due to a bug:

./empire --rest --username "emp" --password "emp"

[*] Loading modules from: /mnt/hgfs/cjones/Empire/lib/modules/

Starting Empire RESTful API on port: 1337
RESTful API token: 2bjmeuwa6pr6yy4x0n88rauyyl1nve7cekdgkefh Traceback
(most recent call last): File "/usr/lib/python2.7/logging/init.py",
line 853, in emit msg = self.format(record) File
"/usr/lib/python2.7/logging/init.py", line 726, in format return
fmt.format(record) File "/usr/lib/python2.7/logging/init.py", line 465,
in format record.message = record.getMessage() File
"/usr/lib/python2.7/logging/init.py", line 329, in getMessage msg = msg
% self.args TypeError: %d format: a number is required, not str Logged
from file _internal.py, line 87
After casting the port from a string to an int, the REST service works.
2016-05-28 08:28:35 -04:00
Harmj0y 501ece8762 removed debug line 2016-05-27 13:43:32 -04:00
HarmJ0y 102c09b5d4 Merge pull request #227 from tristandostaler/master
adding the /api/map endpoint to retreive all endpoint possible
2016-05-27 10:40:05 -07:00
Tristan Dostaler 92b9d4d09e adding the /api/map endpoint to retreive all endpoint possible 2016-05-18 18:23:02 -04:00
Harmj0y 37f129fe81 tightened up argparse validation 2016-05-02 18:13:38 -04:00
Harmj0y 5e87f7d417 Changed 403 respones to 401s in RESTful API 2016-04-03 23:15:57 -04:00
Harmj0y b56e5d29ec listener starting now returns more verbose errors on failure in console and API
merge of @mynameisiv's .jpg screenshot PR
fix for path errors in some cases for ./setup/setup_database.py
2016-04-01 17:06:21 -04:00
Harmj0y 9e4e570a56 changed error responses to 400s 2016-03-30 21:58:00 -04:00
Harmj0y 739a45c8cd Added several POST /api/modules/search/* API calls to search modules
with a variety of methods.
2016-03-30 16:43:38 -04:00
Harmj0y 259390dbee fixed API tasking modules to 'all' agents 2016-03-26 21:13:51 -04:00
Harmj0y b3e8ebabe5 Expanded server/agent epoch check from +/- 10 minutes to +/- 12 hours 2016-03-26 00:00:40 -04:00