cartography 0.102.0rc2__py3-none-any.whl → 0.103.0rc1__py3-none-any.whl

cartography/intel/jamf/util.py

@@ -12,14 +12,19 @@ _TIMEOUT = (60, 60)
 
 
 @timeit
-def call_jamf_api(api_and_parameters: str, jamf_base_uri: str, jamf_user: str, jamf_password: str) -> List[Dict]:
+def call_jamf_api(
+    api_and_parameters: str,
+    jamf_base_uri: str,
+    jamf_user: str,
+    jamf_password: str,
+) -> List[Dict]:
     uri = jamf_base_uri + api_and_parameters
     jamf_auth = requests.auth.HTTPBasicAuth(jamf_user, jamf_password)
     try:
         response = requests.get(
             uri,
             auth=jamf_auth,
-            headers={'Accept': 'application/json'},
+            headers={"Accept": "application/json"},
             timeout=_TIMEOUT,
         )
     except requests.exceptions.Timeout:

cartography/intel/kandji/__init__.py

@@ -19,10 +19,13 @@ def start_kandji_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
 
     :return: None
     """
-    if config.kandji_base_uri is None or config.kandji_token is None or config.kandji_tenant_id is None:
+    if (
+        config.kandji_base_uri is None
+        or config.kandji_token is None
+        or config.kandji_tenant_id is None
+    ):
         logger.warning(
-            'Required parameter missing. Skipping sync. '
-            'See docs to configure.',
+            "Required parameter missing. Skipping sync. " "See docs to configure.",
         )
         return
 

cartography/intel/kandji/devices.py

@@ -12,7 +12,6 @@ from cartography.models.kandji.device import KandjiDeviceSchema
 from cartography.models.kandji.tenant import KandjiTenantSchema
 from cartography.util import timeit
 
-
 logger = logging.getLogger(__name__)
 _TIMEOUT = (60, 60)
 
@@ -21,8 +20,8 @@ _TIMEOUT = (60, 60)
 def get(kandji_base_uri: str, kandji_token: str) -> List[Dict[str, Any]]:
     api_endpoint = f"{kandji_base_uri}/api/v1/devices"
     headers = {
-        'Accept': 'application/json',
-        'Authorization': f'Bearer {kandji_token}',
+        "Accept": "application/json",
+        "Authorization": f"Bearer {kandji_token}",
     }
 
     offset = 0
@@ -39,7 +38,9 @@ def get(kandji_base_uri: str, kandji_token: str) -> List[Dict[str, Any]]:
         logger.debug("Kandji device offset: %s", offset)
 
         params["offset"] = offset
-        response = session.get(api_endpoint, headers=headers, timeout=_TIMEOUT, params=params)
+        response = session.get(
+            api_endpoint, headers=headers, timeout=_TIMEOUT, params=params
+        )
         response.raise_for_status()
 
         result = response.json()
@@ -60,7 +61,7 @@ def transform(api_result: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     result: List[Dict[str, Any]] = []
     for device in api_result:
         n_device = device
-        n_device['id'] = device['device_id']
+        n_device["id"] = device["device_id"]
         result.append(n_device)
     return result
 
@@ -78,7 +79,7 @@ def load_devices(
     load(
         neo4j_session,
         KandjiTenantSchema(),
-        [{'id': tenant_id}],
+        [{"id": tenant_id}],
         lastupdated=update_tag,
     )
 
@@ -91,8 +92,13 @@ def load_devices(
     )
 
 
-def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict[str, Any]) -> None:
-    GraphJob.from_node_schema(KandjiDeviceSchema(), common_job_parameters).run(neo4j_session)
+def cleanup(
+    neo4j_session: neo4j.Session,
+    common_job_parameters: Dict[str, Any],
+) -> None:
+    GraphJob.from_node_schema(KandjiDeviceSchema(), common_job_parameters).run(
+        neo4j_session,
+    )
 
 
 @timeit

cartography/intel/kubernetes/namespaces.py

@@ -21,9 +21,9 @@ def sync_namespaces(session: Session, client: K8sClient, update_tag: int) -> Dic
     load_namespaces(session, cluster, namespaces, update_tag)
     merge_module_sync_metadata(
         session,
-        group_type='KubernetesCluster',
-        group_id=cluster['uid'],
-        synced_type='KubernetesCluster',
+        group_type="KubernetesCluster",
+        group_id=cluster["uid"],
+        synced_type="KubernetesCluster",
         update_tag=update_tag,
         stat_handler=stat_handler,
     )
@@ -49,7 +49,10 @@ def get_namespaces(client: K8sClient) -> Tuple[Dict, List[Dict]]:
 
 
 def load_namespaces(
-    session: Session, cluster: Dict, data: List[Dict], update_tag: int,
+    session: Session,
+    cluster: Dict,
+    data: List[Dict],
+    update_tag: int,
 ) -> None:
     ingestion_cypher_query = """
     MERGE (cluster:KubernetesCluster {id: $cluster_id})

cartography/intel/kubernetes/pods.py

