DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed WebSocketStream.cs

Browse Source
This commit is contained in:
sta 2014-07-28 18:02:05 +09:00
parent 95cc941f1b
commit b27283390e
7 changed files with 118 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
websocket-sharp/Net/HttpConnection.cs
View File

@ -40,24 +40,19 @@
using System;
using System.IO;
using System.Net;
using System.Net.Security;
using System.Net.Sockets;
using System.Text;
using System.Threading;
using WebSocketSharp.Net.Security;
namespace WebSocketSharp.Net
{
internal sealed class HttpConnection
{
#region Private Const Fields
private const int _bufferSize = 8192;
#endregion
#region Private Fields
private byte[] _buffer;
private const int _bufferSize = 8192;
private bool _chunked;
private HttpListenerContext _context;
private bool _contextWasBound;
@ -78,7 +73,6 @@ namespace WebSocketSharp.Net
private object _sync;
private int _timeout;
private Timer _timer;
private WebSocketStream _websocketStream;
#endregion
@ -205,7 +199,6 @@ namespace WebSocketSharp.Net
_inputStream = null;
_outputStream = null;
_websocketStream = null;
_stream.Dispose ();
_stream = null;
@ -512,20 +505,6 @@ namespace WebSocketSharp.Net
}
}
public WebSocketStream GetWebSocketStream ()
{
if (_websocketStream != null || _socket == null)
return _websocketStream;
lock (_sync) {
if (_socket == null)
return _websocketStream;
_websocketStream = new WebSocketStream (_stream, _secure);
return _websocketStream;
}
}
public void SendError ()
{
SendError (_context.ErrorMessage, _context.ErrorStatus);

82
websocket-sharp/Net/Security/SslStream.cs
View File

@ -1,82 +0,0 @@
#region License
/*
* SslStream.cs
*
* The MIT License
*
* Copyright (c) 2012-2014 sta.blockhead
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#endregion
using System;
using System.Net.Security;
using System.Net.Sockets;
namespace WebSocketSharp.Net.Security
{
internal class SslStream : System.Net.Security.SslStream
{
#region Public Constructors
public SslStream (NetworkStream innerStream)
: base (innerStream)
{
}
public SslStream (NetworkStream innerStream, bool leaveInnerStreamOpen)
: base (innerStream, leaveInnerStreamOpen)
{
}
public SslStream (
NetworkStream innerStream,
bool leaveInnerStreamOpen,
RemoteCertificateValidationCallback userCertificateValidationCallback)
: base (innerStream, leaveInnerStreamOpen, userCertificateValidationCallback)
{
}
public SslStream (
NetworkStream innerStream,
bool leaveInnerStreamOpen,
RemoteCertificateValidationCallback userCertificateValidationCallback,
LocalCertificateSelectionCallback userCertificateSelectionCallback)
: base (
innerStream,
leaveInnerStreamOpen,
userCertificateValidationCallback,
userCertificateSelectionCallback)
{
}
#endregion
#region Public Properties
public bool DataAvailable {
get {
return ((NetworkStream) InnerStream).DataAvailable;
}
}
#endregion
}
}

7
websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs
View File

@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Security.Principal;
namespace WebSocketSharp.Net.WebSockets
@ -37,8 +38,6 @@ namespace WebSocketSharp.Net.WebSockets
/// Provides the properties used to access the information in a WebSocket connection request
/// received by the <see cref="HttpListener"/>.
/// </summary>
/// <remarks>
/// </remarks>
public class HttpListenerWebSocketContext : WebSocketContext
{
#region Private Fields
@ -61,9 +60,9 @@ namespace WebSocketSharp.Net.WebSockets
#region Internal Properties
internal WebSocketStream Stream {
internal Stream Stream {
get {
return _context.Connection.GetWebSocketStream ();
return _context.Connection.Stream;
}
}

25
websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
View File

@ -29,6 +29,8 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Net.Security;
using System.Net.Sockets;
using System.Security.Cryptography.X509Certificates;
using System.Security.Principal;
@ -48,7 +50,7 @@ namespace WebSocketSharp.Net.WebSockets
private NameValueCollection _queryString;
private HttpRequest _request;
private bool _secure;
private WebSocketStream _stream;
private Stream _stream;
private TcpClient _tcpClient;
private Uri _uri;
private IPrincipal _user;
@ -63,8 +65,18 @@ namespace WebSocketSharp.Net.WebSockets
{
_tcpClient = tcpClient;
_secure = secure;
_stream = WebSocketStream.CreateServerStream (tcpClient, secure, certificate);
_request = _stream.ReadHttpRequest (90000);
var netStream = tcpClient.GetStream ();
if (secure) {
var sslStream = new SslStream (netStream, false);
sslStream.AuthenticateAsServer (certificate);
_stream = sslStream;
}
else {
_stream = netStream;
}
_request = HttpRequest.Read (_stream, 90000);
_uri = HttpUtility.CreateRequestUrl (
_request.RequestUri, _request.Headers["Host"], _request.IsWebSocketRequest, secure);
@ -75,7 +87,7 @@ namespace WebSocketSharp.Net.WebSockets
#region Internal Properties
internal WebSocketStream Stream {
internal Stream Stream {
get {
return _stream;
}
@ -324,8 +336,9 @@ namespace WebSocketSharp.Net.WebSockets
internal void SendAuthenticationChallenge (string challenge)
{
_stream.WriteBytes (HttpResponse.CreateUnauthorizedResponse (challenge).ToByteArray ());
_request = _stream.ReadHttpRequest (15000);
var buff = HttpResponse.CreateUnauthorizedResponse (challenge).ToByteArray ();
_stream.Write (buff, 0, buff.Length);
_request = HttpRequest.Read (_stream, 15000);
}
internal void SetUser (

114
websocket-sharp/WebSocket.cs
View File

@ -38,8 +38,8 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
using System.IO;
using System.Net.Sockets;
using System.Net.Security;
using System.Net.Sockets;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
@ -90,7 +90,7 @@ namespace WebSocketSharp
private volatile WebSocketState _readyState;
private AutoResetEvent _receivePong;
private bool _secure;
private WebSocketStream _stream;
private Stream _stream;
private TcpClient _tcpClient;
private Uri _uri;
private const string _version = "13";
@ -511,7 +511,7 @@ namespace WebSocketSharp
if (extensions != null && extensions.Length > 0)
processSecWebSocketExtensionsHeader (extensions);
return sendHandshakeResponse (createHandshakeResponse ());
return sendHttpResponse (createHandshakeResponse ());
}
private string checkIfAvailable (
@ -629,7 +629,7 @@ namespace WebSocketSharp
private bool closeHandshake (byte[] frameAsBytes, int millisecondsTimeout, Action release)
{
var sent = frameAsBytes != null && _stream.WriteBytes (frameAsBytes);
var sent = frameAsBytes != null && writeBytes (frameAsBytes);
var received =
millisecondsTimeout == 0 ||
(sent && _exitReceiving != null && _exitReceiving.WaitOne (millisecondsTimeout));
@ -667,7 +667,7 @@ namespace WebSocketSharp
private bool concatenateFragmentsInto (Stream dest)
{
while (true) {
var frame = _stream.ReadWebSocketFrame ();
var frame = WebSocketFrame.Read (_stream, true);
if (frame.IsFinal) {
/* FINAL */
@ -1045,7 +1045,7 @@ namespace WebSocketSharp
return false;
}
return _stream.WriteBytes (frameAsBytes);
return writeBytes (frameAsBytes);
}
}
@ -1135,7 +1135,7 @@ namespace WebSocketSharp
return false;
}
return _stream.WriteBytes (
return writeBytes (
WebSocketFrame.CreateWebSocketFrame (fin, opcode, mask, data, compressed).ToByteArray ());
}
}
@ -1164,7 +1164,7 @@ namespace WebSocketSharp
private HttpResponse sendHandshakeRequest ()
{
var req = createHandshakeRequest ();
var res = sendHandshakeRequest (req, 90000);
var res = sendHttpRequest (req, 90000);
if (res.IsUnauthorized) {
_authChallenge = res.AuthenticationChallenge;
if (_credentials != null &&
@ -1177,7 +1177,7 @@ namespace WebSocketSharp
var authRes = new AuthenticationResponse (_authChallenge, _credentials, _nonceCount);
_nonceCount = authRes.NonceCount;
req.Headers["Authorization"] = authRes.ToString ();
res = sendHandshakeRequest (req, 15000);
res = sendHttpRequest (req, 15000);
}
}
@ -1185,31 +1185,74 @@ namespace WebSocketSharp
}
// As client
private HttpResponse sendHandshakeRequest (HttpRequest request, int millisecondsTimeout)
private HttpResponse sendHttpRequest (HttpRequest request, int millisecondsTimeout)
{
_logger.Debug (
String.Format ("A WebSocket connection request to {0}:\n{1}", _uri, request));
var res = _stream.SendHttpRequest (request, millisecondsTimeout);
_logger.Debug ("A response to this WebSocket connection request:\n" + res.ToString ());
_logger.Debug ("A request to the server:\n" + request.ToString ());
var res = request.GetResponse (_stream, millisecondsTimeout);
_logger.Debug ("A response to this request:\n" + res.ToString ());
return res;
}
// As server
private bool sendHandshakeResponse (HttpResponse response)
private bool sendHttpResponse (HttpResponse response)
{
_logger.Debug (
"A response to the WebSocket connection request:\n" + response.ToString ());
_logger.Debug ("A response to this request:\n" + response.ToString ());
return writeBytes (response.ToByteArray ());
}
return _stream.WriteBytes (response.ToByteArray ());
// As client
private HttpResponse sendProxyConnectRequest ()
{
var req = HttpRequest.CreateConnectRequest (_uri);
var res = sendHttpRequest (req, 90000);
if (res.IsProxyAuthenticationRequired) {
var authChal = res.ProxyAuthenticationChallenge;
if (authChal != null && _proxyCredentials != null) {
if (res.Headers.Contains ("Connection", "close")) {
closeClientResources ();
_tcpClient = new TcpClient (_proxyUri.DnsSafeHost, _proxyUri.Port);
_stream = _tcpClient.GetStream ();
}
var authRes = new AuthenticationResponse (authChal, _proxyCredentials, 0);
req.Headers["Proxy-Authorization"] = authRes.ToString ();
res = sendHttpRequest (req, 15000);
}
}
return res;
}
// As client
private void setClientStream ()
{
_stream = WebSocketStream.CreateClientStream (
_uri, _proxyUri, _proxyCredentials, _secure, _certValidationCallback, out _tcpClient);
var proxy = _proxyUri != null;
_tcpClient = proxy
? new TcpClient (_proxyUri.DnsSafeHost, _proxyUri.Port)
: new TcpClient (_uri.DnsSafeHost, _uri.Port);
_stream = _tcpClient.GetStream ();
if (proxy) {
var res = sendProxyConnectRequest ();
if (res.IsProxyAuthenticationRequired)
throw new WebSocketException ("Proxy authentication is required.");
if (res.StatusCode[0] != '2')
throw new WebSocketException (
"The proxy has failed a connection to the requested host and port.");
}
if (_secure) {
var sslStream = new SslStream (
_stream,
false,
_certValidationCallback ?? ((sender, certificate, chain, sslPolicyErrors) => true));
sslStream.AuthenticateAsClient (_uri.DnsSafeHost);
_stream = sslStream;
}
}
private void startReceiving ()
@ -1221,7 +1264,9 @@ namespace WebSocketSharp
_receivePong = new AutoResetEvent (false);
Action receive = null;
receive = () => _stream.ReadWebSocketFrameAsync (
receive = () => WebSocketFrame.ReadAsync (
_stream,
true,
frame => {
if (processWebSocketFrame (frame) && _readyState != WebSocketState.Closed) {
receive ();
@ -1313,6 +1358,18 @@ namespace WebSocketSharp
return value == null || value == _version;
}
private bool writeBytes (byte[] data)
{
try {
_stream.Write (data, 0, data.Length);
return true;
}
catch (Exception ex) {
_logger.Fatal (ex.ToString ());
return false;
}
}
#endregion
#region Internal Methods
@ -1322,7 +1379,7 @@ namespace WebSocketSharp
{
_readyState = WebSocketState.Closing;
sendHandshakeResponse (response);
sendHttpResponse (response);
closeServerResources ();
_readyState = WebSocketState.Closed;
@ -1430,11 +1487,10 @@ namespace WebSocketSharp
cache.Add (_compression, cached);
}
if (!_stream.WriteBytes (cached))
_logger.Error ("Sending a data has been interrupted.");
writeBytes (cached);
}
catch (Exception ex) {
_logger.Fatal ("An exception has occurred while sending a data:\n" + ex.ToString ());
_logger.Fatal (ex.ToString ());
}
}
}
@ -1454,12 +1510,10 @@ namespace WebSocketSharp
cached.Position = 0;
}
if (_readyState != WebSocketState.Open ||
!send (opcode, Mask.Unmask, cached, _compression != CompressionMethod.None))
_logger.Error ("Sending a data has been interrupted.");
send (opcode, Mask.Unmask, cached, _compression != CompressionMethod.None);
}
catch (Exception ex) {
_logger.Fatal ("An exception has occurred while sending a data:\n" + ex.ToString ());
_logger.Fatal (ex.ToString ());
}
}
}

