Merge branch 'main' into audit-log-new-actions

SpecterOps · Feb 5, 2024 · 910a342 · 910a342
2 parents c106534 + f14442a
commit 910a342
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/cmd/api/src/api/middleware/middleware_internal_test.go b/cmd/api/src/api/middleware/middleware_internal_test.go
@@ -98,6 +98,7 @@ func TestParseUserIP_Success(t *testing.T) {
 	ip1 := "192.168.1.1:8080"
 	ip2 := "192.168.1.2"
 	ip3 := "192.168.1.3"
+
 	req.Header.Set("X-Forwarded-For", strings.Join([]string{ip1, ip2, ip3}, ","))
 
 	req.RemoteAddr = "0.0.0.0:3000"

diff --git a/cmd/api/src/model/audit.go b/cmd/api/src/model/audit.go
@@ -32,6 +32,7 @@ const (
 	AuditStatusIntent  AuditEntryStatus = "intent"
 )
 
+// TODO embed Basic into this struct instead of declaring the ID and CreatedAt fields. This will require a migration
 type AuditLog struct {
 	ID              int64                   `json:"id" gorm:"primaryKey"`
 	CreatedAt       time.Time               `json:"created_at" gorm:"index"`

diff --git a/packages/go/analysis/ad/post.go b/packages/go/analysis/ad/post.go
@@ -54,6 +54,7 @@ func PostProcessedRelationships() []graph.Kind {
 		ad.ADCSESC4,
 		ad.ADCSESC5,
 		ad.ADCSESC6a,
+		ad.ADCSESC6b,
 		ad.ADCSESC7,
 		ad.ADCSESC10a,
 		ad.ADCSESC10b,

diff --git a/packages/javascript/bh-shared-ui/src/components/HelpTexts/ADCSESC10a/ADCSESC10a.tsx b/packages/javascript/bh-shared-ui/src/components/HelpTexts/ADCSESC10a/ADCSESC10a.tsx
@@ -19,15 +19,15 @@ import WindowsAbuse from './WindowsAbuse';
 import LinuxAbuse from './LinuxAbuse';
 import Opsec from './Opsec';
 import References from './References';
-import Composition from "./Composition";
+import Composition from './Composition';
 
 const ADCSESC10a = {
     general: General,
     windowsAbuse: WindowsAbuse,
     linuxAbuse: LinuxAbuse,
     opsec: Opsec,
     references: References,
-    composition: Composition
+    composition: Composition,
 };
 
 export default ADCSESC10a;
diff --git a/packages/javascript/bh-shared-ui/src/views/Explore/ExploreSearch/edgeTypes.tsx b/packages/javascript/bh-shared-ui/src/views/Explore/ExploreSearch/edgeTypes.tsx
@@ -93,6 +93,7 @@ export const AllEdgeTypes: Category[] = [
                     ActiveDirectoryRelationshipKind.ADCSESC1,
                     ActiveDirectoryRelationshipKind.ADCSESC3,
                     ActiveDirectoryRelationshipKind.ADCSESC6a,
+                    ActiveDirectoryRelationshipKind.ADCSESC6b,
                     ActiveDirectoryRelationshipKind.ADCSESC9a,
                     ActiveDirectoryRelationshipKind.ADCSESC9b,
                     ActiveDirectoryRelationshipKind.ADCSESC10a,