@@ -13,7 +13,10 @@ logger = logging.getLogger(__name__)
 
 @timeit
 def sync_pods(
-    session: Session, client: K8sClient, update_tag: int, cluster: Dict,
+    session: Session,
+    client: K8sClient,
+    update_tag: int,
+    cluster: Dict,
 ) -> List[Dict]:
     pods = get_pods(client, cluster)
     load_pods(session, pods, update_tag)
@@ -34,11 +37,11 @@ def get_pods(client: K8sClient, cluster: Dict) -> List[Dict]:
         if pod.status and pod.status.container_statuses:
             for status in pod.status.container_statuses:
                 if status.name in containers:
-                    _state = 'waiting'
+                    _state = "waiting"
                     if status.state.running:
-                        _state = 'running'
+                        _state = "running"
                     elif status.state.terminated:
-                        _state = 'terminated'
+                        _state = "terminated"
                     try:
                         image_sha = status.image_id.split("@")[1]
                     except IndexError:

cartography/intel/kubernetes/services.py

@@ -13,7 +13,11 @@ logger = logging.getLogger(__name__)
 
 @timeit
 def sync_services(
-    session: Session, client: K8sClient, update_tag: int, cluster: Dict, pods: List[Dict],
+    session: Session,
+    client: K8sClient,
+    update_tag: int,
+    cluster: Dict,
+    pods: List[Dict],
 ) -> None:
     services = get_services(client, cluster, pods)
     load_services(session, services, update_tag)
