put edge shortcuts into common

SpecterOps · Oct 4, 2024 · 3977af1 · 3977af1
1 parent 9622f76
commit 3977af1
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 32 deletions.
diff --git a/packages/cue/bh/ad/ad.cue b/packages/cue/bh/ad/ad.cue
@@ -1293,12 +1293,6 @@ SyncedToEntraUser: types.#Kind & {
 	schema: "active_directory"
 }
 
-AllADAttacks: types.#Kind & {
-	symbol: "AllADAttacks"
-	schema: "active_directory"
-	representation: "ALL_AD_ATTACKS"
-}
-
 // Relationship Kinds
 RelationshipKinds: [
 	Owns,
@@ -1369,8 +1363,7 @@ RelationshipKinds: [
 	ADCSESC10a,
 	ADCSESC10b,
 	ADCSESC13,
-	SyncedToEntraUser,
-	AllADAttacks
+	SyncedToEntraUser
 ]
 
 // ACL Relationships

diff --git a/packages/cue/bh/azure/azure.cue b/packages/cue/bh/azure/azure.cue
@@ -723,12 +723,6 @@ SyncedToADUser: types.#Kind & {
 	representation:	"SyncedToADUser"
 }
 
-AllAZAttacks: types.#Kind & {
-	symbol: "AllAZAttacks"
-	schema: "azure"
-	representation: "ALL_AZ_ATTACKS"
-}
-
 RelationshipKinds: [
 	AvereContributor,
 	Contains,
@@ -776,8 +770,7 @@ RelationshipKinds: [
 	AZMGAddSecret,
 	AZMGGrantAppRoles,
 	AZMGGrantRole,
-	SyncedToADUser,
-	AllAZAttacks
+	SyncedToADUser
 ]
 
 AppRoleTransitRelationshipKinds: [

diff --git a/packages/cue/bh/common/common.cue b/packages/cue/bh/common/common.cue
@@ -162,9 +162,23 @@ MigrationData: types.#Kind & {
 	representation: "MigrationData"
 }
 
+AllADAttacks: types.#Kind & {
+	symbol: "AllADAttacks"
+	schema: "active_directory"
+	representation: "ALL_AD_ATTACKS"
+}
+
+AllAZAttacks: types.#Kind & {
+	symbol: "AllAZAttacks"
+	schema: "azure"
+	representation: "ALL_AZ_ATTACKS"
+}
+
 NodeKinds: [
 	MigrationData,
 ]
 
 RelationshipKinds: [
+	AllADAttacks, 
+	AllAZAttacks
 ]
diff --git a/packages/go/cypher/models/cypher/format/format.go b/packages/go/cypher/models/cypher/format/format.go
@@ -25,6 +25,7 @@ import (
 	"github.com/specterops/bloodhound/cypher/models/cypher"
 	"github.com/specterops/bloodhound/graphschema/ad"
 	"github.com/specterops/bloodhound/graphschema/azure"
+	"github.com/specterops/bloodhound/graphschema/common"
 
 	"github.com/specterops/bloodhound/dawgs/graph"
 )
@@ -40,11 +41,11 @@ func writeJoinedKinds(output io.Writer, delimiter string, kinds graph.Kinds) err
 		}
 
 		// if kind is a shortcut edge type, further expansion is required
-		if kind == ad.AllADAttacks {
+		if kind == common.AllADAttacks {
 			if err := writeJoinedKinds(output, delimiter, ad.PathfindingRelationships()); err != nil {
 				return err
 			}
-		} else if kind == azure.AllAZAttacks {
+		} else if kind == common.AllAZAttacks {
 			if err := writeJoinedKinds(output, delimiter, azure.PathfindingRelationships()); err != nil {
 				return err
 			}

diff --git a/packages/go/graphschema/ad/ad.go b/packages/go/graphschema/ad/ad.go
diff --git a/packages/go/graphschema/azure/azure.go b/packages/go/graphschema/azure/azure.go
diff --git a/packages/go/graphschema/common/common.go b/packages/go/graphschema/common/common.go
diff --git a/packages/javascript/bh-shared-ui/src/commonSearches.tsx b/packages/javascript/bh-shared-ui/src/commonSearches.tsx
@@ -14,13 +14,13 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-import { ActiveDirectoryRelationshipKind, AzureRelationshipKind } from './graphSchema';
+import { CommonRelationshipKind } from './graphSchema';
 
 const categoryAD = 'Active Directory';
 const categoryAzure = 'Azure';
 
-const adTransitEdgeTypes = ActiveDirectoryRelationshipKind.AllADAttacks;
-const azureTransitEdgeTypes = AzureRelationshipKind.AllAZAttacks;
+const adTransitEdgeTypes = CommonRelationshipKind.AllADAttacks;
+const azureTransitEdgeTypes = CommonRelationshipKind.AllAZAttacks;
 
 const highPrivilegedRoleDisplayNameRegex =
     'Global Administrator.*|User Administrator.*|Cloud Application Administrator.*|Authentication Policy Administrator.*|Exchange Administrator.*|Helpdesk Administrator.*|Privileged Authentication Administrator.*';

diff --git a/packages/javascript/bh-shared-ui/src/graphSchema.ts b/packages/javascript/bh-shared-ui/src/graphSchema.ts
@@ -140,7 +140,6 @@ export enum ActiveDirectoryRelationshipKind {
     ADCSESC10b = 'ADCSESC10b',
     ADCSESC13 = 'ADCSESC13',
     SyncedToEntraUser = 'SyncedToEntraUser',
-    AllADAttacks = 'ALL_AD_ATTACKS',
 }
 export function ActiveDirectoryRelationshipKindToDisplay(value: ActiveDirectoryRelationshipKind): string | undefined {
     switch (value) {
@@ -282,8 +281,6 @@ export function ActiveDirectoryRelationshipKindToDisplay(value: ActiveDirectoryR
             return 'ADCSESC13';
         case ActiveDirectoryRelationshipKind.SyncedToEntraUser:
             return 'SyncedToEntraUser';
-        case ActiveDirectoryRelationshipKind.AllADAttacks:
-            return 'AllADAttacks';
         default:
             return undefined;
     }
@@ -780,7 +777,6 @@ export enum AzureRelationshipKind {
     AZMGGrantAppRoles = 'AZMGGrantAppRoles',
     AZMGGrantRole = 'AZMGGrantRole',
     SyncedToADUser = 'SyncedToADUser',
-    AllAZAttacks = 'ALL_AZ_ATTACKS',
 }
 export function AzureRelationshipKindToDisplay(value: AzureRelationshipKind): string | undefined {
     switch (value) {
@@ -878,8 +874,6 @@ export function AzureRelationshipKindToDisplay(value: AzureRelationshipKind): st
             return 'AZMGGrantRole';
         case AzureRelationshipKind.SyncedToADUser:
             return 'SyncedToADUser';
-        case AzureRelationshipKind.AllAZAttacks:
-            return 'AllAZAttacks';
         default:
             return undefined;
     }
@@ -1043,6 +1037,20 @@ export function CommonNodeKindToDisplay(value: CommonNodeKind): string | undefin
             return undefined;
     }
 }
+export enum CommonRelationshipKind {
+    AllADAttacks = 'ALL_AD_ATTACKS',
+    AllAZAttacks = 'ALL_AZ_ATTACKS',
+}
+export function CommonRelationshipKindToDisplay(value: CommonRelationshipKind): string | undefined {
+    switch (value) {
+        case CommonRelationshipKind.AllADAttacks:
+            return 'AllADAttacks';
+        case CommonRelationshipKind.AllAZAttacks:
+            return 'AllAZAttacks';
+        default:
+            return undefined;
+    }
+}
 export enum CommonKindProperties {
     ObjectID = 'objectid',
     Name = 'name',