Skip to content

Don't leak that #352

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
SteveSyfuhs merged 1 commit into from
Jul 24, 2023
Merged

Don't leak that #352

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
40 changes: 21 additions & 19 deletions Kerberos.NET/Win32/LsaInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,23 +288,24 @@ public unsafe IEnumerable<KerberosClientCacheEntry> GetTicketCache(long luid = 0
pRequest->MessageType = KERB_PROTOCOL_MESSAGE_TYPE.KerbQueryTicketCacheEx3Message;
pRequest->LogonId = luid;

var response = this.LsaCallAuthenticationPackageWithReturn(pRequest, bufferSize);

return WithFixedBuffer(response, p =>
using (var response = this.LsaCallAuthenticationPackageWithReturn(pRequest, bufferSize))
{
var pCacheResponse = (KERB_QUERY_TKT_CACHE_EX3_RESPONSE*)p;
return WithFixedBuffer(response, p =>
{
var pCacheResponse = (KERB_QUERY_TKT_CACHE_EX3_RESPONSE*)p;

var cacheResult = new List<KerberosClientCacheEntry>();
var cacheResult = new List<KerberosClientCacheEntry>();

for (var i = 0; i < pCacheResponse->CountOfTickets; i++)
{
var ticket = (&pCacheResponse->Tickets)[i];
for (var i = 0; i < pCacheResponse->CountOfTickets; i++)
{
var ticket = (&pCacheResponse->Tickets)[i];

cacheResult.Add(ticket.ToCacheEntry());
}
cacheResult.Add(ticket.ToCacheEntry());
}

return cacheResult;
});
return cacheResult;
});
}
});
}

Expand Down Expand Up @@ -366,16 +367,17 @@ public unsafe KrbCred GetTicket(string spn, long luid = 0)

SetString(spn, pRequest, ref pRequest->TargetName, ref requestSize);

var response = this.LsaCallAuthenticationPackageWithReturn(pRequest, bufferSize);

return WithFixedBuffer(response, p =>
using (var response = this.LsaCallAuthenticationPackageWithReturn(pRequest, bufferSize))
{
var pResponse = (KERB_RETRIEVE_TKT_RESPONSE*)p;
return WithFixedBuffer(response, p =>
{
var pResponse = (KERB_RETRIEVE_TKT_RESPONSE*)p;

var cred = new Span<byte>(pResponse->Ticket.EncodedTicket, pResponse->Ticket.EncodedTicketSize);
var cred = new Span<byte>(pResponse->Ticket.EncodedTicket, pResponse->Ticket.EncodedTicketSize);

return KrbCred.DecodeApplication(cred.ToArray());
});
return KrbCred.DecodeApplication(cred.ToArray());
});
}
});
}

Expand Down