openhound-github 0.13.1__py3-none-any.whl → 0.14.2.dev2__py3-none-any.whl

openhound_github/graph.py

@@ -4,6 +4,9 @@ from openhound.core.models.entries_dataclass import EdgeProperties
 from openhound.core.models.entries_dataclass import Node as BaseNode
 from openhound.core.models.entries_dataclass import NodeProperties as BaseProperties
 
+GITHUB_SOURCE_KIND = "GitHub"
+SAML_SOURCE_KIND = "SAML"
+
 
 @dataclass
 class GHNodeProperties(BaseProperties):
@@ -22,6 +25,13 @@ class GHNode(BaseNode):
         # Use GitHub's native node_id as the OpenGraph node id so edges can
         # reference nodes by the same identifier used during collection.
         self.id = self.properties.node_id
+        source_kind = (
+            SAML_SOURCE_KIND
+            if any(kind.startswith("SAML_") for kind in self.kinds)
+            else GITHUB_SOURCE_KIND
+        )
+        if source_kind not in self.kinds:
+            self.kinds.append(source_kind)
 
 
 @dataclass

openhound_github/main.py

@@ -8,7 +8,7 @@ from openhound.core.preproc import PreProcContext
 from .lookup import GithubLookup
 from .transforms import transforms
 
-app = OpenHound("github", source_kind="GitHub", help="OpenGraph collector for GitHub")
+app = OpenHound("github", help="OpenGraph collector for GitHub")
 
 
 @app.collect()

openhound_github/models/org.py

@@ -15,6 +15,7 @@ class GHOrganizationProperties(GHNodeProperties):
     """Organization-specific properties and accordion panel queries.
     
     Attributes:
+        database_id: The organization's numeric GitHub database ID used in immutable OIDC subjects.
         login: The organization's login handle (URL slug).
         org_name: The organization's display name (from the `name` field in the GitHub API).
         description: The organization's description.
@@ -88,6 +89,7 @@ class GHOrganizationProperties(GHNodeProperties):
         collected: The collected property.
     """
 
+    database_id: int | None = None
     login: str | None = None
     org_name: str | None = None
     description: str | None = None
@@ -176,6 +178,7 @@ class Organization(BaseAsset):
 
     node_id: str
     login: str
+    database_id: int | None = None
     name: str | None = None
     description: str | None = None
     company: str | None = None
@@ -245,6 +248,7 @@ class Organization(BaseAsset):
                 name=self.login,
                 displayname=self.name or self.login,
                 node_id=oid,
+                database_id=self.database_id,
                 login=self.login,
                 org_name=self.name or "",
                 description=self.description,

openhound_github/models/repository.py

@@ -18,6 +18,7 @@ class GHRepositoryProperties(GHNodeProperties):
 
     Attributes:
         collected: Collected/generated by OpenHound
+        database_id: The repository's numeric GitHub database ID used in immutable OIDC subjects.
         full_name: The fully qualified name (e.g., `org/repo`).
         private: Whether the repository is private.
         html_url: URL to the repository on GitHub.
@@ -37,7 +38,8 @@ class GHRepositoryProperties(GHNodeProperties):
         open_issues: Number of open issues (includes pull requests).
         watchers: Number of watchers.
         owner_name: The login of the repository owner.
-        owner_id: The owner id property.
+        owner_id: The opaque GraphQL node ID of the repository owner.
+        owner_database_id: The numeric GitHub database ID of the repository owner used in immutable OIDC subjects.
         environment_name: The name of the environment (GitHub organization).
         actions_enabled: Whether GitHub Actions is enabled for this repository.
         self_hosted_runners_enabled: Whether the repository may use self-hosted runners.
@@ -70,6 +72,7 @@ class GHRepositoryProperties(GHNodeProperties):
     collected: bool = True
 
     # TODO: Check owner_node_id
+    database_id: int | None = None
     full_name: str | None = None
     private: bool | None = None
     html_url: str | None = None
@@ -90,6 +93,7 @@ class GHRepositoryProperties(GHNodeProperties):
     watchers: int | None = None
     owner_name: str | None = None
     owner_id: str | None = None
+    owner_database_id: int | None = None
     environment_name: str | None = None
     actions_enabled: bool | None = None
     self_hosted_runners_enabled: bool | None = None
@@ -201,6 +205,7 @@ class Repository(BaseAsset):
     node_id: str
     name: str
     full_name: str
+    database_id: int | None = None
 
     private: bool
     owner: Owner
@@ -238,6 +243,10 @@ class Repository(BaseAsset):
     def owner_name(self) -> str:
         return self.owner.login
 
+    @property
+    def owner_database_id(self) -> int:
+        return self.owner.id
+
     @property
     def as_node(self) -> GHNode:
         rid = self.node_id
@@ -255,6 +264,7 @@ class Repository(BaseAsset):
                 name=self.name,
                 displayname=self.full_name,
                 node_id=rid,
+                database_id=self.database_id,
                 full_name=self.full_name,
                 private=self.private,
                 html_url=self.html_url,
@@ -275,6 +285,7 @@ class Repository(BaseAsset):
                 watchers=self.watchers,
                 owner_name=self.owner_name or "",
                 owner_id=self.owner_id or "",
+                owner_database_id=self.owner_database_id,
                 environment_name=self.org_login,
                 environmentid=self.org_node_id,
                 actions_enabled=self.actions_enabled,

openhound_github/models/scim_user.py

@@ -23,6 +23,8 @@ from openhound_github.kinds import nodes as nk
 from openhound_github.main import app
 from openhound_github.models.saml_helpers import detect_foreign_idp
 
+SCIM_SOURCE_KIND = "SCIM"
+
 
 def scim_organization_id(scope_node_id: str) -> str:
     return f"SCIM_Organization_{scope_node_id}"
@@ -40,7 +42,6 @@ class ScimNodeProperties(NodeProperties):
     profile_url: str | None = None
     enterprise: str | None = None
     organization: str | None = None
-    source_kind: str | None = None
 
 
 @dataclass
@@ -48,7 +49,8 @@ class ScimNode(Node):
     id: str
 
     def __post_init__(self):
-        return None
+        if SCIM_SOURCE_KIND not in self.kinds:
+            self.kinds.append(SCIM_SOURCE_KIND)
 
 
 class Name(BaseModel):
@@ -128,7 +130,6 @@ class ScimOrganization(ScimScopeAsset):
                 environmentid=self.scope_node_id,
                 enterprise=self.enterprise_slug,
                 organization=self.org_login,
-                source_kind="GitHub",
             ),
         )
 
@@ -210,7 +211,6 @@ class ScimUser(ScimScopeAsset):
                 profile_url=self.meta.location if self.meta else None,
                 enterprise=self.enterprise_slug,
                 organization=self.org_login,
-                source_kind="GitHub",
             ),
         )
 
@@ -306,7 +306,6 @@ class ScimGroup(ScimScopeAsset):
                 external_id=self.external_id,
                 enterprise=self.enterprise_slug,
                 organization=self.org_login,
-                source_kind="GitHub",
             ),
         )
 

openhound_github/resources/organization.py

@@ -510,6 +510,7 @@ def organizations(ctx: SourceContext):
             org_data["can_approve_pull_request_reviews"] = workflow_perms.get(
                 "can_approve_pull_request_reviews"
             )
+            org_data["database_id"] = org_data.get("id")
             org_data["github_deployment_type"] = ctx.deployment_type
             org_data["ghes_version"] = ctx.ghes_version
 
