p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Various required fixes

This commit is contained in:
Itay Mizeretz 2018-05-23 20:29:32 +03:00
parent d30f2cf8dc
commit 8a56144a09
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/infection_monkey/main.py
View File

@ -11,7 +11,7 @@ import traceback
from config import WormConfiguration, EXTERNAL_CONFIG_FILE from config import WormConfiguration, EXTERNAL_CONFIG_FILE
from dropper import MonkeyDrops from dropper import MonkeyDrops
from model import MONKEY_ARG, DROPPER_ARG from model import MONKEY_ARG, DROPPER_ARG
from monkey import InfectionMonkey from infection_monkey.monkey import InfectionMonkey
import utils import utils
if __name__ == "__main__": if __name__ == "__main__":

11
monkey/monkey_island/cc/app.py
View File

@ -4,7 +4,7 @@ from datetime import datetime
import bson import bson
import flask_restful import flask_restful
from bson.json_util import dumps from bson.json_util import dumps
from flask import Flask, send_from_directory, make_response from flask import Flask, send_from_directory, make_response, Response
from werkzeug.exceptions import NotFound from werkzeug.exceptions import NotFound
from cc.auth import init_jwt from cc.auth import init_jwt
@ -28,18 +28,23 @@ from cc.services.config import ConfigService
__author__ = 'Barak' __author__ = 'Barak'
HOME_FILE = 'index.html'
def serve_static_file(static_path): def serve_static_file(static_path):
if static_path.startswith('api/'): if static_path.startswith('api/'):
raise NotFound() raise NotFound()
try: try:
return send_from_directory('ui/dist', static_path) return send_from_directory(os.path.join(os.getcwd(), 'monkey_island/cc/ui/dist'), static_path)
except NotFound: except NotFound:
# Because react uses various urls for same index page, this is probably the user's intention. # Because react uses various urls for same index page, this is probably the user's intention.
if static_path == HOME_FILE:
flask_restful.abort(Response("Server cwd isn't right, should be monkey\\monkey.", 500))
return serve_home() return serve_home()
def serve_home(): def serve_home():
return serve_static_file('index.html') return serve_static_file(HOME_FILE)
def normalize_obj(obj): def normalize_obj(obj):

4
monkey/monkey_island/cc/resources/local_run.py
View File

@ -24,8 +24,8 @@ def run_local_monkey():
if not result: if not result:
return False, "OS Type not found" return False, "OS Type not found"
monkey_path = os.path.join('binaries', result['filename']) monkey_path = os.path.join(os.getcwd(), 'monkey_island', 'cc', 'binaries', result['filename'])
target_path = os.path.join(os.getcwd(), result['filename']) target_path = os.path.join(os.getcwd(), 'monkey_island', result['filename'])
# copy the executable to temp path (don't run the monkey from its current location as it may delete itself) # copy the executable to temp path (don't run the monkey from its current location as it may delete itself)
try: try: