From 1072607c42d854f0759268f97abdaf39a7caa947 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Tue, 21 Jul 2020 18:02:17 +0300
Subject: [PATCH] Fix import order

---
 monkey/infection_monkey/exploit/vsftpd.py           | 4 ++--
 monkey/monkey_island/cc/app.py                      | 4 ++--
 monkey/monkey_island/cc/resources/auth/auth.py      | 2 +-
 monkey/monkey_island/cc/resources/telemetry_feed.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/monkey/infection_monkey/exploit/vsftpd.py b/monkey/infection_monkey/exploit/vsftpd.py
index 8ecac35f1..ec263411f 100644
--- a/monkey/infection_monkey/exploit/vsftpd.py
+++ b/monkey/infection_monkey/exploit/vsftpd.py
@@ -14,8 +14,8 @@ from infection_monkey.exploit.tools.helpers import (build_monkey_commandline,
                                                     get_monkey_depth,
                                                     get_target_monkey)
 from infection_monkey.exploit.tools.http_tools import HTTPTools
-from infection_monkey.model import (CHMOD_MONKEY, DOWNLOAD_TIMEOUT, MONKEY_ARG,
-                                    RUN_MONKEY, WGET_HTTP_UPLOAD)
+from infection_monkey.model import (
+    CHMOD_MONKEY, DOWNLOAD_TIMEOUT, MONKEY_ARG, RUN_MONKEY, WGET_HTTP_UPLOAD)
 from infection_monkey.telemetry.attack.t1222_telem import T1222Telem
 
 LOG = getLogger(__name__)
diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index 0249263e7..ea81c0903 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -10,7 +10,8 @@ from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH
 from monkey_island.cc.database import database, mongo
 from monkey_island.cc.resources.attack.attack_config import AttackConfiguration
 from monkey_island.cc.resources.attack.attack_report import AttackReport
-from monkey_island.cc.resources.auth.auth import init_jwt, Authenticate
+from monkey_island.cc.resources.auth.auth import Authenticate, init_jwt
+from monkey_island.cc.resources.auth.registration import Registration
 from monkey_island.cc.resources.bootloader import Bootloader
 from monkey_island.cc.resources.client_run import ClientRun
 from monkey_island.cc.resources.edge import Edge
@@ -31,7 +32,6 @@ from monkey_island.cc.resources.node import Node
 from monkey_island.cc.resources.node_states import NodeStates
 from monkey_island.cc.resources.pba_file_download import PBAFileDownload
 from monkey_island.cc.resources.pba_file_upload import FileUpload
-from monkey_island.cc.resources.auth.registration import Registration
 from monkey_island.cc.resources.remote_run import RemoteRun
 from monkey_island.cc.resources.reporting.report import Report
 from monkey_island.cc.resources.root import Root
diff --git a/monkey/monkey_island/cc/resources/auth/auth.py b/monkey/monkey_island/cc/resources/auth/auth.py
index f86e0eeb1..86d0f6924 100644
--- a/monkey/monkey_island/cc/resources/auth/auth.py
+++ b/monkey/monkey_island/cc/resources/auth/auth.py
@@ -2,8 +2,8 @@ import json
 import logging
 from functools import wraps
 
-import flask_restful
 import flask_jwt_extended
+import flask_restful
 from flask import make_response, request
 from flask_jwt_extended.exceptions import JWTExtendedException
 from jwt import PyJWTError
diff --git a/monkey/monkey_island/cc/resources/telemetry_feed.py b/monkey/monkey_island/cc/resources/telemetry_feed.py
index b6152ac32..c278d2f36 100644
--- a/monkey/monkey_island/cc/resources/telemetry_feed.py
+++ b/monkey/monkey_island/cc/resources/telemetry_feed.py
@@ -5,9 +5,9 @@ import dateutil
 import flask_pymongo
 import flask_restful
 from flask import request
-from monkey_island.cc.resources.auth.auth import jwt_required
 
 from monkey_island.cc.database import mongo
+from monkey_island.cc.resources.auth.auth import jwt_required
 from monkey_island.cc.services.node import NodeService
 
 logger = logging.getLogger(__name__)