Skip to content

[tls] Fix read/write ignoring error code and requesting more read/write calls #1018

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
merged 1 commit into from
Aug 23, 2018
Merged

[tls] Fix read/write ignoring error code and requesting more read/write calls #1018

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
48 changes: 32 additions & 16 deletions mcs/class/System/Mono.UnityTls/UnityTlsContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ public override void Flush ()

public override (int ret, bool wantMore) Read (byte[] buffer, int offset, int count)
{
bool wantMore = false;
int numBytesRead = 0;

lastException = null;
Expand All @@ -183,19 +182,27 @@ public override (int ret, bool wantMore) Read (byte[] buffer, int offset, int co
if (lastException != null)
throw lastException;

if (errorState.code == UnityTls.unitytls_error_code.UNITYTLS_USER_WOULD_BLOCK || numBytesRead < count) // In contrast to some other APIs (like Apple security) WOULD_BLOCK is not set if we did a partial read
wantMore = true;
else if (errorState.code == UnityTls.unitytls_error_code.UNITYTLS_STREAM_CLOSED)
return (0, false); // According to Apple and Btls implementation this is how we should handle gracefully closed connections.
else
Mono.Unity.Debug.CheckAndThrow (errorState, "Failed to read data from TLS context");
switch (errorState.code)
{
case UnityTls.unitytls_error_code.UNITYTLS_SUCCESS:
// In contrast to some other APIs (like Apple security) WOULD_BLOCK is not set if we did a partial write.
// The Mono Api however requires us to set the wantMore flag also if we didn't read all the data.
return (numBytesRead, numBytesRead < count);

case UnityTls.unitytls_error_code.UNITYTLS_USER_WOULD_BLOCK:
return (numBytesRead, true);

case UnityTls.unitytls_error_code.UNITYTLS_STREAM_CLOSED:
return (0, false); // According to Apple and Btls implementation this is how we should handle gracefully closed connections.

return (numBytesRead, wantMore);
default:
Mono.Unity.Debug.CheckAndThrow (errorState, "Failed to read data to TLS context");
return (0, false);
}
}

public override (int ret, bool wantMore) Write (byte[] buffer, int offset, int count)
{
bool wantMore = false;
int numBytesWritten = 0;

lastException = null;
Expand All @@ -206,14 +213,23 @@ public override (int ret, bool wantMore) Write (byte[] buffer, int offset, int c
if (lastException != null)
throw lastException;

if (errorState.code == UnityTls.unitytls_error_code.UNITYTLS_USER_WOULD_BLOCK || numBytesWritten < count) // In contrast to some other APIs (like Apple security) WOULD_BLOCK is not set if we did a partial write
wantMore = true;
else if (errorState.code == UnityTls.unitytls_error_code.UNITYTLS_STREAM_CLOSED)
return (0, false); // According to Apple and Btls implementation this is how we should handle gracefully closed connections.
else
Mono.Unity.Debug.CheckAndThrow (errorState, "Failed to write data to TLS context");
switch (errorState.code)
{
case UnityTls.unitytls_error_code.UNITYTLS_SUCCESS:
// In contrast to some other APIs (like Apple security) WOULD_BLOCK is not set if we did a partial write.
// The Mono Api however requires us to set the wantMore flag also if we didn't write all the data.
return (numBytesWritten, numBytesWritten < count);

case UnityTls.unitytls_error_code.UNITYTLS_USER_WOULD_BLOCK:
return (numBytesWritten, true);

case UnityTls.unitytls_error_code.UNITYTLS_STREAM_CLOSED:
return (0, false); // According to Apple and Btls implementation this is how we should handle gracefully closed connections.

return (numBytesWritten, wantMore);
default:
Mono.Unity.Debug.CheckAndThrow (errorState, "Failed to write data to TLS context");
return (0, false);
}
}

public override void Shutdown ()
Expand Down