openhound-github 0.3.5__tar.gz → 0.3.7__tar.gz

{openhound_github-0.3.5 → openhound_github-0.3.7}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: openhound-github
-Version: 0.3.5
+Version: 0.3.7
 Summary: Github collector for OpenHound
 Author-email: "jdreijer@specterops.io" <jdreijer@specterops.io>, Jared Atkinson <jatkinson@specterops.io>
 License-File: LICENSE.md
 Requires-Python: >=3.13
 Requires-Dist: joserfc>=1.6.5
-Requires-Dist: openhound>=0.2.7
 Requires-Dist: requests>=2.33.0
 Description-Content-Type: text/markdown
 

{openhound_github-0.3.5 → openhound_github-0.3.7}/pyproject.toml

@@ -6,7 +6,6 @@ readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "joserfc>=1.6.5",
-    "openhound>=0.2.7",
     "requests>=2.33.0",
 ]
 authors = [
@@ -29,7 +28,7 @@ local_scheme = "no-local-version"
 
 [dependency-groups]
 dev = [
-    "openhound",
+    "openhound>=0.2.7",
     "pre-commit>=4.5.1",
     "pytest>=9.0.1",
     "ruff>=0.15.5",

{openhound_github-0.3.5 → openhound_github-0.3.7}/src/openhound_github/models/enterprise_organization.py

@@ -55,6 +55,8 @@ class EnterpriseOrganization(BaseAsset):
 
     @property
     def as_node(self) -> GHNode:
+        # Only collected if the org was explicitly collected (present in the lookup).
+        collected = self._lookup.org_login_for_id(self.node_id) is not None
         return GHNode(
             kinds=[nk.ORGANIZATION],
             properties=GHEnterpriseOrganizationProperties(
@@ -64,7 +66,7 @@ class EnterpriseOrganization(BaseAsset):
                 environmentid=self.node_id,
                 environment_name=self.login,
                 login=self.login,
-                collected=False,
+                collected=collected,
                 query_enterprise=f"MATCH p=(:GH_Enterprise {{node_id:'{self.enterprise_node_id}'}})-[:GH_Contains]->(:GH_Organization {{node_id:'{self.node_id}'}}) RETURN p",
             ),
         )

openhound_github-0.3.7/tests/test_enterprise_organization.py

@@ -0,0 +1,69 @@
+"""
+Tests for EnterpriseOrganization.as_node `collected` resolution.
+
+An organization discovered via the enterprise is a stub node. Its `collected`
+flag must be derived from the organizations lookup table so that it agrees with
+the full Organization node regardless of ingestion order:
+
+    - explicitly collected org (present in lookup) -> collected=True
+    - enterprise-only discovered org (absent)       -> collected=False
+"""
+from unittest.mock import MagicMock
+
+from openhound_github.models import EnterpriseOrganization
+
+
+def _make_org(node_id: str = "ORG_NODE_1", login: str = "acme") -> EnterpriseOrganization:
+    org = EnterpriseOrganization(
+        id=node_id,
+        login=login,
+        enterprise_node_id="ENT_NODE_1",
+        enterprise_slug="acme-enterprise",
+    )
+    return org
+
+
+def test_collected_true_when_org_in_lookup() -> None:
+    """An org present in the organizations lookup is marked collected=True."""
+    org = _make_org(node_id="ORG_NODE_1", login="acme")
+    lookup = MagicMock()
+    lookup.org_login_for_id.return_value = "acme"
+    org._lookup = lookup
+
+    node = org.as_node
+
+    assert node.properties.collected is True
+    lookup.org_login_for_id.assert_called_once_with("ORG_NODE_1")
+
+
+def test_collected_false_when_org_not_in_lookup() -> None:
+    """An enterprise-only discovered org (absent from lookup) is collected=False."""
+    org = _make_org(node_id="ORG_NODE_2", login="beta")
+    lookup = MagicMock()
+    lookup.org_login_for_id.return_value = None
+    org._lookup = lookup
+
+    node = org.as_node
+
+    assert node.properties.collected is False
+    lookup.org_login_for_id.assert_called_once_with("ORG_NODE_2")
+
+
+def test_collected_resolved_per_node_id_in_multi_org_enterprise() -> None:
+    """Each stub resolves `collected` against its own node_id independently."""
+    collected_ids = {"ORG_NODE_COLLECTED"}
+
+    def fake_lookup(node_id: str):
+        return "login" if node_id in collected_ids else None
+
+    lookup = MagicMock()
+    lookup.org_login_for_id.side_effect = fake_lookup
+
+    collected_org = _make_org(node_id="ORG_NODE_COLLECTED", login="collected")
+    collected_org._lookup = lookup
+
+    stub_org = _make_org(node_id="ORG_NODE_STUB", login="stub")
+    stub_org._lookup = lookup
+
+    assert collected_org.as_node.properties.collected is True
+    assert stub_org.as_node.properties.collected is False

{openhound_github-0.3.5 → openhound_github-0.3.7}/uv.lock

@@ -875,7 +875,6 @@ name = "openhound-github"
 source = { editable = "." }
 dependencies = [
     { name = "joserfc" },
-    { name = "openhound" },
     { name = "requests" },
 ]
 
@@ -892,14 +891,13 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "joserfc", specifier = ">=1.6.5" },
-    { name = "openhound", specifier = ">=0.2.7" },
     { name = "requests", specifier = ">=2.33.0" },
 ]
 
 [package.metadata.requires-dev]
 dev = [
     { name = "mypy", specifier = ">=1.19.1" },
-    { name = "openhound" },
+    { name = "openhound", specifier = ">=0.2.7" },
     { name = "pre-commit", specifier = ">=4.5.1" },
     { name = "pytest", specifier = ">=9.0.1" },
     { name = "ruff", specifier = ">=0.15.5" },