Resolve conflict

readme-wiki
xorrior 2018-01-03 00:07:07 -05:00
parent 60af008d1d
commit 4e69d01b88
2 changed files with 17 additions and 6 deletions

17
.circleci/test.py Normal file
View File

@ -0,0 +1,17 @@
#!/usr/bin/python
import requests, sys, os, json
baseurl = "http://localhost:1337"
endpoint = "/api/admin/login"
headers = {"Content-Type":"application/json"}
# Authentication Test
data = {"username":"empireadmin", "password":"Password123!"}
jdata = json.dumps(data)
resp = requests.get(baseurl+endpoint, data=jdata)

6
empire
View File

@ -884,12 +884,6 @@ def start_restful_api(empireMenu, suppress=False, username=None, password=None,
agentTaskResults.append({"AgentName": agentSessionID, "AgentResults": results})
<<<<<<< HEAD
=======
if agentResults and agentResults[0] and agentResults[0] != '':
agentTaskResults.append({"AgentName":agentSessionID, "AgentResults":agentResults[0]})
>>>>>>> dev
return jsonify({'results': agentTaskResults})