jeff/NSspi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified the initialization process a little to better control when a context is marked as initialized.

Browse Source
This commit is contained in:
antiduh
2014-07-01 18:31:33 +00:00
parent 5403321a49
commit e980e11184
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NSspi/Contexts/ClientContext.cs
View File

@@ -114,15 +114,11 @@ namespace NSspi.Contexts
if ( status == SecurityStatus.OK ) if ( status == SecurityStatus.OK )
{ {
this.Initialized = true; base.Initialize( rawExpiry.ToDateTime() );
outToken = null; outToken = null;
this.Expiry = rawExpiry.ToDateTime();
} }
else if ( status == SecurityStatus.ContinueNeeded ) else if ( status == SecurityStatus.ContinueNeeded )
{ {
this.Initialized = false;
outToken = new byte[outTokenBuffer.Length]; outToken = new byte[outTokenBuffer.Length];
Array.Copy( outTokenBuffer.Buffer, outToken, outToken.Length ); Array.Copy( outTokenBuffer.Buffer, outToken, outToken.Length );
} }

16
NSspi/Contexts/Context.cs
View File

@@ -26,11 +26,11 @@ namespace NSspi.Contexts
/// <summary> /// <summary>
/// Whether or not the context is fully formed. /// Whether or not the context is fully formed.
/// </summary> /// </summary>
public bool Initialized { get; protected set; } public bool Initialized { get; private set; }
protected Credential Credential { get; private set; } protected Credential Credential { get; private set; }
public SafeContextHandle ContextHandle { get; protected set; } public SafeContextHandle ContextHandle { get; private set; }
public string AuthorityName public string AuthorityName
{ {
@@ -48,10 +48,20 @@ namespace NSspi.Contexts
} }
} }
public DateTime Expiry { get; protected set; } public DateTime Expiry { get; private set; }
public bool Disposed { get; private set; } public bool Disposed { get; private set; }
/// <summary>
/// Marks the context as having completed the initialization process, ie, exchanging of authentication tokens.
/// </summary>
/// <param name="expiry">The date and time that the context will expire.</param>
protected void Initialize( DateTime expiry )
{
this.Expiry = expiry;
this.Initialized = true;
}
public void Dispose() public void Dispose()
{ {
Dispose( true ); Dispose( true );

20
NSspi/Contexts/ServerContext.cs
View File

@@ -36,8 +36,8 @@ namespace NSspi.Contexts
public SecurityStatus AcceptToken( byte[] clientToken, out byte[] nextToken ) public SecurityStatus AcceptToken( byte[] clientToken, out byte[] nextToken )
{ {
SecureBuffer clientBuffer = new SecureBuffer( clientToken, BufferType.Token ); SecureBuffer clientBuffer;
SecureBuffer outBuffer = new SecureBuffer( new byte[12288], BufferType.Token ); SecureBuffer outBuffer;
SecurityStatus status; SecurityStatus status;
TimeStamp rawExpiry = new TimeStamp(); TimeStamp rawExpiry = new TimeStamp();
@@ -49,6 +49,15 @@ namespace NSspi.Contexts
{ {
throw new ObjectDisposedException( "ServerContext" ); throw new ObjectDisposedException( "ServerContext" );
} }
else if( this.Initialized )
{
throw new InvalidOperationException(
"Attempted to continue initialization of a ServerContext after initialization had completed."
);
}
clientBuffer = new SecureBuffer( clientToken, BufferType.Token );
outBuffer = new SecureBuffer( new byte[12288], BufferType.Token );
using ( clientAdapter = new SecureBufferAdapter( clientBuffer ) ) using ( clientAdapter = new SecureBufferAdapter( clientBuffer ) )
{ {
@@ -90,7 +99,8 @@ namespace NSspi.Contexts
if ( status == SecurityStatus.OK ) if ( status == SecurityStatus.OK )
{ {
nextToken = null; nextToken = null;
this.Initialized = true;
base.Initialize( rawExpiry.ToDateTime() );
if ( outBuffer.Length != 0 ) if ( outBuffer.Length != 0 )
{ {
@@ -101,13 +111,9 @@ namespace NSspi.Contexts
{ {
nextToken = null; nextToken = null;
} }
this.Expiry = rawExpiry.ToDateTime();
} }
else if ( status == SecurityStatus.ContinueNeeded ) else if ( status == SecurityStatus.ContinueNeeded )
{ {
this.Initialized = false;
nextToken = new byte[outBuffer.Length]; nextToken = new byte[outBuffer.Length];
Array.Copy( outBuffer.Buffer, nextToken, nextToken.Length ); Array.Copy( outBuffer.Buffer, nextToken, nextToken.Length );
} }