201
websocket-sharp/WebSocketStream.cs
View File

@ -1,201 +0,0 @@
#region License
/*
* WebSocketStream.cs
*
* The MIT License
*
* Copyright (c) 2010-2014 sta.blockhead
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#endregion
using System;
using System.IO;
using System.Net.Sockets;
using System.Security.Cryptography.X509Certificates;
using WebSocketSharp.Net;
using WebSocketSharp.Net.Security;
namespace WebSocketSharp
{
internal class WebSocketStream : IDisposable
{
#region Private Fields
private Stream _innerStream;
private bool _secure;
#endregion
#region Internal Constructors
internal WebSocketStream (Stream innerStream, bool secure)
{
_innerStream = innerStream;
_secure = secure;
}
#endregion
#region Public Properties
public bool DataAvailable {
get {
return _secure
? ((SslStream) _innerStream).DataAvailable
: ((NetworkStream) _innerStream).DataAvailable;
}
}
public bool IsSecure {
get {
return _secure;
}
}
#endregion
#region Internal Methods
internal static WebSocketStream CreateClientStream (
Uri targetUri,
Uri proxyUri,
NetworkCredential proxyCredentials,
bool secure,
System.Net.Security.RemoteCertificateValidationCallback validationCallback,
out TcpClient tcpClient)
{
var proxy = proxyUri != null;
tcpClient = proxy
? new TcpClient (proxyUri.DnsSafeHost, proxyUri.Port)
: new TcpClient (targetUri.DnsSafeHost, targetUri.Port);
var netStream = tcpClient.GetStream ();
if (proxy) {
var req = HttpRequest.CreateConnectRequest (targetUri);
var res = req.GetResponse (netStream, 90000);
if (res.IsProxyAuthenticationRequired) {
var authChal = res.ProxyAuthenticationChallenge;
if (authChal != null && proxyCredentials != null) {
if (res.Headers.Contains ("Connection", "close")) {
netStream.Dispose ();
tcpClient.Close ();
tcpClient = new TcpClient (proxyUri.DnsSafeHost, proxyUri.Port);
netStream = tcpClient.GetStream ();
}
var authRes = new AuthenticationResponse (authChal, proxyCredentials, 0);
req.Headers["Proxy-Authorization"] = authRes.ToString ();
res = req.GetResponse (netStream, 15000);
}
if (res.IsProxyAuthenticationRequired)
throw new WebSocketException ("Proxy authentication is required.");
}
var code = res.StatusCode;
if (code[0] != '2')
throw new WebSocketException (
String.Format (
"The proxy has failed a connection to the requested host and port. ({0})", code));
}
if (secure) {
var sslStream = new SslStream (
netStream,
false,
validationCallback ?? ((sender, certificate, chain, sslPolicyErrors) => true));
sslStream.AuthenticateAsClient (targetUri.DnsSafeHost);
return new WebSocketStream (sslStream, secure);
}
return new WebSocketStream (netStream, secure);
}
internal static WebSocketStream CreateServerStream (
TcpClient tcpClient, bool secure, X509Certificate certificate)
{
var netStream = tcpClient.GetStream ();
if (secure) {
var sslStream = new SslStream (netStream, false);
sslStream.AuthenticateAsServer (certificate);
return new WebSocketStream (sslStream, secure);
}
return new WebSocketStream (netStream, secure);
}
internal HttpRequest ReadHttpRequest (int millisecondsTimeout)
{
return HttpRequest.Read (_innerStream, millisecondsTimeout);
}
internal HttpResponse ReadHttpResponse (int millisecondsTimeout)
{
return HttpResponse.Read (_innerStream, millisecondsTimeout);
}
internal WebSocketFrame ReadWebSocketFrame ()
{
return WebSocketFrame.Read (_innerStream, true);
}
internal void ReadWebSocketFrameAsync (
Action<WebSocketFrame> completed, Action<Exception> error)
{
WebSocketFrame.ReadAsync (_innerStream, true, completed, error);
}
internal HttpResponse SendHttpRequest (HttpRequest request, int millisecondsTimeout)
{
return request.GetResponse (_innerStream, millisecondsTimeout);
}
internal bool WriteBytes (byte[] data)
{
try {
_innerStream.Write (data, 0, data.Length);
return true;
}
catch {
return false;
}
}
#endregion
#region Public Methods
public void Close ()
{
_innerStream.Close ();
}
public void Dispose ()
{
_innerStream.Dispose ();
}
#endregion
}
}

3
websocket-sharp/websocket-sharp.csproj
View File

@ -94,7 +94,6 @@
<Compile Include="Server\HttpServer.cs" />
<Compile Include="Net\HttpVersion.cs" />
<Compile Include="Net\HttpStatusCode.cs" />
<Compile Include="Net\Security\SslStream.cs" />
<Compile Include="Server\WebSocketServiceHost.cs" />
<Compile Include="CloseStatusCode.cs" />
<Compile Include="Fin.cs" />
@ -123,7 +122,6 @@
<Compile Include="Server\WebSocketServiceManager.cs" />
<Compile Include="Net\InputState.cs" />
<Compile Include="Net\LineState.cs" />
<Compile Include="WebSocketStream.cs" />
<Compile Include="Net\ReadBufferState.cs" />
<Compile Include="Net\Chunk.cs" />
<Compile Include="Net\InputChunkState.cs" />
@ -141,7 +139,6 @@
<ItemGroup>
<Folder Include="Server\" />
<Folder Include="Net\" />
<Folder Include="Net\Security\" />
<Folder Include="Net\WebSockets\" />
</ItemGroup>
</Project>