Skip to content

Commit 81c8a2f

Browse files
authored
Merge pull request #276 from jakehildreth/samerde/fix-spelling-messages
Fix spelling and user-facing messages
2 parents 45b780f + 2ce038f commit 81c8a2f

12 files changed

Lines changed: 27 additions & 27 deletions

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ indent_size = 4
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
1212

13-
# Powershell files
13+
# PowerShell files
1414
[*.{ps1,psd1,psm1}]
1515
indent_size = 4
1616

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you then still feel the need to ask a question and need clarification, we rec
3939

4040
- Open an [Issue](https://github.com/jakehildreth/Locksmith/issues/new/choose).
4141
- Provide as much context as you can about what you're running into.
42-
- Provide project and platform versions (Windows Version, Powershell Version, Windows Terminal, etc.), depending on what seems relevant.
42+
- Provide project and platform versions (Windows Version, PowerShell Version, Windows Terminal, etc.), depending on what seems relevant.
4343

4444
We will then take care of the issue as soon as possible.
4545

@@ -65,7 +65,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
6565
- Collect information about the bug:
6666
- OS, platform, and version of client machine. (Locksmith is only supported on Windows 10+/2016+ at this time.)
6767
- Single or multi-domain forest?
68-
- PowerShell version, edition, and shell (Windows Powershell / Windows PowerShell ISE / PowerShell / Windows Terminal)
68+
- PowerShell version, edition, and shell (Windows PowerShell / Windows PowerShell ISE / PowerShell / Windows Terminal)
6969
- Possibly your input and the output
7070
- Can you reliably reproduce the issue?
7171

Docs/Invoke-Locksmith.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Invoke-Locksmith [[-Mode] <Int32>] [[-Scans] <Array>] [[-OutputPath] <String>] [
1818
```
1919

2020
## DESCRIPTION
21-
Locksmith uses the Active Directory (AD) Powershell (PS) module to identify 10 misconfigurations
21+
Locksmith uses the Active Directory (AD) PowerShell (PS) module to identify 10 misconfigurations
2222
commonly found in Enterprise mode AD CS installations.
2323

2424
## EXAMPLES
@@ -49,7 +49,7 @@ No attempt is made to fix identified issues.
4949

5050
-Mode 1
5151
Finds any malconfigurations and displays them in the console.
52-
Displays example Powershell snippet that can be used to resolve the issue.
52+
Displays example PowerShell snippet that can be used to resolve the issue.
5353
No attempt is made to fix identified issues.
5454

5555
-Mode 2

Docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Install-Module -Name Locksmith -Scope CurrentUser
6464
<a name="RunLocksmith" id="RunLocksmith"></a>
6565

6666
## Run Locksmith
67-
There are several modes you can chose from when running `Invoke-Locksmith`. You can also use the **Scans** parameter to choose which scans you want to invoke.
67+
There are several modes you can choose from when running `Invoke-Locksmith`. You can also use the **Scans** parameter to choose which scans you want to invoke.
6868

6969
<a name="Mode0" id="Mode0"></a>
7070

Invoke-Locksmith.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ More info:
605605
606606
<#
607607
Option 2: Scripted Remediation
608-
Step 1: Open an elevated Powershell session as an AD or PKI Admin
608+
Step 1: Open an elevated PowerShell session as an AD or PKI Admin
609609
Step 2: Run Unpublish-SchemaV1Templates.ps1
610610
#>
611611
Invoke-WebRequest -Uri https://gist.githubusercontent.com/jakehildreth/13c7d615adc905d317fc4379026ad28e/raw/Unpublish-SchemaV1Templates.ps1 | Invoke-Expression
@@ -2720,7 +2720,7 @@ function Invoke-Remediation {
27202720
Write-Host "$($_.Technique)`n"
27212721
Write-Host 'ACTION TO BE PERFORMED:' -ForegroundColor White
27222722
Write-Host "Locksmith will attempt to enable Manager Approval on the `"$($_.Name)`" template.`n"
2723-
Write-Host 'CCOMMAND(S) TO BE RUN:'
2723+
Write-Host 'COMMAND(S) TO BE RUN:'
27242724
Write-Host 'PS> ' -NoNewline
27252725
Write-Host "$($_.Fix)`n" -ForegroundColor Cyan
27262726
Write-Host 'OPERATIONAL IMPACT:' -ForegroundColor White
@@ -4874,7 +4874,7 @@ function Write-HostColorized {
48744874
}
48754875
}
48764876
# Otherwise: $PSCmdlet.ParameterSetName -eq 'PerPatternColor', i.e. a dictionary
4877-
# mapping patterns to colors was direclty passed in $PatternColorMap
4877+
# mapping patterns to colors was directly passed in $PatternColorMap
48784878

48794879
try {
48804880

@@ -5019,7 +5019,7 @@ function Invoke-Locksmith {
50195019
Finds the most common malconfigurations of Active Directory Certificate Services (AD CS).
50205020
50215021
.DESCRIPTION
5022-
Locksmith uses the Active Directory (AD) Powershell (PS) module to identify 10 misconfigurations
5022+
Locksmith uses the Active Directory (AD) PowerShell (PS) module to identify 10 misconfigurations
50235023
commonly found in Enterprise mode AD CS installations.
50245024
50255025
.COMPONENT
@@ -5037,7 +5037,7 @@ function Invoke-Locksmith {
50375037
50385038
-Mode 1
50395039
Finds any malconfigurations and displays them in the console.
5040-
Displays example Powershell snippet that can be used to resolve the issue.
5040+
Displays example PowerShell snippet that can be used to resolve the issue.
50415041
No attempt is made to fix identified issues.
50425042
50435043
-Mode 2
@@ -5342,7 +5342,7 @@ function Invoke-Locksmith {
53425342
Format-Result -Issue $ESC16 -Mode 0
53435343
Format-Result -Issue $ESC17 -Mode 0
53445344
Write-Host @"
5345-
[!] You ran Locksmith in Mode 0 which only provides an high-level overview of issues
5345+
[!] You ran Locksmith in Mode 0 which only provides a high-level overview of issues
53465346
identified in the environment. For more details including:
53475347
53485348
- Detailed Risk Rating
@@ -5385,7 +5385,7 @@ Invoke-Locksmith -Mode 1
53855385
Write-Host "$Output created successfully!`n"
53865386
}
53875387
catch {
5388-
Write-Host 'Ope! Something broke.'
5388+
Write-Host "ERROR: Failed to write '$Output'. $($_.Exception.Message)"
53895389
}
53905390
}
53915391
3 {
@@ -5396,7 +5396,7 @@ Invoke-Locksmith -Mode 1
53965396
Write-Host "$Output created successfully!`n"
53975397
}
53985398
catch {
5399-
Write-Host 'Ope! Something broke.'
5399+
Write-Host "ERROR: Failed to write '$Output'. $($_.Exception.Message)"
54005400
}
54015401
}
54025402
4 {

Private/Find-ESC15.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ More info:
8484
8585
<#
8686
Option 2: Scripted Remediation
87-
Step 1: Open an elevated Powershell session as an AD or PKI Admin
87+
Step 1: Open an elevated PowerShell session as an AD or PKI Admin
8888
Step 2: Run Unpublish-SchemaV1Templates.ps1
8989
#>
9090
Invoke-WebRequest -Uri https://gist.githubusercontent.com/jakehildreth/13c7d615adc905d317fc4379026ad28e/raw/Unpublish-SchemaV1Templates.ps1 | Invoke-Expression

Private/Invoke-Remediation.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ function Invoke-Remediation {
314314
Write-Host "$($_.Technique)`n"
315315
Write-Host 'ACTION TO BE PERFORMED:' -ForegroundColor White
316316
Write-Host "Locksmith will attempt to enable Manager Approval on the `"$($_.Name)`" template.`n"
317-
Write-Host 'CCOMMAND(S) TO BE RUN:'
317+
Write-Host 'COMMAND(S) TO BE RUN:'
318318
Write-Host 'PS> ' -NoNewline
319319
Write-Host "$($_.Fix)`n" -ForegroundColor Cyan
320320
Write-Host 'OPERATIONAL IMPACT:' -ForegroundColor White

Private/Write-HostColorized.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Function Write-HostColorized {
126126

127127
}
128128
# Otherwise: $PSCmdlet.ParameterSetName -eq 'PerPatternColor', i.e. a dictionary
129-
# mapping patterns to colors was direclty passed in $PatternColorMap
129+
# mapping patterns to colors was directly passed in $PatternColorMap
130130

131131
try {
132132

Public/Invoke-Locksmith.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function Invoke-Locksmith {
44
Finds the most common malconfigurations of Active Directory Certificate Services (AD CS).
55
66
.DESCRIPTION
7-
Locksmith uses the Active Directory (AD) Powershell (PS) module to identify 10 misconfigurations
7+
Locksmith uses the Active Directory (AD) PowerShell (PS) module to identify 10 misconfigurations
88
commonly found in Enterprise mode AD CS installations.
99
1010
.COMPONENT
@@ -22,7 +22,7 @@ function Invoke-Locksmith {
2222
2323
-Mode 1
2424
Finds any malconfigurations and displays them in the console.
25-
Displays example Powershell snippet that can be used to resolve the issue.
25+
Displays example PowerShell snippet that can be used to resolve the issue.
2626
No attempt is made to fix identified issues.
2727
2828
-Mode 2
@@ -324,7 +324,7 @@ function Invoke-Locksmith {
324324
Format-Result -Issue $ESC16 -Mode 0
325325
Format-Result -Issue $ESC17 -Mode 0
326326
Write-Host @"
327-
[!] You ran Locksmith in Mode 0 which only provides an high-level overview of issues
327+
[!] You ran Locksmith in Mode 0 which only provides a high-level overview of issues
328328
identified in the environment. For more details including:
329329
330330
- Detailed Risk Rating
@@ -366,7 +366,7 @@ Invoke-Locksmith -Mode 1
366366
$AllIssues | Select-Object Forest, Technique, Name, Issue, @{l = 'Risk'; e = { $_.RiskName } } | Export-Csv -NoTypeInformation -Encoding UTF8 $Output
367367
Write-Host "$Output created successfully!`n"
368368
} catch {
369-
Write-Host 'Ope! Something broke.'
369+
Write-Host "ERROR: Failed to write '$Output'. $($_.Exception.Message)"
370370
}
371371
}
372372
3 {
@@ -376,7 +376,7 @@ Invoke-Locksmith -Mode 1
376376
$AllIssues | Select-Object Forest, Technique, Name, DistinguishedName, Issue, Fix, @{l = 'Risk'; e = { $_.RiskName } }, @{l = 'Risk Score'; e = { $_.RiskValue } }, @{l = 'Risk Score Detail'; e = { $_.RiskScoring -join "`n" } } | Export-Csv -NoTypeInformation -Encoding UTF8 $Output
377377
Write-Host "$Output created successfully!`n"
378378
} catch {
379-
Write-Host 'Ope! Something broke.'
379+
Write-Host "ERROR: Failed to write '$Output'. $($_.Exception.Message)"
380380
}
381381
}
382382
4 {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Install-Module -Name Locksmith -Scope CurrentUser
7878
<a name="run-locksmith" id="run-locksmith"></a>
7979
## Run Locksmith
8080

81-
There are several modes you can chose from when running `Invoke-Locksmith`. You can also use the **Scans** parameter to choose which scans you want to invoke.
81+
There are several modes you can choose from when running `Invoke-Locksmith`. You can also use the **Scans** parameter to choose which scans you want to invoke.
8282

8383
<a name="mode-0-identify-issues-output-to-console-default" id="mode-0-identify-issues-output-to-console-default"></a>
8484
### Mode 0: Identify Issues, Output to Console (Default)

0 commit comments

Comments
 (0)