Skip to content

Refactor IsComputerNameValid character validation #26274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 8 commits into from
Nov 14, 2025
+5 −16
Merged

Refactor IsComputerNameValid character validation #26274

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2dc14b3
Refactor character validation to use char.IsAsciiLetter and char.IsAs…
xtqqczze Oct 22, 2025
34c193f
Avoid negation for clarity
xtqqczze Oct 22, 2025
278f203
Merge conditional
xtqqczze Oct 22, 2025
d242b94
Simplify branching
xtqqczze Oct 22, 2025
66c78ca
Check for letter first for performance
xtqqczze Oct 26, 2025
f590822
remove redundant continue statement
xtqqczze Oct 27, 2025
72bb77f
Rename hasNonDigit
xtqqczze Nov 2, 2025
c94d1ce
fix extra space
xtqqczze Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,35 +2019,24 @@ internal static void WriteNonTerminatingError(int errorcode, PSCmdlet cmdlet, st
/// <returns></returns>
internal static bool IsComputerNameValid(string computerName)
{
bool allDigits = true;
bool hasAsciiLetterOrHyphen = false;

if (computerName.Length >= 64)
return false;

foreach (char t in computerName)
{
if (t >= 'A' && t <= 'Z' ||
t >= 'a' && t <= 'z')
if (char.IsAsciiLetter(t) || t is '-')
{
allDigits = false;
continue;
}
else if (t >= '0' && t <= '9')
{
continue;
hasAsciiLetterOrHyphen = true;
}
else if (t == '-')
{
allDigits = false;
continue;
}
else
else if (!char.IsAsciiDigit(t))
{
return false;
}
}

return !allDigits;
return hasAsciiLetterOrHyphen;
}

/// <summary>
Expand Down
Loading