Skip to content

IISU: fixed a null object reference bug with the legacy SANs resolver #184

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

Closed
KueYang wants to merge 1 commit into from
Closed

IISU: fixed a null object reference bug with the legacy SANs resolver #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
3.0.2
* Fixed a null object reference bug when resolving SANs via the Entry Parameter.

3.0.1
* Fixed an issues when renewing ECC Certificates

Expand Down
2 changes: 1 addition & 1 deletion IISU/ClientPSCertStoreReEnrollment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ public string ResolveSANString(ReenrollmentJobConfiguration config)
}
else if (config.JobProperties != null &&
config.JobProperties.TryGetValue("SAN", out object legacySanValue) &&
!string.IsNullOrWhiteSpace(legacySanValue.ToString()))
(legacySanValue is not null && !string.IsNullOrWhiteSpace(legacySanValue.ToString())))
{
sanValue = legacySanValue.ToString().Trim();
sourceUsed = "config.JobProperties[\"SAN\"] (legacy)";
Expand Down
9 changes: 6 additions & 3 deletions WindowsCertStore.UnitTests/SANsUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,18 @@ public void ResolveSanString_PrefersConfigSANs_WhenBothSourcesExist()
Assert.DoesNotContain("legacy.example.com", result); // ensure legacy ignored
}

[Fact]
public void ResolveSanString_UsesLegacySAN_WhenConfigSANsMissing()
[Theory]
[InlineData("dns=legacy.example.com&dns=old.example.com")]
[InlineData("")]
[InlineData(null)]
public void ResolveSanString_UsesLegacySAN_WhenConfigSANsMissing(string legacySan)
{
// Arrange
var config = new ReenrollmentJobConfiguration
{
JobProperties = new Dictionary<string, object>
{
{ "SAN", "dns=legacy.example.com&dns=old.example.com" }
{ "SAN", legacySan }
},
SANs = new Dictionary<string, string[]>()
};
Expand Down
Loading