@@ -1008,6 +1009,7 @@ def repositories(ctx: SourceContext):
                     )
                     yield {
                         **repo,
+                        "database_id": repo.get("id"),
                         "actions_enabled": actions_enabled,
                         "self_hosted_runners_enabled": self_hosted_runners_enabled,
                         "org_login": org_name,

{openhound_github-0.13.1.dist-info → openhound_github-0.14.2.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: openhound-github
-Version: 0.13.1
+Version: 0.14.2.dev2
 Summary: Github collector for OpenHound
 Author-email: "jdreijer@specterops.io" <jdreijer@specterops.io>, Jared Atkinson <jatkinson@specterops.io>
 License-File: LICENSE.md

{openhound_github-0.13.1.dist-info → openhound_github-0.14.2.dev2.dist-info}/RECORD

@@ -2,11 +2,11 @@ openhound_github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 openhound_github/auth.py,sha256=fO0vEdpJIEHXUgF6rP_sZf_k7gMTa9jMFbZbKBw38Dg,10106
 openhound_github/github_rest_client.py,sha256=WnrUIbkHFEepAZSdIAFBeyeSkoumbWT_FiPjBZsoyqk,115
 openhound_github/github_retry.py,sha256=j4VJ-VWLE-s-PO9wPRPVkRkJdv4SCOR3HWvaywzsUJk,1325
-openhound_github/graph.py,sha256=xBY_qhBO1j3H6eGuN4LcElqiltlPBdMsfnn_2vw6pt8,997
+openhound_github/graph.py,sha256=7PApox9Uk88xav9ilwYDa1fLv0FBduuENRPDiudUgv0,1306
 openhound_github/graphql.py,sha256=QQpom5MHAu4Yw153mifxOI5N_Ou_GvJ7eRlbCN7XW5g,10796
 openhound_github/helpers.py,sha256=xQmYyzVpG73lebbyhUdT73EAi2YPk9_s4d_Korqh054,16149
 openhound_github/lookup.py,sha256=6TxoW9FYNpZpir0ncH40uULRo80_WBozibpbObDS4_k,47436
-openhound_github/main.py,sha256=S84-jN1WWZ5KL_C0bVleGk0mIFs2s5vDOhrevtdZaGY,4015
+openhound_github/main.py,sha256=5DWn8LyKtsA2Yktm6RQzsGOiJbrPgn0ESRe3KBsrOzM,3993
 openhound_github/runner_ids.py,sha256=rlAi0Fz2xUMcb4s7YQGqL2csHVaLdZP-vMxDpoPgHo8,478
 openhound_github/source.py,sha256=kSr8OiDd3q1UaEr2Uo358hd9W-_e1_PDU13QoUQtwBg,17878
 openhound_github/transforms.py,sha256=qXagoTMMnQ6CjSI-XVf_HcXAsqZKJTns5ZW9KOz-ffY,22945
@@ -39,7 +39,7 @@ openhound_github/models/env_variable.py,sha256=ccIZg0LyBmvCDehPeANRF3ZstEU1ldr77
 openhound_github/models/environment.py,sha256=iiFGYsRu33FXPf5WuerJ1QXthcWZoDxwmE0DpboWLZU,25022
 openhound_github/models/environment_branch_policy.py,sha256=j6RWZ4WRqCEgGVfMuwOYc7Lo0zNdCZrBpu7hhV58Ul0,6843
 openhound_github/models/external_identity.py,sha256=DE9ieDuUerwIuiE20V8Pn1vRs2sUs6-vklqx-H2-wM4,11106
-openhound_github/models/org.py,sha256=EyaQD0eNMkM9giPeUubaVyzPQymAlhrOWjfApmUtaLE,19947
+openhound_github/models/org.py,sha256=cGO4JsaooozBSb65QJ4c6DwSUT4IwsQokB2RVwySPeA,20163
 openhound_github/models/org_role.py,sha256=Qf8IlQgRZQPyHy3IgRPX859L9-UgtEJ2rm5Bk48t3UY,14890
 openhound_github/models/org_role_member.py,sha256=OM2N2xtZd0uC2T7U6lh5TbDo7HZLt-jn92dr80lwksI,1368
 openhound_github/models/org_role_team.py,sha256=Q6_OQUHw1GkFBI0ZQq5lTYZB-s8METE7dbTFXwrx4AM,1438
@@ -51,7 +51,7 @@ openhound_github/models/personal_access_token_access.py,sha256=U16xNR31CeMvxIhof
 openhound_github/models/personal_access_token_request.py,sha256=KtGzREwQIJ6mMAYE0n7p3VDCLMHkVC5elCI4m3-Q0N8,5740
 openhound_github/models/projected_enterprise_team.py,sha256=3z-rC4h2iPbBkrWr1-GJG_dUqe2diCHgg8ZAbywTuBg,2070
 openhound_github/models/repo_role_assignment.py,sha256=8i-utvyyJE311rIiUvSUq2WmX50dcw8otiljqrbsomw,4022
-openhound_github/models/repository.py,sha256=yIJz-VH9dMTYtniDsHw9VF2fg1K82vgtUiGkLPIVFW4,14445
+openhound_github/models/repository.py,sha256=3VXd01I__er52zFxQ57NXSQVFreuK7KdWlYD9JJWPEg,14986
 openhound_github/models/repository_role.py,sha256=YYxO6sSul2QuSvZUy81sjpAMi1KdzJr8QHQ0_l_QbfU,35740
 openhound_github/models/repository_secret.py,sha256=0D5StsOM09H7hjUSKwUjuZLBcjlbRljxeO9sIldWKdQ,3940
 openhound_github/models/repository_variable.py,sha256=Ad_PiC7fRN4aICngQ4vlIKZVGJNmfn0GJqvUXiHUj94,3747
@@ -61,7 +61,7 @@ openhound_github/models/saml_helpers.py,sha256=9YUckYOI_LkZ4pQfc559_enk2-mIR9Zhf
 openhound_github/models/saml_issuer.py,sha256=335ra0YiHZhI7kwAuAdSnZSxxUP_Q1DY-iaagGM8s_0,4089
 openhound_github/models/saml_provider.py,sha256=4jDEDqN_ZVncQglPIfOr1Lfxczlc1NkhZvHxzeAAOuI,5202
 openhound_github/models/saml_service_provider.py,sha256=FqD1jpAwANC_HTc1D90x1d6q3CbzF06aEN5fTcmx6iM,4712
-openhound_github/models/scim_user.py,sha256=37_pRB7_WQHNfNNt0udiuK7JIZ1JaRzHB_1aAnT8rrY,11657
+openhound_github/models/scim_user.py,sha256=YqqVElZxOMYT2ZytpWW58QaMCV1VZaYzso7r_3h00Rs,11610
 openhound_github/models/secret_scanning_alert.py,sha256=nElFrnrqzjm9uMmkvRs1-_eQxAAbTGfnCzKQYjB3Ib4,9330
 openhound_github/models/team.py,sha256=l9ZT3DBzAHE9DbYRHcus3nI7iUM45-Ef_DiTm5i1pzU,8385
 openhound_github/models/team_member.py,sha256=YgSvClbaVGsPQW0rMeXRWWb1aRYfzCa4GxnjmihcSig,1668
@@ -73,10 +73,10 @@ openhound_github/models/workflow_reference.py,sha256=Vfk3biAtkVHTz796GWf-J9TQj1T
 openhound_github/models/workflow_step.py,sha256=GZ1ggZXVWojuKl7iXdHcpJUfNXRRjx1Sypp3qPFjEmI,10748
 openhound_github/resources/__init__.py,sha256=jGuYogLtrEsUP3neBw41YZeC1yAOV3tDIzJCA8ZQgUo,101
 openhound_github/resources/enterprise.py,sha256=qDdctdmg2nACGlUmgBEnE-zV7Yebov_MEunAHJxiX1U,34749
-openhound_github/resources/organization.py,sha256=F5WR0qCuuwqqDsAqgOXE8AURhetCqZhX8x0uFZCo3Ak,89653
+openhound_github/resources/organization.py,sha256=fVmPxA5GYiVs4im5262X76RMJ_32MXTe0RdBOmxGTk4,89765
 openhound_github/extension.yaml,sha256=iqEqiG14paSzaH7xISg7oy9PviLGHSMvEYOallBpKw0,706
-openhound_github-0.13.1.dist-info/METADATA,sha256=xBJ3gens3BeuSezEE7JpaL_1Pi_YgINpC8bgvdYmYXQ,6361
-openhound_github-0.13.1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-openhound_github-0.13.1.dist-info/entry_points.txt,sha256=dn_0GC3hAM9jAcn81NhGSZK_vQtKEazxGRfXcaNJQsA,55
-openhound_github-0.13.1.dist-info/licenses/LICENSE.md,sha256=hl-6dfjqiqdl-iWur-TsJegvxJxByg2rZ7DmjsVZ1pI,10802
-openhound_github-0.13.1.dist-info/RECORD,,
+openhound_github-0.14.2.dev2.dist-info/METADATA,sha256=oygwwuxk6C-5r25xpCtJrUXDGa3Lxp_2q_ZNYcziHyc,6366
+openhound_github-0.14.2.dev2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+openhound_github-0.14.2.dev2.dist-info/entry_points.txt,sha256=dn_0GC3hAM9jAcn81NhGSZK_vQtKEazxGRfXcaNJQsA,55
+openhound_github-0.14.2.dev2.dist-info/licenses/LICENSE.md,sha256=hl-6dfjqiqdl-iWur-TsJegvxJxByg2rZ7DmjsVZ1pI,10802
+openhound_github-0.14.2.dev2.dist-info/RECORD,,