From f14755edf3becaecb2dd256aa37e5b5510ea4675 Mon Sep 17 00:00:00 2001 From: Amir Jalali Date: Wed, 26 Jun 2024 14:20:22 -0700 Subject: [PATCH 1/3] fixed typo in Azure load_vms cypher (#1047) --- cartography/intel/azure/compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cartography/intel/azure/compute.py b/cartography/intel/azure/compute.py index 060098f574..b5347c0b98 100644 --- a/cartography/intel/azure/compute.py +++ b/cartography/intel/azure/compute.py @@ -43,7 +43,7 @@ def load_vms(neo4j_session: neo4j.Session, subscription_id: str, vm_list: List[D v.resourcegroup = vm.resource_group SET v.lastupdated = $update_tag, v.name = vm.name, v.plan = vm.plan.product, v.size = vm.hardware_profile.vm_size, - v.license_type=vm.license_type, v.computer_name=vm.os_profile.computer_ame, + v.license_type=vm.license_type, v.computer_name=vm.os_profile.computer_name, v.identity_type=vm.identity.type, v.zones=vm.zones, v.ultra_ssd_enabled=vm.additional_capabilities.ultra_ssd_enabled, v.priority=vm.priority, v.eviction_policy=vm.eviction_policy From 5f4afd0aedc95edd7830e2a2a119dfc96afaed41 Mon Sep 17 00:00:00 2001 From: Alex Chantavy Date: Wed, 26 Jun 2024 14:25:58 -0700 Subject: [PATCH 2/3] Add Chandan to MAINTAINERS.md (#1322) --- MAINTAINERS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 7599b1b5b1..99e1ea52b7 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -11,6 +11,7 @@ List of community members who have shown they are committed to Cartography's con - Marco Lancini (https://github.com/marco-lancini): Deployment and use-cases - Kedar Ghule (https://github.com/kedarghule): Plugin development - Purusottam Mupunu (https://https://github.com/mpurusottamc): Deployment and use-cases +- Chandan Chowdhury (https://github.com/chandanchowdhury): Plugin development ## Friends of Cartography From 07243c224c3e27fb9022d88a95b4331c10cd76ba Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 27 Jun 2024 06:24:02 +0800 Subject: [PATCH 3/3] crowdstrike: remove arbitrary filter and limit (#1008) Minor change to remove hardcoded settings that likely don't fit many environments Co-authored-by: i_virus --- cartography/intel/crowdstrike/endpoints.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cartography/intel/crowdstrike/endpoints.py b/cartography/intel/crowdstrike/endpoints.py index c48d4e1dad..7da23f1c8c 100644 --- a/cartography/intel/crowdstrike/endpoints.py +++ b/cartography/intel/crowdstrike/endpoints.py @@ -76,9 +76,9 @@ def load_host_data( ) -def get_host_ids(client: Hosts) -> List[List[str]]: +def get_host_ids(client: Hosts, crowdstrikeapi_filter: str = '', crowdstrikeapi_limit: int = 5000) -> List[List[str]]: ids = [] - parameters = {"filter": 'service_provider:"AWS_EC2"', "limit": 400} + parameters = {"filter": crowdstrikeapi_filter, "limit": crowdstrikeapi_limit} response = client.QueryDevicesByFilter(parameters=parameters) body = response.get("body", {}) resources = body.get("resources", [])