RepoMirrors
/
DSInternals
mirror of https://github.com/MichaelGrafnetter/DSInternals
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved KDS Root Key selection algorithm

This commit is contained in:
Michael Grafnetter 2023-10-02 10:22:14 +02:00
parent e01c3425f0
commit f6deab9d04
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Src/DSInternals.DataStore/DirectoryAgent.cs
View File

@ -140,6 +140,7 @@
{ {
// Fetch all KDS root keys first. // Fetch all KDS root keys first.
var rootKeys = new Dictionary<Guid, KdsRootKey>(); var rootKeys = new Dictionary<Guid, KdsRootKey>();
KdsRootKey latestRootKey = null;
foreach (var rootKey in this.GetKdsRootKeys()) foreach (var rootKey in this.GetKdsRootKeys())
{ {
@ -148,6 +149,12 @@
{ {
// Allow the key to be found by ID // Allow the key to be found by ID
rootKeys.Add(rootKey.KeyId, rootKey); rootKeys.Add(rootKey.KeyId, rootKey);
// Check if this key is the newest found yet
if(rootKey.EffectiveTime <= effectiveTime && (latestRootKey == null || latestRootKey.CreationTime < rootKey.CreationTime))
{
latestRootKey = rootKey;
}
} }
} }
@ -159,13 +166,23 @@
if (gmsa.ManagedPasswordId != null) if (gmsa.ManagedPasswordId != null)
{ {
// Find the proper key by Guid DateTime nextPasswordChange = gmsa.PasswordLastSet.Value.AddDays(gmsa.ManagedPasswordInterval.Value);
Guid associateRootKeyId = gmsa.ManagedPasswordId.RootKeyId; KdsRootKey rootKeyToUse;
bool keyFound = rootKeys.TryGetValue(associateRootKeyId, out var associatedRootKey); if (nextPasswordChange <= effectiveTime)
if (keyFound)
{ {
gmsa.CalculatePassword(associatedRootKey, effectiveTime); // The existing password has already expired, so generate the managed password based on the latest Root Key
rootKeyToUse = latestRootKey;
}
else
{
// Generate the managed password based on the Root Key currently associated with it
Guid associateRootKeyId = gmsa.ManagedPasswordId.RootKeyId;
rootKeys.TryGetValue(associateRootKeyId, out rootKeyToUse);
}
if (rootKeyToUse != null)
{
gmsa.CalculatePassword(rootKeyToUse, effectiveTime);
} }
} }