folder restructure (#96)
* folder restructure * precommit fixes
taylor_socfortress committed
Sep 14, 2023 at 15:03 UTC
3b7c3609910309ed6f12b45babc7dc9f625ba8bc
45 files changed
+67
-95
backend/app/routes/agents.py
+3
-3
@@ -7,9 +7,9 @@ from loguru import logger
7
from app.models.agents import agent_metadata_schema
8
from app.services.agents.agents import AgentService
9
from app.services.agents.agents import AgentSyncService
10
-from app.services.WazuhManager.agent import WazuhManagerAgentService
11
-from app.services.WazuhManager.universal import UniversalService
12
-from app.services.WazuhManager.vulnerability import VulnerabilityService
10
+from app.services.wazuh_manager.agent import WazuhManagerAgentService
11
+from app.services.wazuh_manager.universal import UniversalService
12
+from app.services.wazuh_manager.vulnerability import VulnerabilityService
13
14
bp = Blueprint("agents", __name__)
15
backend/app/routes/alerts.py
+1
-1
@@ -2,7 +2,7 @@ from flask import Blueprint
2
from flask import jsonify
3
from flask import request
4
5
-from app.services.WazuhIndexer.alerts import AlertsService
5
+from app.services.wazuh_indexer.alerts import AlertsService
6
7
bp = Blueprint("alerts", __name__)
8
backend/app/routes/customers.py
+3
-3
@@ -7,9 +7,9 @@ from loguru import logger
7
8
from app.models.agents import AgentMetadata
9
from app.models.agents import agent_metadatas_schema
10
-from app.services.Customers.universal import UniversalCustomers
11
-from app.services.Customers.universal import UniversalCustomersMeta
12
-from app.services.Healthchecks.agents import HealthcheckAgentsService
10
+from app.services.customers.universal import UniversalCustomers
11
+from app.services.customers.universal import UniversalCustomersMeta
12
+from app.services.healthchecks.agents import HealthcheckAgentsService
13
14
bp = Blueprint("customers", __name__)
15
backend/app/routes/dfir_iris.py
+5
-5
@@ -2,11 +2,11 @@ from flask import Blueprint
2
from flask import jsonify
3
from flask import request
4
5
-from app.services.DFIR_IRIS.alerts import IRISAlertsService
6
-from app.services.DFIR_IRIS.assets import AssetsService
7
-from app.services.DFIR_IRIS.cases import CasesService
8
-from app.services.DFIR_IRIS.notes import NotesService
9
-from app.services.DFIR_IRIS.users import IRISUsersService
5
+from app.services.dfir_iris.alerts import IRISAlertsService
6
+from app.services.dfir_iris.assets import AssetsService
7
+from app.services.dfir_iris.cases import CasesService
8
+from app.services.dfir_iris.notes import NotesService
9
+from app.services.dfir_iris.users import IRISUsersService
10
11
bp = Blueprint("dfir_iris", __name__)
12
backend/app/routes/graylog.py
+7
-7
@@ -2,13 +2,13 @@ from flask import Blueprint
2
from flask import jsonify
3
from loguru import logger
4
5
-from app.services.Graylog.events import EventsService
6
-from app.services.Graylog.index import IndexService
7
-from app.services.Graylog.inputs import InputsService
8
-from app.services.Graylog.messages import MessagesService
9
-from app.services.Graylog.metrics import MetricsService
10
-from app.services.Graylog.pipelines import PipelinesService
11
-from app.services.Graylog.streams import StreamsService
5
+from app.services.graylog.events import EventsService
6
+from app.services.graylog.index import IndexService
7
+from app.services.graylog.inputs import InputsService
8
+from app.services.graylog.messages import MessagesService
9
+from app.services.graylog.metrics import MetricsService
10
+from app.services.graylog.pipelines import PipelinesService
11
+from app.services.graylog.streams import StreamsService
12
13
bp = Blueprint("graylog", __name__)
14
backend/app/routes/healthchecks.py
+1
-1
@@ -6,7 +6,7 @@ from loguru import logger
6
7
from app.models.agents import agent_metadata_schema
8
from app.services.agents.agents import AgentService
9
-from app.services.Healthchecks.agents import HealthcheckAgentsService
9
+from app.services.healthchecks.agents import HealthcheckAgentsService
10
11
bp = Blueprint("healthchecks", __name__)
12
backend/app/routes/influxdb.py
+2
-2
@@ -6,8 +6,8 @@ from flask import jsonify
6
from flask import request
7
from loguru import logger
8
9
-from app.services.InfluxDB.alerts import InfluxDBAlertsService
10
-from app.services.InfluxDB.checks import InfluxDBChecksService
9
+from app.services.influxdb.alerts import InfluxDBAlertsService
10
+from app.services.influxdb.checks import InfluxDBChecksService
11
12
bp = Blueprint("influxdb", __name__)
13
backend/app/routes/rules.py
+3
-5
@@ -6,11 +6,9 @@ from flask import Blueprint
6
from flask import request
7
from loguru import logger
8
9
-from app.services.WazuhManager.disabled_rule import DisableRuleService
10
-from app.services.WazuhManager.enabled_rule import EnableRuleService
11
-from app.services.WazuhManager.universal import UniversalService
12
-
13
-# from app.services.WazuhManager.wazuhmanager import WazuhManagerService
9
+from app.services.wazuh_manager.disabled_rule import DisableRuleService
10
+from app.services.wazuh_manager.enabled_rule import EnableRuleService
11
+from app.services.wazuh_manager.universal import UniversalService
12
13
bp = Blueprint("rules", __name__)
14
backend/app/routes/shuffle.py
+1
-1
@@ -2,7 +2,7 @@ from flask import Blueprint
2
from flask import jsonify
3
from loguru import logger
4
5
-from app.services.Shuffle.workflows import WorkflowsService
5
+from app.services.shuffle.workflows import WorkflowsService
6
7
bp = Blueprint("shuffle", __name__)
8
backend/app/routes/sublime.py
+2
-2
@@ -6,8 +6,8 @@ from flask import jsonify
6
from flask import request
7
from loguru import logger
8
9
-from app.services.Sublime.alerts import InvalidPayloadError
10
-from app.services.Sublime.alerts import SublimeAlertsService
9
+from app.services.sublime.alerts import InvalidPayloadError
10
+from app.services.sublime.alerts import SublimeAlertsService
11
12
bp = Blueprint("sublime", __name__)
13
backend/app/routes/threatintel.py
+1
-1
@@ -7,7 +7,7 @@ from app.models.connectors import SocfortressThreatIntelConnector
7
from app.services.threat_intel.socfortress.universal import (
8
SocfortressThreatIntelService,
9
)
10
-from app.services.WazuhIndexer.ioc_search import IocSearchService
10
+from app.services.wazuh_indexer.ioc_search import IocSearchService
11
12
bp = Blueprint("threatintel", __name__)
13
backend/app/routes/velociraptor.py
+2
-2
@@ -6,8 +6,8 @@ from flask import Response
6
from flask import jsonify
7
from flask import request
8
9
-from app.services.Velociraptor.artifacts import ArtifactsService
10
-from app.services.Velociraptor.universal import UniversalService
9
+from app.services.velociraptor.artifacts import ArtifactsService
10
+from app.services.velociraptor.universal import UniversalService
11
12
bp = Blueprint("velociraptor", __name__)
13
backend/app/routes/wazuhindexer.py
+2
-2
@@ -2,8 +2,8 @@ from flask import Blueprint
2
from loguru import logger
3
4
from app import db
5
-from app.services.WazuhIndexer.cluster import ClusterService
6
-from app.services.WazuhIndexer.index import IndexService
5
+from app.services.wazuh_indexer.cluster import ClusterService
6
+from app.services.wazuh_indexer.index import IndexService
7
8
bp = Blueprint("wazuh_indexer", __name__)
9
backend/app/services/DFIR_IRIS/alerts.py
+5
-5
@@ -7,11 +7,11 @@ from loguru import logger
7
8
from app.models.agents import agent_metadata_schema
9
from app.services.agents.agents import AgentService
10
-from app.services.DFIR_IRIS.host_enrichment import AssetTypeResolver
11
-from app.services.DFIR_IRIS.ioc_enrichment import DomainValidator
12
-from app.services.DFIR_IRIS.ioc_enrichment import HashValidator
13
-from app.services.DFIR_IRIS.ioc_enrichment import IPv4AddressValidator
14
-from app.services.DFIR_IRIS.universal import UniversalService
10
+from app.services.dfir_iris.host_enrichment import AssetTypeResolver
11
+from app.services.dfir_iris.ioc_enrichment import DomainValidator
12
+from app.services.dfir_iris.ioc_enrichment import HashValidator
13
+from app.services.dfir_iris.ioc_enrichment import IPv4AddressValidator
14
+from app.services.dfir_iris.universal import UniversalService
15
16
17
class IRISAlertsService:
backend/app/services/DFIR_IRIS/assets.py
+1
-1
@@ -8,7 +8,7 @@ from dfir_iris_client.case import Case
8
# from dfir_iris_client.session import ClientSession
9
from loguru import logger
10
11
-from app.services.DFIR_IRIS.universal import UniversalService
11
+from app.services.dfir_iris.universal import UniversalService
12
13
14
class AssetsService:
backend/app/services/DFIR_IRIS/cases.py
+1
-6
@@ -1,15 +1,10 @@
1
from datetime import datetime
2
from typing import Dict
3
4
-# import requests
4
from dfir_iris_client.case import Case
6
-
7
-# from dfir_iris_client.helper.utils import assert_api_resp
8
-# from dfir_iris_client.helper.utils import get_data_from_resp
9
-# from dfir_iris_client.session import ClientSession
5
from loguru import logger
6
12
-from app.services.DFIR_IRIS.universal import UniversalService
7
+from app.services.dfir_iris.universal import UniversalService
8
9
10
class CasesService:
backend/app/services/DFIR_IRIS/notes.py
+1
-6
@@ -1,14 +1,9 @@
1
from typing import Dict
2
3
-# import requests
3
from dfir_iris_client.case import Case
5
-
6
-# from dfir_iris_client.helper.utils import assert_api_resp
7
-# from dfir_iris_client.helper.utils import get_data_from_resp
8
-# from dfir_iris_client.session import ClientSession
4
from loguru import logger
5
11
-from app.services.DFIR_IRIS.universal import UniversalService
6
+from app.services.dfir_iris.universal import UniversalService
7
8
9
class NotesService:
backend/app/services/DFIR_IRIS/users.py
+1
-7
@@ -1,16 +1,10 @@
1
from typing import Dict
2
3
from dfir_iris_client.alert import Alert
4
-
5
-# import requests
4
from dfir_iris_client.users import User
7
-
8
-# from dfir_iris_client.helper.utils import assert_api_resp
9
-# from dfir_iris_client.helper.utils import get_data_from_resp
10
-# from dfir_iris_client.session import ClientSession
5
from loguru import logger
6
13
-from app.services.DFIR_IRIS.universal import UniversalService
7
+from app.services.dfir_iris.universal import UniversalService
8
9
10
class IRISUsersService:
backend/app/services/Graylog/events.py
+1
-3
@@ -6,9 +6,7 @@ from typing import Union
6
import requests
7
from loguru import logger
8
9
-from app.services.Graylog.universal import UniversalService
10
-
11
-# from typing import List
9
+from app.services.graylog.universal import UniversalService
10
11
12
class EventsService:
backend/app/services/Graylog/index.py
+1
-1
@@ -5,7 +5,7 @@ from typing import Union
5
import requests
6
from loguru import logger
7
8
-from app.services.Graylog.universal import UniversalService
8
+from app.services.graylog.universal import UniversalService
9
10
11
class IndexService:
backend/app/services/Graylog/inputs.py
+1
-3
@@ -6,9 +6,7 @@ from typing import Union
6
import requests
7
from loguru import logger
8
9
-from app.services.Graylog.universal import UniversalService
10
-
11
-# from typing import List
9
+from app.services.graylog.universal import UniversalService
10
11
12
class InputsService:
backend/app/services/Graylog/messages.py
+1
-1
@@ -7,7 +7,7 @@ from typing import Union
7
import requests
8
from loguru import logger
9
10
-from app.services.Graylog.universal import UniversalService
10
+from app.services.graylog.universal import UniversalService
11
12
13
class MessagesService:
backend/app/services/Graylog/metrics.py
+1
-1
@@ -7,7 +7,7 @@ from typing import Union
7
import requests
8
from loguru import logger
9
10
-from app.services.Graylog.universal import UniversalService
10
+from app.services.graylog.universal import UniversalService
11
12
# from typing import List
13
backend/app/services/Graylog/pipelines.py
+1
-1
@@ -6,7 +6,7 @@ from typing import Union
6
import requests
7
from loguru import logger
8
9
-from app.services.Graylog.universal import UniversalService
9
+from app.services.graylog.universal import UniversalService
10
11
# from typing import List
12
backend/app/services/Graylog/streams.py
+1
-1
@@ -6,7 +6,7 @@ from typing import Union
6
import requests
7
from loguru import logger
8
9
-from app.services.Graylog.universal import UniversalService
9
+from app.services.graylog.universal import UniversalService
10
11
# from typing import List
12
backend/app/services/Healthchecks/agents.py
+1
-1
@@ -6,7 +6,7 @@ from typing import Union
6
7
from loguru import logger
8
9
-from app.services.WazuhIndexer.universal import UniversalService
9
+from app.services.wazuh_indexer.universal import UniversalService
10
11
12
class HealthcheckAgentsService:
backend/app/services/InfluxDB/alerts.py
+1
-1
@@ -7,7 +7,7 @@ from loguru import logger
7
8
from app import db
9
from app.models.influxdb_alerts import InfluxDBAlerts
10
-from app.services.InfluxDB.universal import UniversalService
10
+from app.services.influxdb.universal import UniversalService
11
12
# OrgID for the InfluxDB server
13
ORG_ID = "a1b203a448a55d31"
backend/app/services/InfluxDB/checks.py
+1
-1
@@ -5,7 +5,7 @@ from typing import Union
5
import requests
6
from loguru import logger
7
8
-from app.services.InfluxDB.universal import UniversalService
8
+from app.services.influxdb.universal import UniversalService
9
10
# OrgID for the InfluxDB server
11
ORG_ID = "a1b203a448a55d31"
backend/app/services/Shuffle/workflows.py
+1
-1
@@ -3,7 +3,7 @@ from typing import Dict
3
import requests
4
from loguru import logger
5
6
-from app.services.Shuffle.universal import UniversalService
6
+from app.services.shuffle.universal import UniversalService
7
8
9
class WorkflowsService:
backend/app/services/Sublime/alerts.py
+1
-1
@@ -7,7 +7,7 @@ from loguru import logger
7
8
from app import db
9
from app.models.sublime_alerts import SublimeAlerts
10
-from app.services.Sublime.universal import UniversalService
10
+from app.services.sublime.universal import UniversalService
11
12
13
class InvalidPayloadError(Exception):
backend/app/services/Velociraptor/artifacts.py
+1
-1
@@ -5,7 +5,7 @@ from typing import Optional
5
from loguru import logger
6
7
from app.models.agents import AgentMetadata
8
-from app.services.Velociraptor.universal import UniversalService
8
+from app.services.velociraptor.universal import UniversalService
9
10
11
class ArtifactsService:
backend/app/services/agents/agents.py
+1
-1
@@ -15,7 +15,7 @@ from app.models.agents import agent_metadatas_schema
15
from app.models.connectors import Connector
16
from app.models.connectors import WazuhManagerConnector
17
from app.models.connectors import connector_factory
18
-from app.services.Velociraptor.universal import UniversalService
18
+from app.services.velociraptor.universal import UniversalService
19
20
21
class AgentService:
backend/app/services/smtp/create_report.py
+1
-1
@@ -20,7 +20,7 @@ matplotlib.use(
20
# in main loop issue as it bypasses the need for tkinter.
21
import matplotlib.pyplot as plt
22
23
-from app.services.WazuhIndexer.alerts import AlertsService
23
+from app.services.wazuh_indexer.alerts import AlertsService
24
25
26
def fetch_alert_data(service, fetch_func):
backend/app/services/wazuh_indexer/__init__.py
renamed
backend/app/services/wazuh_indexer/alerts.py
renamed
+3
-3
@@ -7,9 +7,9 @@ from elasticsearch7 import Elasticsearch
7
from loguru import logger
8
9
from app.services.ask_socfortress.universal import AskSocfortressService
10
-from app.services.DFIR_IRIS.alerts import IRISAlertsService
11
-from app.services.WazuhIndexer.universal import QueryBuilder
12
-from app.services.WazuhIndexer.universal import UniversalService
10
+from app.services.dfir_iris.alerts import IRISAlertsService
11
+from app.services.wazuh_indexer.universal import QueryBuilder
12
+from app.services.wazuh_indexer.universal import UniversalService
13
14
15
class AlertsService:
backend/app/services/wazuh_indexer/cluster.py
renamed
+1
-1
@@ -7,7 +7,7 @@ from elasticsearch7 import Elasticsearch
7
from loguru import logger
8
9
from app.models.wazuh_indexer import WazuhIndexerAllocation
10
-from app.services.WazuhIndexer.universal import UniversalService
10
+from app.services.wazuh_indexer.universal import UniversalService
11
12
13
class ClusterService:
backend/app/services/wazuh_indexer/index.py
renamed
+1
-1
@@ -4,7 +4,7 @@ from typing import Dict
4
from elasticsearch7 import Elasticsearch
5
from loguru import logger
6
7
-from app.services.WazuhIndexer.universal import UniversalService
7
+from app.services.wazuh_indexer.universal import UniversalService
8
9
10
class IndexService:
backend/app/services/wazuh_indexer/ioc_search.py
renamed
+1
-1
@@ -9,7 +9,7 @@ from loguru import logger
9
from app.services.threat_intel.socfortress.universal import (
10
SocfortressThreatIntelService,
11
)
12
-from app.services.WazuhIndexer.universal import UniversalService
12
+from app.services.wazuh_indexer.universal import UniversalService
13
14
15
class IocSearchService:
backend/app/services/wazuh_indexer/universal.py
renamed
backend/app/services/wazuh_manager/__init__.py
renamed
backend/app/services/wazuh_manager/agent.py
renamed
+1
-1
@@ -6,7 +6,7 @@ from typing import Optional
6
import requests
7
from loguru import logger
8
9
-from app.services.WazuhManager.universal import UniversalService
9
+from app.services.wazuh_manager.universal import UniversalService
10
11
12
class WazuhHttpRequests:
backend/app/services/wazuh_manager/disabled_rule.py
renamed
+1
-4
@@ -12,11 +12,8 @@ import xmltodict
12
from loguru import logger
13
14
from app import db
15
-
16
-# from app.models.connectors import Connector
17
-# from app.models.connectors import connector_factory
15
from app.models.rules import DisabledRules
19
-from app.services.WazuhManager.universal import UniversalService
16
+from app.services.wazuh_manager.universal import UniversalService
17
18
19
class WazuhHttpRequests:
backend/app/services/wazuh_manager/enabled_rule.py
renamed
+1
-4
@@ -13,11 +13,8 @@ import xmltodict
13
from loguru import logger
14
15
from app import db
16
-
17
-# from app.models.connectors import Connector
18
-# from app.models.connectors import connector_factory
16
from app.models.rules import DisabledRules
20
-from app.services.WazuhManager.universal import UniversalService
17
+from app.services.wazuh_manager.universal import UniversalService
18
19
20
class WazuhHttpRequests:
backend/app/services/wazuh_manager/universal.py
renamed
backend/app/services/wazuh_manager/vulnerability.py
renamed
+1
-1
@@ -6,7 +6,7 @@ from typing import Optional
6
import requests
7
from loguru import logger
8
9
-from app.services.WazuhManager.universal import UniversalService
9
+from app.services.wazuh_manager.universal import UniversalService
10
11
12
class WazuhHttpRequests: