Skip to content

Commit

Permalink
2024.3 Release
Browse files Browse the repository at this point in the history
2024.3 Release
  • Loading branch information
TrimarcJake authored Mar 3, 2024
2 parents 4946f84 + bbd6e09 commit ed5bcb7
Show file tree
Hide file tree
Showing 45 changed files with 1,715 additions and 115 deletions.
4 changes: 2 additions & 2 deletions Build/Build-Module.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Import-Module -Name PSPublishModule -Force
Build-Module -ModuleName 'Locksmith' {
# Usual defaults as per standard module
$Manifest = [ordered] @{
ModuleVersion = '2024.1'
ModuleVersion = (Get-Date -Format yyyy.M)
CompatiblePSEditions = @('Desktop', 'Core')
GUID = 'b1325b42-8dc4-4f17-aa1f-dcb5984ca14a'
Author = 'Jake Hildreth'
Copyright = "(c) 2022 - $((Get-Date).Year). All rights reserved."
Description = 'A small tool to find and fix common misconfigurations in Active Directory Certificate Services.'
ProjectUri = 'https://github.com/TrimarcJake/Locksmith'
IconUri = 'https://github.com/TrimarcJake/Locksmith/Images/locksmith.ico'
IconUri = 'https://raw.githubusercontent.com/TrimarcJake/Locksmith/main/Images/locksmith.ico'
PowerShellVersion = '5.1'
Tags = @('Windows', 'Locksmith', 'CA', 'PKI', 'ActiveDirectory', 'CertificateServices','ADCS')
}
Expand Down
8 changes: 8 additions & 0 deletions Docs/Flowcharts/Auditing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
``` mermaid
---
title: Auditing
---
flowchart LR
FullyEnabled[Fully Enabled] -- Yes --> NoFinding[No Finding]
FullyEnabled -- No --> Info
```
20 changes: 20 additions & 0 deletions Docs/Flowcharts/ESC1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```mermaid
---
title: ESC1 - Subject Alternative Name (SAN)
---
flowchart LR
PrincipalType{PrincipalType} -->|User| UserType["User Type"];
UserType == AD Admin ==> ADAUPriority(Low);
UserType -- Builtin/PKI Admin --> BIAUPriority(Medium);
UserType -- User --> UserPriority(High);
PrincipalType -->|Group| GroupType("Group Type");
GroupType -- AD Admins --> ADASize(No Finding);
GroupType -- Builtin/PKI Admins --> BIASize(BIA Group Size);
BIASize -- Empty/Small --> BIAEGPriority(Low);
BIASize -- Medium/Large --> BIAMGPriority(Medium);
GroupType -- Regular Users --> UsersSize(User Group Size);
UsersSize -- Empty/Small --> UsersEGPriority(High);
UsersSize -- Medium/Large --> UsersMGPriority(Critical);
PrincipalType -->|gMSA| gMSAType(gMSA Type);
gMSAType -- Any --> gMSAPriority((No Finding));
```
20 changes: 20 additions & 0 deletions Docs/Flowcharts/ESC2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```mermaid
---
title: ESC2 - Subordinate Certification Authority (SubCA)
---
flowchart LR
PrincipalType -->|User| UserType["User Type"];
UserType -- AD Admin --> ADAUPriority(Low);
UserType -- Builtin/PKI Admin --> BIAUPriority(Medium);
UserType -- User --> UserPriority(High);
PrincipalType -->|Group| GroupType("Group Type");
GroupType -- AD Admins --> ADASize(No Finding);
GroupType -- Builtin/PKI Admins --> BIASize(BIA Group Size);
BIASize -- Empty/Small --> BIAEGPriority(Info);
BIASize -- Medium/Large --> BIAMGPriority(Low);
GroupType -- Regular Users --> UsersSize(User Group Size);
UsersSize -- Empty/Small --> UsersEGPriority(Medium);
UsersSize -- Medium/Large --> UsersMGPriority(High);
PrincipalType -->|gMSA| gMSAType(gMSA Type);
gMSAType -- Any --> gMSAPriority(No Finding);
```
20 changes: 20 additions & 0 deletions Docs/Flowcharts/ESC3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```mermaid
---
title: ESC3 Condition 1 - Enrollment Agent
---
flowchart LR
PrincipalType -->|User| UserType["User Type"];
UserType -- AD Admin --> ADAUPriority(Low);
UserType -- Builtin/PKI Admin --> BIAUPriority(Medium);
UserType -- User --> UserPriority(High);
PrincipalType -->|Group| GroupType("Group Type");
GroupType -- AD Admins --> ADASize(No Finding);
GroupType -- Builtin/PKI Admins --> BIASize(BIA Group Size);
BIASize -- Empty/Small --> BIAEGPriority(No Info);
BIASize -- Medium/Large --> BIAMGPriority(Low);
GroupType -- Regular Users --> UsersSize(User Group Size);
UsersSize -- Empty/Small --> UsersEGPriority(Low);
UsersSize -- Medium/Large --> UsersMGPriority(Medium);
PrincipalType -->|gMSA| gMSAType(gMSA Type);
gMSAType -- Any --> gMSAPriority(No Finding);
```
20 changes: 20 additions & 0 deletions Docs/Flowcharts/ESC4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
```mermaid
---
title: ESC4 - Templates w/Dangerous ACLs or Ownership
---
flowchart LR
PrincipalType -->|User| UserType["User Type"];
UserType -- AD Admin --> ADAUPriority(Low);
UserType -- Builtin/PKI Admin --> BIAUPriority(Medium);
UserType -- User --> UserPriority(High);
PrincipalType -->|Group| GroupType("Group Type");
GroupType -- AD Admins --> ADASize(No Finding);
GroupType -- Builtin/PKI Admins --> BIASize(BIA Group Size);
BIASize -- Empty/Small --> BIAEGPriority(Info);
BIASize -- Medium/Large --> BIAMGPriority(Low);
GroupType -- Regular Users --> UsersSize(User Group Size);
UsersSize -- Empty/Small --> UsersEGPriority(Medium);
UsersSize -- Medium/Large --> UsersMGPriority(High);
PrincipalType -->|gMSA| gMSAType(gMSA Type);
gMSAType -- Any --> gMSAPriority(No Finding);
```
23 changes: 23 additions & 0 deletions Docs/Flowcharts/ESC5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
```mermaid
---
title: ESC5 - Objects w/Dangerous ACLs or Ownership
---
flowchart LR
PrincipalType -->|User| UserType["User Type"];
UserType -- AD Admin --> ADAUPriority(Low);
UserType -- Builtin/PKI Admin --> BIAUPriority(Medium);
UserType -- User --> UserPriority(High);
PrincipalType -->|Group| GroupType("Group Type");
GroupType -- AD Admins --> ADASize(No Finding);
GroupType -- Builtin/PKI Admins --> BIASize(BIA Group Size);
BIASize -- Empty/Small --> BIAEGPriority(Info);
BIASize -- Medium/Large --> BIAMGPriority(Low);
GroupType -- Regular Users --> UsersSize(User Group Size);
UsersSize -- Empty/Small --> UsersEGPriority(Medium);
UsersSize -- Medium/Large --> UsersMGPriority(High);
PrincipalType -->|gMSA| gMSAType(gMSA Type);
gMSAType -- Any --> gMSAPriority(No Finding);
```
```
Note: The severity of this check is highly dependent on the object with the issue.
```
12 changes: 12 additions & 0 deletions Docs/Flowcharts/ESC6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
``` mermaid
---
title: ESC6 - Dangerous Flag on CA
---
flowchart LR
FlagSet["Flag Set"] -- Yes --> High
FlagSet["Flag Set"] -- No --> NoFinding[No Finding]
```
```
* This check can be improved by checking Domain Controller registries. (Coming soon!)
If StrongMapping is manually disabled on any DC, this becomes a Critical issue.
```
14 changes: 14 additions & 0 deletions Docs/Flowcharts/ESC8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
``` mermaid
---
title: ESC8 - HTTP/S Enrollment Endpoints
---
flowchart LR
HTTP/S(HTTP or HTTPS?) -- HTTP --> Critical
HTTP/S(HTTP or HTTPS?) -- HTTPS --> Medium["Possible: No Finding, Medium\nCurrent: Medium*"]
```
```
* With current collection methods, we cannot determine true severity of this configuration.
- If NTLM authentication is completely disabled (available at host level or IIS level), this is not a finding.
- If EPA is enabled on IIS, the severity is Info.
- Otherwise, this is a Medium severity issue.
```
Binary file added Flowcharts/Auditing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Flowcharts/ESC8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ed5bcb7

Please sign in to comment.