refactor(magicpacket): manual MAC address format validation

- use manual format validation for MacAddress so that ErrorAction works
correctly instead of throwing ParameterBindingError which requires
Try/Catch blocks

BREAKING CHANGES:
- remove parameter validation check for MacAddress,
validate while processing
- change all warnings to errors

Closes #1
This commit is contained in:
Asif Bacchus 2021-09-05 18:49:00 -06:00
parent f389999ca3
commit d5c3c071cd
1 changed files with 9 additions and 3 deletions

View File

@ -50,7 +50,6 @@ function Send-MagicPacket
ValueFromPipelineByPropertyName, ValueFromPipelineByPropertyName,
HelpMessage = "Please provide one or more MAC addresses. You may use a colon (:) or a hypen (-) to separate hex values." HelpMessage = "Please provide one or more MAC addresses. You may use a colon (:) or a hypen (-) to separate hex values."
)] )]
[ValidatePattern('^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$')]
[String[]] [String[]]
$MacAddress, $MacAddress,
@ -83,6 +82,13 @@ function Send-MagicPacket
{ {
foreach ($addr in $MacAddress) foreach ($addr in $MacAddress)
{ {
# validate MAC address format or write error and continue
if (!($addr -match '^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$'))
{
Write-Error "Invalid MAC address: $addr"
continue
}
# convert MAC address to magic packet # convert MAC address to magic packet
try try
{ {
@ -97,7 +103,7 @@ function Send-MagicPacket
} }
catch catch
{ {
Write-Warning "Unable to process MAC address: $thisMacAddress" Write-Error "Unable to process MAC address: $thisMacAddress"
continue continue
} }
@ -112,7 +118,7 @@ function Send-MagicPacket
} }
catch catch
{ {
Write-Warning "Unable to send magic packet for '$addr'" Write-Error "Unable to send magic packet for '$addr'"
continue continue
} }
} }