Merge pull request #347 from spiderxm/development

remove cyclic dependency

Author: dhirensr

config.py

@@ -5,7 +5,7 @@
 import socket
 
 from core.time_helper import hours
-from core.compatible import generate_token
+from core.token import generate_token
 
 # Protocol number to protocol string table
 protocol_table = {
@@ -18,7 +18,7 @@
 
 def api_configuration():
     """
-    API Config (could be modify by user)
+    API Config (could be modified by user)
 
     Returns:
         a JSON with API configuration
@@ -64,7 +64,7 @@ def network_configuration():
         "store_network_captured_files": False,
         "real_machine_ip_address": real_machine_ip_address,
         "ignore_real_machine_ip_address": True,  # or if you want to simulate from local network, save as False
-        "ignore_virtual_machine_ip_addresses": True,  # or if you want simulate from local network, save as False
+        "ignore_virtual_machine_ip_addresses": True,  # or if you want to simulate from local network, save as False
         "real_machine_identifier_name": "stockholm_server_1",  # can be anything e.g. real_machine_ip_address, name, etc
         "ignore_real_machine_ip_addresses": list(
             {

core/alert.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import sys
-from core import color
+from core.color import color_cmd
 from core.log import get_logger
 from core.time_helper import now
 from core.compatible import is_verbose_mode
@@ -36,11 +36,11 @@ def info(content):
     """
     sys.stdout.buffer.write(
         bytes(
-            color.color_cmd("yellow")
+            color_cmd("yellow")
             + "[+] [{0}] ".format(now())
-            + color.color_cmd("green")
+            + color_cmd("green")
             + content
-            + color.color_cmd("reset")
+            + color_cmd("reset")
             + "\n",
             "utf8"
         )
@@ -79,11 +79,11 @@ def warn(content):
     logger.warning(content)
     sys.stdout.buffer.write(
         bytes(
-            color.color_cmd("blue")
+            color_cmd("blue")
             + "[!] [{0}] ".format(now())
-            + color.color_cmd("yellow")
+            + color_cmd("yellow")
             + content
-            + color.color_cmd("reset")
+            + color_cmd("reset")
             + "\n",
             "utf8")
     )
@@ -107,11 +107,11 @@ def verbose_info(content):
         logger.info(content)
         sys.stdout.buffer.write(
             bytes(
-                color.color_cmd("cyan")
+                color_cmd("cyan")
                 + "[v] [{0}] ".format(now())
-                + color.color_cmd("grey")
+                + color_cmd("grey")
                 + content
-                + color.color_cmd("reset")
+                + color_cmd("reset")
                 + "\n",
                 "utf8"
             )
@@ -132,10 +132,10 @@ def error(content):
     """
     logger.error(content)
     sys.stdout.buffer.write(
-        (color.color_cmd("red")
+        (color_cmd("red")
          + "[X] [{0}] ".format(now())
-         + color.color_cmd("yellow")
-         + content + color.color_cmd("reset")
+         + color_cmd("yellow")
+         + content + color_cmd("reset")
          + "\n"
          ).encode("utf8")
     )

core/color.py

@@ -5,12 +5,20 @@
 import sys
 
 
+def os_name():
+    """
+    OS name
+
+    Returns:
+        OS name in string
+    """
+    return sys.platform
+
+
 def reset_cmd_color():
     """
     reset the color of windows/terminal before exit
     """
-    # TODO : Fix the cyclic dependency later
-    from core.compatible import os_name
     if "linux" in os_name() or os_name() == "darwin":
         sys.stdout.write("\033[0m")
     else:
@@ -29,8 +37,7 @@ def color_cmd(color):
     Returns:
         color values or empty string
     """
-    from core.compatible import os_name
-    if "--disable-colors" in sys.argv:
+    if "--disable-colors" in os_name():
         return ""
     if "linux" in os_name() or os_name() == "darwin":
         if color == "reset":

core/compatible.py

@@ -13,19 +13,10 @@
 import inspect
 import json
 import elasticsearch
-from core.color import reset_cmd_color
 from core.exit_helper import exit_failure
 from shutil import which
-
-
-def logo():
-    """
-    OWASP HoneyPot Logo
-    """
-    # TODO : Fix the cyclic dependency later
-    from core.alert import write_to_api_console
-    write_to_api_console(open('.owasp_honeypot').read())
-    reset_cmd_color()
+from config import api_configuration
+from core.messages import load_messages
 
 
 def version():
@@ -38,16 +29,6 @@ def version():
     return int(sys.version_info[0])
 
 
-def os_name():
-    """
-    OS name
-
-    Returns:
-        OS name in string
-    """
-    return sys.platform
-
-
 def get_timeout_error():
     """
     Get the timeout error thrown by pyshark apply_on_packets function
@@ -68,9 +49,6 @@ def check_for_requirements(start_api_server):
     Returns:
         True if exist otherwise False
     """
-    # TODO : Fix the cyclic dependency later
-    from config import api_configuration
-    from core.messages import load_messages
     messages = load_messages().message_contents
     # check external required modules
     api_config = api_configuration()
@@ -194,19 +172,6 @@ def get_module_dir_path(module):
     )
 
 
-def generate_token(length=32):
-    """
-    generate token using hex chars
-
-    Args:
-        length: length of token - default 32
-
-    Returns:
-        token string
-    """
-    return "".join(random.choice("0123456789abcdef") for _ in range(length))
-
-
 def byte_to_str(data):
     """
     convert data to str

core/exit_helper.py

@@ -3,7 +3,6 @@
 
 import sys
 import ctypes
-
 from core.color import reset_cmd_color
 
 
@@ -22,8 +21,9 @@ def exit_failure(msg):
     Args:
         msg: the error message
     """
-    # TODO : Fix the cyclic dependency later
     from core.alert import error
+
+    # TODO : Fix the cyclic dependency later
     error(msg)
     reset_cmd_color()
     sys.exit(1)

core/load.py

@@ -17,7 +17,8 @@
 from core.color import reset_cmd_color
 from core.compatible import (check_for_requirements, copy_dir_tree,
                              get_module_dir_path, is_verbose_mode,
-                             logo, make_tmp_thread_dir, mkdir)
+                             make_tmp_thread_dir, mkdir)
+from core.logo import logo
 from core.exit_helper import exit_failure, exit_success, terminate_thread
 from core.get_modules import (load_all_modules,
                               virtual_machine_name_to_container_name,

core/logo.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from core.color import reset_cmd_color
+from core.alert import write_to_api_console
+
+
+def logo():
+    """
+    OWASP HoneyPot Logo
+    """
+    write_to_api_console(open('.owasp_honeypot').read())
+    reset_cmd_color()

core/token.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import random
+
+
+def generate_token(length=32):
+    """
+    generate token using hex chars
+
+    Args:
+        length: length of token - default 32
+
+    Returns:
+        token string
+    """
+    return "".join(random.choice("0123456789abcdef") for _ in range(length))

modules/ftp/strong_password/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import time
-from core.compatible import generate_token
+from core.token import generate_token
 import os
 import json
 from database.connector import insert_to_credential_events_collection

modules/http/basic_auth_strong_password/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import time
-from core.compatible import generate_token
+from core.token import generate_token
 import os
 import binascii
 import json

modules/smtp/strong_password/__init__.py

@@ -4,7 +4,7 @@
 import time
 import os
 import json
-from core.compatible import generate_token
+from core.token import generate_token
 from database.connector import insert_to_credential_events_collection
 from database.datatypes import CredentialEvent
 

modules/ssh/strong_password/__init__.py

@@ -4,7 +4,7 @@
 import time
 import os
 import json
-from core.compatible import generate_token
+from core.token import generate_token
 from database.connector import insert_to_credential_events_collection
 from database.datatypes import CredentialEvent
 

tests/test_core_compatible.py

@@ -1,7 +1,8 @@
 import unittest
 from unittest.mock import patch
 import sys
-from core.compatible import (byte_to_str, is_verbose_mode, generate_token)
+from core.compatible import (byte_to_str, is_verbose_mode)
+from core.token import generate_token
 
 
 class TestCoreAlert(unittest.TestCase):