@@ -44,9 +48,9 @@ def get_services(client: K8sClient, cluster: Dict, pods: List[Dict]) -> List[Dic
             is_service_pod = True if service.spec.selector else False
             for selector in service.spec.selector or dict():
                 if (
-                    not pod.get("labels") or
-                    selector not in pod["labels"] or
-                    service.spec.selector[selector] != pod["labels"][selector]
+                    not pod.get("labels")
+                    or selector not in pod["labels"]
+                    or service.spec.selector[selector] != pod["labels"][selector]
                 ):
                     is_service_pod = False
                     break

cartography/intel/lastpass/__init__.py

@@ -20,8 +20,8 @@ def start_lastpass_ingestion(neo4j_session: neo4j.Session, config: Config) -> No
 
     if not config.lastpass_cid or not config.lastpass_provhash:
         logger.info(
-            'Lastpass import is not configured - skipping this module. '
-            'See docs to configure.',
+            "Lastpass import is not configured - skipping this module. "
+            "See docs to configure.",
         )
         return
 

cartography/intel/lastpass/users.py

@@ -35,13 +35,17 @@ def sync(
 @timeit
 def get(lastpass_provhash: str, tenant_id: int) -> Dict[str, Any]:
     payload = {
-        'cid': tenant_id,
-        'provhash': lastpass_provhash,
-        'cmd': 'getuserdata',
-        'data': None,
+        "cid": tenant_id,
+        "provhash": lastpass_provhash,
+        "cmd": "getuserdata",
+        "data": None,
     }
     session = Session()
-    req = session.post('https://lastpass.com/enterpriseapi.php', data=payload, timeout=_TIMEOUT)
+    req = session.post(
+        "https://lastpass.com/enterpriseapi.php",
+        data=payload,
+        timeout=_TIMEOUT,
+    )
     req.raise_for_status()
     return req.json()
 
@@ -49,11 +53,13 @@ def get(lastpass_provhash: str, tenant_id: int) -> Dict[str, Any]:
 @timeit
 def transform(api_result: Dict[str, Any]) -> List[Dict[str, Any]]:
     result: List[Dict[str, Any]] = []
-    for uid, user in api_result['Users'].items():
+    for uid, user in api_result["Users"].items():
         n_user = user.copy()
-        n_user['id'] = int(uid)
-        for k in ('created', 'last_pw_change', 'last_login'):
-            n_user[k] = int(dt_parse.parse(user[k]).timestamp() * 1000) if user[k] else None
+        n_user["id"] = int(uid)
+        for k in ("created", "last_pw_change", "last_login"):
+            n_user[k] = (
+                int(dt_parse.parse(user[k]).timestamp() * 1000) if user[k] else None
+            )
         result.append(n_user)
     return result
 
@@ -68,7 +74,7 @@ def load_users(
     load(
         neo4j_session,
         LastpassTenantSchema(),
-        [{'id': tenant_id}],
+        [{"id": tenant_id}],
         lastupdated=update_tag,
     )
 
@@ -81,5 +87,10 @@ def load_users(
     )
 
 
-def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict[str, Any]) -> None:
-    GraphJob.from_node_schema(LastpassUserSchema(), common_job_parameters).run(neo4j_session)
+def cleanup(
+    neo4j_session: neo4j.Session,
+    common_job_parameters: Dict[str, Any],
+) -> None:
+    GraphJob.from_node_schema(LastpassUserSchema(), common_job_parameters).run(
+        neo4j_session,
+    )

cartography/intel/oci/__init__.py

@@ -11,17 +11,19 @@ from oci.exceptions import ConfigFileNotFound
 from oci.exceptions import InvalidConfig
 from oci.exceptions import ProfileNotFound
 
+from cartography.config import Config
+
 from . import iam
 from . import organizations
 from . import utils
-from cartography.config import Config
+
 # from cartography.util import run_analysis_job
 # from cartography.util import run_cleanup_job
 # from . import network
 # from . import compute
 
 logger = logging.getLogger(__name__)
-Resources = namedtuple('Resources', 'compute iam network')
+Resources = namedtuple("Resources", "compute iam network")
 
 
 def _sync_one_account(
@@ -32,11 +34,21 @@ def _sync_one_account(
     common_job_parameters: Dict[str, Any],
 ) -> None:
     logger.info("Syncing OCI IAM client for OCI Tenancy with ID '%s'.", tenancy_id)
-    iam.sync(neo4j_session, resources.iam, tenancy_id, oci_sync_tag, common_job_parameters)
+    iam.sync(
+        neo4j_session,
+        resources.iam,
+        tenancy_id,
+        oci_sync_tag,
+        common_job_parameters,
+    )
 
     regions = utils.get_regions_in_tenancy(neo4j_session, tenancy_id)
     for region in regions:
-        logger.info("Syncing OCI region '%s' for OCI Tenancy with ID '%s'.", region["name"], tenancy_id)
+        logger.info(
+            "Syncing OCI region '%s' for OCI Tenancy with ID '%s'.",
+            region["name"],
+            tenancy_id,
+        )
         _change_resources_region(resources, region["name"])
         # compute.sync(neo4j_session, resources.compute,
         #   tenancy_id, region["name"], oci_sync_tag, common_job_parameters
@@ -56,15 +68,25 @@ def _sync_multiple_accounts(
     sync_tag: int,
     common_job_parameters: Dict[str, Any],
 ) -> None:
-    logger.debug("Syncing OCI accounts: %s", ', '.join(accounts.keys()))
+    logger.debug("Syncing OCI accounts: %s", ", ".join(accounts.keys()))
     organizations.sync(neo4j_session, accounts, sync_tag, common_job_parameters)
 
     for name in accounts:
-        logger.info("Syncing OCI Tenancy with ID '%s' using configured profile '%s'.", accounts[name]["tenancy"], name)
+        logger.info(
+            "Syncing OCI Tenancy with ID '%s' using configured profile '%s'.",
+            accounts[name]["tenancy"],
+            name,
+        )
         resources = _initialize_resources(accounts[name])
         tenancy_id = accounts[name]["tenancy"]
         common_job_parameters["OCI_TENANCY_ID"] = tenancy_id
-        _sync_one_account(neo4j_session, resources, tenancy_id, sync_tag, common_job_parameters)
+        _sync_one_account(
+            neo4j_session,
+            resources,
+            tenancy_id,
+            sync_tag,
+            common_job_parameters,
+        )
 
     del common_job_parameters["OCI_TENANCY_ID"]
 
@@ -82,7 +104,9 @@ def _change_resources_region(resources: NamedTuple, region: str) -> None:
         resource.base_client.set_region(region)
 
 
-def _get_network_resource(credentials: Dict[str, Any]) -> oci.core.virtual_network_client.VirtualNetworkClient:
+def _get_network_resource(
+    credentials: Dict[str, Any],
+) -> oci.core.virtual_network_client.VirtualNetworkClient:
     """
     Instantiates a OCI VirtualNetworkClient resource object to call the Network API.
      See https://docs.cloud.oracle.com/en-us/iaas/Content/Network/Concepts/overview.htm.
@@ -92,7 +116,9 @@ def _get_network_resource(credentials: Dict[str, Any]) -> oci.core.virtual_netwo
     return oci.core.VirtualNetworkClient(credentials)
 
 
-def _get_iam_resource(credentials: Dict[str, Any]) -> oci.identity.identity_client.IdentityClient:
+def _get_iam_resource(
+    credentials: Dict[str, Any],
+) -> oci.identity.identity_client.IdentityClient:
     """
     Instantiates a OCI IdentityCleint resource object to call the Identity API. This is used to users,
      ..., ... and ... data. See https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/computeoverview.htm.
@@ -102,7 +128,9 @@ def _get_iam_resource(credentials: Dict[str, Any]) -> oci.identity.identity_clie
     return oci.identity.IdentityClient(credentials)
 
 
-def _get_compute_resource(credentials: Dict[str, Any]) -> oci.core.compute_client.ComputeClient:
+def _get_compute_resource(
+    credentials: Dict[str, Any],
+) -> oci.core.compute_client.ComputeClient:
     """
     Instantiates a OCI ComputeClient resource object to call the Compute API. This is used to pull zone, instance, and
     networking data. https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/computeoverview.htm.
@@ -180,7 +208,12 @@ def start_oci_ingestion(neo4j_session: neo4j.Session, config: Config) -> None:
         )
         return
 
-    _sync_multiple_accounts(neo4j_session, oci_accounts, config.update_tag, common_job_parameters)
+    _sync_multiple_accounts(
+        neo4j_session,
+        oci_accounts,
+        config.update_tag,
+        common_job_parameters,
+    )
 
     # Look into adding analysis job once compute is implemented.
     # run_analysis_job(