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

No need to avoid circular imports

This commit is contained in:
Daniel Goldberg 2019-11-13 11:10:26 +02:00
parent 31a60b12ff
commit 4f59a85f0b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/infection_monkey/network/HostFinger.py
View File

@ -2,17 +2,16 @@ from abc import abstractmethod
from infection_monkey.config import WormConfiguration from infection_monkey.config import WormConfiguration
from infection_monkey.utils.plugins.plugin import Plugin from infection_monkey.utils.plugins.plugin import Plugin
import infection_monkey.network
class HostFinger(Plugin): class HostFinger(Plugin):
@staticmethod @staticmethod
def base_package_file(): def base_package_file():
import infection_monkey.network # avoid circular imports
return infection_monkey.network.__file__ return infection_monkey.network.__file__
@staticmethod @staticmethod
def base_package_name(): def base_package_name():
import infection_monkey.network # avoid circular imports
return infection_monkey.network.__package__ return infection_monkey.network.__package__
@property @property

4
monkey/infection_monkey/post_breach/pba.py
View File

@ -7,7 +7,7 @@ from infection_monkey.utils.environment import is_windows_os
from infection_monkey.config import WormConfiguration from infection_monkey.config import WormConfiguration
from infection_monkey.telemetry.attack.t1064_telem import T1064Telem from infection_monkey.telemetry.attack.t1064_telem import T1064Telem
from infection_monkey.utils.plugins.plugin import Plugin from infection_monkey.utils.plugins.plugin import Plugin
import infection_monkey.post_breach.actions
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
__author__ = 'VakarisZ' __author__ = 'VakarisZ'
@ -22,12 +22,10 @@ class PBA(Plugin):
@staticmethod @staticmethod
def base_package_name(): def base_package_name():
import infection_monkey.post_breach.actions # avoid circular imports
return infection_monkey.post_breach.actions.__package__ return infection_monkey.post_breach.actions.__package__
@staticmethod @staticmethod
def base_package_file(): def base_package_file():
import infection_monkey.post_breach.actions
return infection_monkey.post_breach.actions.__file__ return infection_monkey.post_breach.actions.__file__
def __init__(self, name="unknown", linux_cmd="", windows_cmd=""): def __init__(self, name="unknown", linux_cmd="", windows_cmd=""):