From 2ee8c3d05fcbff77f27bdd849623aff7d08b9d26 Mon Sep 17 00:00:00 2001 From: Sam Erde Date: Mon, 3 Mar 2025 05:45:35 -0500 Subject: [PATCH 1/4] Update jinja to 3.1.5 --- Docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/requirements.txt b/Docs/requirements.txt index 10179c9f..a384e051 100644 --- a/Docs/requirements.txt +++ b/Docs/requirements.txt @@ -1,6 +1,6 @@ # https://github.com/readthedocs-examples/example-mkdocs-basic/blob/main/docs/requirements.txt # requirements.txt -jinja2==3.1.4 #https://pypi.org/project/Jinja2/ +jinja2==3.1.5 #https://pypi.org/project/Jinja2/ mkdocs>=1.6.0 #https://github.com/mkdocs/mkdocs mkdocs-material==9.5.25 #https://github.com/squidfunk/mkdocs-material pygments>=2.18.0 #https://pypi.org/project/Pygments/ From 70bdf945b029f1c3195ad47d3aac4f466b0f5961 Mon Sep 17 00:00:00 2001 From: Sam Erde Date: Tue, 4 Mar 2025 15:28:35 -0500 Subject: [PATCH 2/4] Add more tags after comparing to related projects in Gallery --- Build/Build-Module.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/Build-Module.ps1 b/Build/Build-Module.ps1 index beb54dbe..1bf4d00f 100644 --- a/Build/Build-Module.ps1 +++ b/Build/Build-Module.ps1 @@ -32,7 +32,7 @@ Build-Module -ModuleName 'Locksmith' { ProjectUri = 'https://github.com/jakehildreth/Locksmith' IconUri = 'https://raw.githubusercontent.com/jakehildreth/Locksmith/main/Images/locksmith.ico' PowerShellVersion = '5.1' - Tags = @('Windows', 'Locksmith', 'CA', 'PKI', 'ActiveDirectory', 'CertificateServices', 'ADCS') + Tags = @('Locksmith', 'ActiveDirectory', 'ADCS', 'CA', 'Certificate', 'CertificateAuthority', 'CertificateServices', 'PKI', 'X509', 'Windows') } New-ConfigurationManifest @Manifest From 0a932abf115ad28547c0cf68cf48efb577c803a2 Mon Sep 17 00:00:00 2001 From: Sam Erde Date: Tue, 4 Mar 2025 15:31:10 -0500 Subject: [PATCH 3/4] Add CmdletBinding attribute to merged script. --- Build/Build-Module.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Build/Build-Module.ps1 b/Build/Build-Module.ps1 index 1bf4d00f..fed4774c 100644 --- a/Build/Build-Module.ps1 +++ b/Build/Build-Module.ps1 @@ -120,10 +120,11 @@ Build-Module -ModuleName 'Locksmith' { New-ConfigurationBuild -Enable:$true -SignModule:$false -DeleteTargetModuleBeforeBuild -MergeModuleOnBuild #-UseWildcardForFunctions $PreScriptMerge = { + [CmdletBinding()] param ( [int]$Mode, [Parameter()] - [ValidateSet('Auditing','ESC1','ESC2','ESC3','ESC4','ESC5','ESC6','ESC8','ESC11','ESC13','ESC15','EKUwu','All','PromptMe')] + [ValidateSet('Auditing', 'ESC1', 'ESC2', 'ESC3', 'ESC4', 'ESC5', 'ESC6', 'ESC8', 'ESC11', 'ESC13', 'ESC15', 'EKUwu', 'All', 'PromptMe')] [array]$Scans = 'All' ) } From f9d4f25d2bb5b1aa6912464a363376d8c1f93790 Mon Sep 17 00:00:00 2001 From: Sam Erde Date: Tue, 4 Mar 2025 15:36:04 -0500 Subject: [PATCH 4/4] Add full parameter definitions and validation to merged script. --- Build/Build-Module.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Build/Build-Module.ps1 b/Build/Build-Module.ps1 index fed4774c..527ef384 100644 --- a/Build/Build-Module.ps1 +++ b/Build/Build-Module.ps1 @@ -120,9 +120,14 @@ Build-Module -ModuleName 'Locksmith' { New-ConfigurationBuild -Enable:$true -SignModule:$false -DeleteTargetModuleBeforeBuild -MergeModuleOnBuild #-UseWildcardForFunctions $PreScriptMerge = { - [CmdletBinding()] + [CmdletBinding(HelpUri = 'https://jakehildreth.github.io/Locksmith/Invoke-Locksmith')] param ( - [int]$Mode, + # The mode to run Locksmith in. Defaults to 0. + [Parameter(Mandatory = $false)] + [ValidateSet(0, 1, 2, 3, 4)] + [int]$Mode = 0, + + # The scans to run. Defaults to 'All'. [Parameter()] [ValidateSet('Auditing', 'ESC1', 'ESC2', 'ESC3', 'ESC4', 'ESC5', 'ESC6', 'ESC8', 'ESC11', 'ESC13', 'ESC15', 'EKUwu', 'All', 'PromptMe')] [array]$Scans = 'All'