Skip to content

Commit

Permalink
Fix for error after latest commit on snare.py develop branch (#91)
Browse files Browse the repository at this point in the history 
* fix

* Update snare.py
  • Loading branch information
@viskey98 @afeena
viskey98 authored and afeena committed Jan 30, 2018
1 parent 9954855 commit 8b0aeae
Showing 1 changed file with 23 additions and 30 deletions.
53 changes: 23 additions & 30 deletions snare.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,16 @@ def __init__(self, meta, run_args, debug=False, keep_alive=75, **kwargs):
)
super().__init__(debug=debug, keep_alive=keep_alive, access_log=None, **kwargs)

@asyncio.coroutine
def get_dorks(self):
async def get_dorks(self):
dorks = None
try:
with aiohttp.Timeout(10.0):
with aiohttp.ClientSession() as session:
r = yield from session.get(
r = await session.get(
'http://{0}:8090/dorks'.format(self.run_args.tanner)
)
try:
dorks = yield from r.json()
dorks = await r.json()
except json.decoder.JSONDecodeError as e:
print(e)
finally:
Expand All @@ -77,12 +76,11 @@ def get_dorks(self):
print('Dorks timeout')
return dorks['response']['dorks'] if dorks else []

@asyncio.coroutine
def submit_slurp(self, data):
async def submit_slurp(self, data):
try:
with aiohttp.Timeout(10.0):
with aiohttp.ClientSession(connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
r = yield from session.post(
r = await session.post(
'https://{0}:8080/api?auth={1}&chan=snare_test&msg={2}'.format(
self.run_args.slurp_host, self.run_args.slurp_auth, data
), data=json.dumps(data)
Expand Down Expand Up @@ -116,17 +114,16 @@ def create_data(self, request, response_status):
data['cookies'] = {cookie.split('=')[0]: cookie.split('=')[1] for cookie in header['Cookie'].split('; ')}
return data

@asyncio.coroutine
def submit_data(self, data):
async def submit_data(self, data):
event_result = None
try:
with aiohttp.Timeout(10.0):
with aiohttp.ClientSession() as session:
r = yield from session.post(
r = await session.post(
'http://{0}:8090/event'.format(self.run_args.tanner), data=json.dumps(data)
)
try:
event_result = yield from r.json()
event_result = await r.json()
except json.decoder.JSONDecodeError as e:
print(e, data)
finally:
Expand All @@ -135,8 +132,7 @@ def submit_data(self, data):
raise e
return event_result

@asyncio.coroutine
def handle_html_content(self, content):
async def handle_html_content(self, content):
soup = BeautifulSoup(content, 'html.parser')
for p_elem in soup.find_all('p'):
if p_elem.findChildren():
Expand All @@ -149,7 +145,7 @@ def handle_html_content(self, content):
for idx, word in enumerate(text_list):
# Fetch dorks if required
if len(self.dorks) <= 0:
self.dorks = yield from self.get_dorks()
self.dorks = await self.get_dorks()
word += ' '
if idx % 5 == 0:
a_tag = soup.new_tag(
Expand All @@ -167,26 +163,25 @@ def handle_html_content(self, content):
content = soup.encode('utf-8')
return content

@asyncio.coroutine
def handle_request(self, request, payload):
async def handle_request(self, request, payload):
print('Request path: {0}'.format(request.path))
data = self.create_data(request, 200)
if request.method == 'POST':
post_data = yield from payload.read()
post_data = await payload.read()
post_data = MultiDict(parse_qsl(post_data.decode('utf-8')))
print('POST data:')
for key, val in post_data.items():
print('\t- {0}: {1}'.format(key, val))
data['post_data'] = dict(post_data)

# Submit the event to the TANNER service
event_result = yield from self.submit_data(data)
event_result = await self.submit_data(data)

# Log the event to slurp service if enabled
if self.run_args.slurp_enabled:
yield from self.submit_slurp(request.path)
await self.submit_slurp(request.path)

content, content_type, headers, status_code = yield from self.parse_tanner_response(request.path, event_result['response']['message']['detection'])
content, content_type, headers, status_code = await self.parse_tanner_response(request.path, event_result['response']['message']['detection'])
response = aiohttp.Response(
self.writer, status=status_code, http_version=request.version
)
Expand Down Expand Up @@ -214,10 +209,9 @@ def handle_request(self, request, payload):
response.send_headers()
if content:
response.write(content)
yield from response.write_eof()
await response.write_eof()

@asyncio.coroutine
def parse_tanner_response(self, requested_name, detection):
async def parse_tanner_response(self, requested_name, detection):
content_type = None
content = None
status_code = 200
Expand All @@ -239,7 +233,7 @@ def parse_tanner_response(self, requested_name, detection):
content = fh.read()
if content_type:
if 'text/html' in content_type:
content = yield from self.handle_html_content(content)
content = await self.handle_html_content(content)

elif detection['type'] == 2:
payload_content = detection['payload']
Expand Down Expand Up @@ -398,21 +392,20 @@ def parse_timeout(timeout):
return result


@asyncio.coroutine
def check_tanner():
async def check_tanner():
vm = VersionManager()
with aiohttp.ClientSession() as client:
req_url = 'http://{}:8090/version'.format(args.tanner)
try:
resp = yield from client.get(req_url)
result = yield from resp.json()
resp = await client.get(req_url)
result = await resp.json()
version = result["version"]
vm.check_compatibility(version)
except aiohttp.errors.ClientOSError:
print("Can't connect to tanner host {}".format(req_url))
exit(1)
else:
yield from resp.release()
await resp.release()


if __name__ == '__main__':
Expand Down Expand Up @@ -488,7 +481,7 @@ def check_tanner():
host_ip = args.host_ip
future = loop.create_server(
lambda: HttpRequestHandler(meta_info, args, debug=args.debug, keep_alive=75),
args.host-ip, int(args.port))
args.host_ip, int(args.port))
srv = loop.run_until_complete(future)

drop_privileges()
Expand Down

0 comments on commit 8b0aeae

Please sign in to comment.