From 466c43737202a342a00f0da2f67bada8cc8bc883 Mon Sep 17 00:00:00 2001 From: Taylor Date: Thu, 26 Sep 2024 08:10:04 -0500 Subject: [PATCH 1/6] comment out db logging for now dont really want to use it since docker logs are more usefull and dont have log rotation in db yet --- backend/copilot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/copilot.py b/backend/copilot.py index 1caf400b..0d0e0919 100644 --- a/backend/copilot.py +++ b/backend/copilot.py @@ -103,13 +103,13 @@ ################## ! Middleware LOGGING TO `log_entry` table ! ################## # Comment out logging for now, not sure I want to use it -app.middleware("http")(log_requests) # using the imported middleware +#app.middleware("http")(log_requests) # using the imported middleware ################## ! Exception Handlers ! ################## -app.add_exception_handler(HTTPException, custom_http_exception_handler) -app.add_exception_handler(RequestValidationError, validation_exception_handler) -app.add_exception_handler(ValueError, value_error_handler) +#app.add_exception_handler(HTTPException, custom_http_exception_handler) +#app.add_exception_handler(RequestValidationError, validation_exception_handler) +#app.add_exception_handler(ValueError, value_error_handler) ################## ! INCLUDE ROUTES ! ################## From b3a8b0c22d6b9d8698c213112a16abbc5a67e7bd Mon Sep 17 00:00:00 2001 From: Taylor Date: Thu, 26 Sep 2024 15:18:50 -0500 Subject: [PATCH 2/6] only handle errors and not all requests --- backend/copilot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/copilot.py b/backend/copilot.py index 0d0e0919..03fb1ab2 100644 --- a/backend/copilot.py +++ b/backend/copilot.py @@ -107,9 +107,9 @@ ################## ! Exception Handlers ! ################## -#app.add_exception_handler(HTTPException, custom_http_exception_handler) -#app.add_exception_handler(RequestValidationError, validation_exception_handler) -#app.add_exception_handler(ValueError, value_error_handler) +app.add_exception_handler(HTTPException, custom_http_exception_handler) +app.add_exception_handler(RequestValidationError, validation_exception_handler) +app.add_exception_handler(ValueError, value_error_handler) ################## ! INCLUDE ROUTES ! ################## From 67a9c69d240ff18890133c20ca81ca2fdfd69584 Mon Sep 17 00:00:00 2001 From: Davide Di Modica Date: Fri, 27 Sep 2024 10:13:51 +0200 Subject: [PATCH 3/6] feat: add customer provision presets --- .../provision/CustomerProvisionWizard.vue | 25 +++++++++++++++++-- .../incidentManagement/alerts/AlertsList.vue | 17 +++++++------ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/customers/provision/CustomerProvisionWizard.vue b/frontend/src/components/customers/provision/CustomerProvisionWizard.vue index d7d35d4a..70898e1b 100644 --- a/frontend/src/components/customers/provision/CustomerProvisionWizard.vue +++ b/frontend/src/components/customers/provision/CustomerProvisionWizard.vue @@ -273,7 +273,7 @@ import { import isIP from "validator/es/lib/isIP" import isPort from "validator/es/lib/isPort" import isURL from "validator/es/lib/isURL" -import { computed, onBeforeMount, ref, toRefs } from "vue" +import { computed, onBeforeMount, ref, toRefs, watch } from "vue" const props = defineProps<{ customerCode: string @@ -560,7 +560,14 @@ function toggleDashboards() { if (allDashboardsSelected.value) { form.value.dashboards_to_include.dashboards = [] } else { - form.value.dashboards_to_include.dashboards = dashboardOptions.value.map(o => o.value) + form.value.dashboards_to_include.dashboards = dashboardOptions.value + .filter( + o => + !["EDR_WAZUH_INVENOTRY", "EDR_WAZUH_INVENTORY", "EDR_AGENT_INVENTORY"] + .map(d => d.toLowerCase()) + .includes(o.value.toLowerCase()) + ) + .map(o => o.value) } } @@ -614,6 +621,20 @@ async function submit() { }) } +function formPreset(step: number) { + switch (step) { + case 2: + if (!form.value.customer_index_name) { + form.value.customer_index_name = `wazuh-${form.value.customer_code}` + } + break + } +} + +watch(current, val => { + formPreset(val) +}) + onBeforeMount(() => { getProvisioningDefaultSettings() getSubscriptions() diff --git a/frontend/src/components/incidentManagement/alerts/AlertsList.vue b/frontend/src/components/incidentManagement/alerts/AlertsList.vue index 0d56941f..c7e53a41 100644 --- a/frontend/src/components/incidentManagement/alerts/AlertsList.vue +++ b/frontend/src/components/incidentManagement/alerts/AlertsList.vue @@ -150,14 +150,15 @@ import { computed, nextTick, onBeforeMount, provide, ref, watch } from "vue" import AlertItem from "./AlertItem.vue" import AlertsFilters from "./AlertsFilters.vue" -const { highlight, preset, showFilters } = withDefaults( - defineProps<{ - highlight?: string | null - preset?: AlertsListFilter[] - showFilters?: boolean - }>(), - { showFilters: true } -) +const { + highlight, + preset, + showFilters = true +} = defineProps<{ + highlight?: string | null + preset?: AlertsListFilter[] + showFilters?: boolean +}>() const FilterIcon = "carbon:filter-edit" const InfoIcon = "carbon:information" From 83ee68ce49aa3ca44d76911c3fe0a23f8cddf66d Mon Sep 17 00:00:00 2001 From: Taylor Date: Fri, 27 Sep 2024 08:44:24 -0500 Subject: [PATCH 4/6] feat: Fix typo in WazuhDashboard enum The commit message suggests fixing a typo in the `WazuhDashboard` enum by changing `EDR_AD_INVENOTRY` to `EDR_AD_INVENTORY`. --- backend/app/connectors/grafana/schema/dashboards.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/connectors/grafana/schema/dashboards.py b/backend/app/connectors/grafana/schema/dashboards.py index dd51eea3..2a2428aa 100644 --- a/backend/app/connectors/grafana/schema/dashboards.py +++ b/backend/app/connectors/grafana/schema/dashboards.py @@ -42,7 +42,7 @@ class WazuhDashboard(Enum): EDR_COMPLIANCE = ("Wazuh", "edr_compliance.json") EDR_AV_MALWARE_IOC = ("Wazuh", "edr_av_malware_ioc.json") EDR_AGENT_INVENTORY = ("Wazuh", "edr_agent_inventory.json") - EDR_AD_INVENOTRY = ("Wazuh", "edr_ad_inventory.json") + EDR_AD_INVENTORY = ("Wazuh", "edr_ad_inventory.json") EDR_SYSTEM_VULNERABILITIES_NEW = ("Wazuh", "edr_system_vulnerabilities_new.json") From 5592db2d0ad8f5fd4729400cdaaf3a11f70e8dbc Mon Sep 17 00:00:00 2001 From: Taylor Date: Fri, 27 Sep 2024 08:47:26 -0500 Subject: [PATCH 5/6] chore: comment logging middleware in copilot.py --- backend/copilot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/copilot.py b/backend/copilot.py index 03fb1ab2..a270fa0d 100644 --- a/backend/copilot.py +++ b/backend/copilot.py @@ -28,7 +28,7 @@ from app.middleware.exception_handlers import custom_http_exception_handler from app.middleware.exception_handlers import validation_exception_handler from app.middleware.exception_handlers import value_error_handler -from app.middleware.logger import log_requests +#from app.middleware.logger import log_requests # from app.routers import ask_socfortress from app.routers import active_response @@ -103,7 +103,7 @@ ################## ! Middleware LOGGING TO `log_entry` table ! ################## # Comment out logging for now, not sure I want to use it -#app.middleware("http")(log_requests) # using the imported middleware +# app.middleware("http")(log_requests) # using the imported middleware ################## ! Exception Handlers ! ################## From ba6c50f8024ec08420a55158c2667447753103b2 Mon Sep 17 00:00:00 2001 From: Taylor Date: Fri, 27 Sep 2024 08:49:17 -0500 Subject: [PATCH 6/6] precommit fixes --- backend/copilot.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/copilot.py b/backend/copilot.py index a270fa0d..6841209a 100644 --- a/backend/copilot.py +++ b/backend/copilot.py @@ -28,7 +28,6 @@ from app.middleware.exception_handlers import custom_http_exception_handler from app.middleware.exception_handlers import validation_exception_handler from app.middleware.exception_handlers import value_error_handler -#from app.middleware.logger import log_requests # from app.routers import ask_socfortress from app.routers import active_response @@ -75,6 +74,9 @@ from app.schedulers.scheduler import get_scheduler_instance from app.schedulers.scheduler import init_scheduler +# from app.middleware.logger import log_requests + + auth_handler = AuthHandler() # Get the `SERVER_IP` from the `.env` file load_dotenv()