7031103caa
Fix conflicts
2017-10-12 12:24:51 -04:00
442fbbb86d
Fix conflict
2017-10-12 12:21:37 -04:00
4aea7272f0
Merged with master
2017-10-12 12:15:44 -04:00
5c76a34f01
Fixed #675,#697, and #710
2017-10-07 22:39:41 -04:00
eccdbfb7cd
Adjust cert path
2017-09-26 11:49:25 -07:00
61d62d22da
Adjusted cert path
2017-09-26 11:48:23 -07:00
df64b1e6d1
Rest fix from #657
2017-09-06 11:14:36 -04:00
2973bfe0c9
Rest fix for Deleting agent results
2017-09-06 10:57:58 -04:00
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
a67b733f2b
Fixed global name 'ssl' is not defined
2017-09-03 16:05:19 -04:00
6ec96ee1aa
Merge pull request #547 from n0clues/creds_args
...
RESTfulAPI - api/admin/login fix
2017-09-02 11:00:18 -04:00
dffd332614
Fix for #579
2017-09-02 10:58:00 -04:00
a6ae921f29
Update rest ssl.SSLContext object
2017-09-02 10:52:05 -04:00
1f8364c69c
Fix for #631
2017-09-02 10:15:45 -04:00
47400cd720
Fix for #631
2017-09-02 09:46:51 -04:00
58a6af027d
Update empire
2017-08-31 21:16:10 -04:00
8d489ae66d
Update empire
2017-08-31 21:15:12 -04:00
0e611e13bd
Revert "Revert "Fixed RESTAPI (issue #507 )""
...
This reverts commit ec13f26056
2017-08-28 18:45:37 -06:00
332b78d07c
Fix shebangs
...
Move shebangs to /usr/bin/env foo
2017-08-16 01:41:22 -04:00
ec13f26056
Revert "Fixed RESTAPI (issue #507 )"
...
This reverts commit b539e12347
2017-06-12 10:04:22 -07:00
c25fea4e70
Updated SSL context to use the split empire-chain.pem and empire-priv.key files.
2017-06-08 08:48:42 -07:00
425cb7fedc
Merge branch 'dev' into restfulapi_fixes
2017-05-30 22:07:20 -06:00
9e4eeca433
RESTfulAPI login fixes
2017-05-30 17:30:32 +02:00
6ee85e73f2
Fixed RESTAPI (issue #507 )
2017-05-26 11:58:52 -04:00
4bf792e4e0
Addresses issue #526
2017-05-26 11:58:52 -04:00
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
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
65a2018bd2
Even more REST api fixes
2017-05-03 17:46:35 -04:00
1d451e95c5
Moooore REST API fixes
2017-05-03 17:14:46 -04:00
10b215b797
Rest API fix
2017-05-03 13:51:09 -04:00
e581551424
More Rest API fixes
2017-05-01 23:37:21 -04:00
5cadd7b6e9
More Rest API fixes
2017-05-01 00:47:42 -04:00
b28ebbf969
REST Api fixes
2017-04-30 00:58:32 -04:00
48116d35d6
Re-implemented /api/listeners/options GET Rest call
2017-04-28 22:04:10 -04:00
1546b6b484
Merge branch '2.0_beta' into 2.0_beta
2017-04-24 19:57:38 -04:00
da01ad2cc1
Minor bugfixes
2017-04-22 14:29:23 -07:00
4325b27eb3
API list stager by name
2017-04-22 14:20:10 -07:00
31ef020f79
Retrieving token via user/pass fixed
2017-04-22 13:09:41 -07:00
073f7428d9
Setting REST API user/pass now works
2017-04-22 13:02:58 -07:00
6280d9e64f
config API GET fixes
2017-04-22 12:34:35 -07:00
b488e2f3e0
reporting API GET fixes
2017-04-22 12:01:48 -07:00
e66b62ba42
reporting API GET fixes
2017-04-22 11:43:48 -07:00
72c7d73a00
Results API GET fixes
2017-04-22 11:31:53 -07:00
58e8a2cfa9
Re-mapping database fields in API
2017-04-22 07:58:39 -07:00
d41d961cb4
Fixed API "Listener" GET, now displays options in JSON
2017-04-21 22:57:11 -07:00
a6499372fb
Merge branch 'patch-1' of https://github.com/bneg/Empire into bneg-patch-1
2017-04-20 20:21:29 -07:00
fc70107f08
API call listener_name fixed, need to review SQL stmt for SQLi
2017-04-18 14:25:34 -07:00
b89b7fc1f9
Fixing listeners API
2017-04-18 12:59:39 -07:00
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
xorrior
root
byt3bl33d3r
Drew Varner
dchrastil
byt3bl33d3r
n0clues
bneg