cobular
/
DemoWebsocket
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified WebSocketStream.cs to connect through proxy

Browse Source
master
sta 12 years ago
parent 42bc2b52cd
commit e7c9b19bf0
3 changed files with 109 additions and 96 deletions
Show Stats Download Patch File Download Diff File

6
websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
Unescape Escape View File

@ -66,7 +66,7 @@ namespace WebSocketSharp.Net.WebSockets
_client = client; _client = client;
_secure = secure; _secure = secure;
_stream = WebSocketStream.CreateServerStream (client, secure, cert); _stream = WebSocketStream.CreateServerStream (client, secure, cert);
_request = _stream.ReadHttp<HttpRequest> (HttpRequest.Parse, 90000); _request = _stream.ReadHttpRequest (90000);
_uri = HttpUtility.CreateRequestUrl ( _uri = HttpUtility.CreateRequestUrl (
_request.RequestUri, _request.Headers ["Host"], _request.IsWebSocketRequest, secure); _request.RequestUri, _request.Headers ["Host"], _request.IsWebSocketRequest, secure);
@ -328,8 +328,8 @@ namespace WebSocketSharp.Net.WebSockets
{ {
var res = new HttpResponse (HttpStatusCode.Unauthorized); var res = new HttpResponse (HttpStatusCode.Unauthorized);
res.Headers ["WWW-Authenticate"] = challenge; res.Headers ["WWW-Authenticate"] = challenge;
_stream.WriteHandshake (res); _stream.WriteBytes (res.ToByteArray ());
_request = _stream.ReadHttp<HttpRequest> (HttpRequest.Parse, 15000); _request = _stream.ReadHttpRequest (15000);
} }
internal void SetUser ( internal void SetUser (

26
websocket-sharp/WebSocket.cs
Unescape Escape View File

@ -91,6 +91,8 @@ namespace WebSocketSharp
private bool _preAuth; private bool _preAuth;
private string _protocol; private string _protocol;
private string [] _protocols; private string [] _protocols;
private NetworkCredential _proxyCredentials;
private Uri _proxyUri;
private volatile WebSocketState _readyState; private volatile WebSocketState _readyState;
private AutoResetEvent _receivePong; private AutoResetEvent _receivePong;
private bool _secure; private bool _secure;
@ -776,7 +778,7 @@ namespace WebSocketSharp
private bool closeHandshake (byte [] frame, int timeout, Action release) private bool closeHandshake (byte [] frame, int timeout, Action release)
{ {
var sent = frame != null && _stream.Write (frame); var sent = frame != null && _stream.WriteBytes (frame);
var received = timeout == 0 || var received = timeout == 0 ||
(sent && _exitReceiving != null && _exitReceiving.WaitOne (timeout)); (sent && _exitReceiving != null && _exitReceiving.WaitOne (timeout));
@ -813,7 +815,7 @@ namespace WebSocketSharp
private bool concatenateFragmentsInto (Stream dest) private bool concatenateFragmentsInto (Stream dest)
{ {
while (true) { while (true) {
var frame = _stream.ReadFrame (); var frame = _stream.ReadWebSocketFrame ();
if (frame.IsFinal) { if (frame.IsFinal) {
// FINAL // FINAL
@ -1046,7 +1048,7 @@ namespace WebSocketSharp
// As client // As client
private HttpResponse receiveHandshakeResponse () private HttpResponse receiveHandshakeResponse ()
{ {
var res = _stream.ReadHandshakeResponse (); var res = _stream.ReadHttpResponse (90000);
_logger.Debug ("A response to this WebSocket connection request:\n" + res.ToString ()); _logger.Debug ("A response to this WebSocket connection request:\n" + res.ToString ());
return res; return res;
@ -1060,7 +1062,7 @@ namespace WebSocketSharp
return false; return false;
} }
return _stream.Write (frame); return _stream.WriteBytes (frame);
} }
} }
@ -1070,7 +1072,7 @@ namespace WebSocketSharp
_logger.Debug ( _logger.Debug (
String.Format ("A WebSocket connection request to {0}:\n{1}", _uri, request)); String.Format ("A WebSocket connection request to {0}:\n{1}", _uri, request));
_stream.WriteHandshake (request); _stream.WriteBytes (request.ToByteArray ());
} }
// As server // As server
@ -1079,7 +1081,7 @@ namespace WebSocketSharp
_logger.Debug ( _logger.Debug (
"A response to the WebSocket connection request:\n" + response.ToString ()); "A response to the WebSocket connection request:\n" + response.ToString ());
return _stream.WriteHandshake (response); return _stream.WriteBytes (response.ToByteArray ());
} }
private bool send (WebSocketFrame frame) private bool send (WebSocketFrame frame)
@ -1090,7 +1092,7 @@ namespace WebSocketSharp
return false; return false;
} }
return _stream.Write (frame.ToByteArray ()); return _stream.WriteBytes (frame.ToByteArray ());
} }
} }
@ -1260,12 +1262,8 @@ namespace WebSocketSharp
// As client // As client
private void setClientStream () private void setClientStream ()
{ {
var host = _uri.DnsSafeHost;
var port = _uri.Port;
_tcpClient = new TcpClient (host, port);
_stream = WebSocketStream.CreateClientStream ( _stream = WebSocketStream.CreateClientStream (
_tcpClient, _secure, host, _certValidationCallback); _uri, _proxyUri, _proxyCredentials, _secure, _certValidationCallback, out _tcpClient);
} }
private void startReceiving () private void startReceiving ()
@ -1277,7 +1275,7 @@ namespace WebSocketSharp
_receivePong = new AutoResetEvent (false); _receivePong = new AutoResetEvent (false);
Action receive = null; Action receive = null;
receive = () => _stream.ReadFrameAsync ( receive = () => _stream.ReadWebSocketFrameAsync (
frame => { frame => {
if (acceptFrame (frame) && _readyState != WebSocketState.Closed) { if (acceptFrame (frame) && _readyState != WebSocketState.Closed) {
receive (); receive ();
@ -1484,7 +1482,7 @@ namespace WebSocketSharp
cache.Add (_compression, cached); cache.Add (_compression, cached);
} }
_stream.Write (cached); _stream.WriteBytes (cached);
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());

171
websocket-sharp/WebSocketStream.cs
Unescape Escape View File

@ -42,7 +42,7 @@ namespace WebSocketSharp
{ {
#region Private Const Fields #region Private Const Fields
private const int _httpHeadersLimitLen = 8192; private const int _headersMaxLength = 8192;
#endregion #endregion
@ -65,20 +65,6 @@ namespace WebSocketSharp
#endregion #endregion
#region Public Constructors
public WebSocketStream (NetworkStream innerStream)
: this (innerStream, false)
{
}
public WebSocketStream (SslStream innerStream)
: this (innerStream, true)
{
}
#endregion
#region Public Properties #region Public Properties
public bool DataAvailable { public bool DataAvailable {
@ -99,7 +85,7 @@ namespace WebSocketSharp
#region Private Methods #region Private Methods
private static byte [] readHttpEntityBody (Stream stream, string length) private static byte[] readEntityBody (Stream stream, string length)
{ {
long len; long len;
if (!Int64.TryParse (length, out len)) if (!Int64.TryParse (length, out len))
@ -115,17 +101,17 @@ namespace WebSocketSharp
: null; : null;
} }
private static string [] readHttpHeaders (Stream stream) private static string[] readHeaders (Stream stream, int maxLength)
{ {
var buff = new List<byte> (); var buff = new List<byte> ();
var count = 0; var cnt = 0;
Action<int> add = i => { Action<int> add = i => {
buff.Add ((byte) i); buff.Add ((byte) i);
count++; cnt++;
}; };
var read = false; var read = false;
while (count < _httpHeadersLimitLen) { while (cnt < maxLength) {
if (stream.ReadByte ().EqualsWith ('\r', add) && if (stream.ReadByte ().EqualsWith ('\r', add) &&
stream.ReadByte ().EqualsWith ('\n', add) && stream.ReadByte ().EqualsWith ('\n', add) &&
stream.ReadByte ().EqualsWith ('\r', add) && stream.ReadByte ().EqualsWith ('\r', add) &&
@ -137,27 +123,23 @@ namespace WebSocketSharp
if (!read) if (!read)
throw new WebSocketException ( throw new WebSocketException (
"The header part of a HTTP data is greater than the limit length."); "The header part of a HTTP data is greater than the max length.");
var crlf = "\r\n"; var crlf = "\r\n";
return Encoding.UTF8.GetString (buff.ToArray ()) return Encoding.UTF8.GetString (buff.ToArray ())
.Replace (crlf + " ", " ") .Replace (crlf + " ", " ")
.Replace (crlf + "\t", " ") .Replace (crlf + "\t", " ")
.Split (new [] { crlf }, StringSplitOptions.RemoveEmptyEntries); .Split (new[] { crlf }, StringSplitOptions.RemoveEmptyEntries);
} }
#endregion private static T readHttp<T> (Stream stream, Func<string[], T> parser, int millisecondsTimeout)
#region Internal Methods
internal T ReadHttp<T> (Func<string [], T> parser, int millisecondsTimeout)
where T : HttpBase where T : HttpBase
{ {
var timeout = false; var timeout = false;
var timer = new Timer ( var timer = new Timer (
state => { state => {
timeout = true; timeout = true;
_innerStream.Close (); stream.Close ();
}, },
null, null,
millisecondsTimeout, millisecondsTimeout,
@ -166,10 +148,10 @@ namespace WebSocketSharp
T http = null; T http = null;
Exception exception = null; Exception exception = null;
try { try {
http = parser (readHttpHeaders (_innerStream)); http = parser (readHeaders (stream, _headersMaxLength));
var contentLen = http.Headers ["Content-Length"]; var contentLen = http.Headers["Content-Length"];
if (contentLen != null && contentLen.Length > 0) if (contentLen != null && contentLen.Length > 0)
http.EntityBodyData = readHttpEntityBody (_innerStream, contentLen); http.EntityBodyData = readEntityBody (stream, contentLen);
} }
catch (Exception ex) { catch (Exception ex) {
exception = ex; exception = ex;
@ -191,95 +173,128 @@ namespace WebSocketSharp
return http; return http;
} }
internal bool Write (byte [] data) private static HttpResponse sendHttpRequest (
Stream stream, HttpRequest request, int millisecondsTimeout)
{ {
lock (_forWrite) { var buff = request.ToByteArray ();
try { stream.Write (buff, 0, buff.Length);
_innerStream.Write (data, 0, data.Length);
return true; return readHttp<HttpResponse> (stream, HttpResponse.Parse, millisecondsTimeout);
}
catch {
return false;
}
}
} }
#endregion #endregion
#region Public Methods #region Internal Methods
public void Close () internal static WebSocketStream CreateClientStream (
Uri targetUri,
Uri proxyUri,
NetworkCredential proxyCredentials,
bool secure,
System.Net.Security.RemoteCertificateValidationCallback validationCallback,
out TcpClient tcpClient)
{ {
_innerStream.Close (); 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 = sendHttpRequest (netStream, req, 90000);
if (res.IsProxyAuthenticationRequired) {
var authChal = res.ProxyAuthenticationChallenge;
if (authChal != null && proxyCredentials != null) {
var authRes = new AuthenticationResponse (authChal, proxyCredentials, 0);
req.Headers["Proxy-Authorization"] = authRes.ToString ();
res = sendHttpRequest (netStream, req, 15000);
} }
public static WebSocketStream CreateClientStream ( if (res.IsProxyAuthenticationRequired)
TcpClient client, throw new WebSocketException ("Proxy authentication is required.");
bool secure, }
string host,
System.Net.Security.RemoteCertificateValidationCallback validationCallback) var code = res.StatusCode;
{ if (code.Length != 3 || code[0] != '2')
var netStream = client.GetStream (); throw new WebSocketException (
if (secure) { String.Format (
if (validationCallback == null) "The proxy has failed a connection to the requested host and port. ({0})", code));
validationCallback = (sender, certificate, chain, sslPolicyErrors) => true; }
var sslStream = new SslStream (netStream, false, validationCallback); if (secure) {
sslStream.AuthenticateAsClient (host); var sslStream = new SslStream (
netStream,
false,
validationCallback ?? ((sender, certificate, chain, sslPolicyErrors) => true));
return new WebSocketStream (sslStream); sslStream.AuthenticateAsClient (targetUri.DnsSafeHost);
return new WebSocketStream (sslStream, secure);
} }
return new WebSocketStream (netStream); return new WebSocketStream (netStream, secure);
} }
public static WebSocketStream CreateServerStream ( internal static WebSocketStream CreateServerStream (
TcpClient client, bool secure, X509Certificate cert) TcpClient tcpClient, bool secure, X509Certificate certificate)
{ {
var netStream = client.GetStream (); var netStream = tcpClient.GetStream ();
if (secure) { if (secure) {
var sslStream = new SslStream (netStream, false); var sslStream = new SslStream (netStream, false);
sslStream.AuthenticateAsServer (cert); sslStream.AuthenticateAsServer (certificate);
return new WebSocketStream (sslStream); return new WebSocketStream (sslStream, secure);
} }
return new WebSocketStream (netStream); return new WebSocketStream (netStream, secure);
} }
public void Dispose () internal HttpRequest ReadHttpRequest (int millisecondsTimeout)
{ {
_innerStream.Dispose (); return readHttp<HttpRequest> (_innerStream, HttpRequest.Parse, millisecondsTimeout);
} }
public WebSocketFrame ReadFrame () internal HttpResponse ReadHttpResponse (int millisecondsTimeout)
{ {
return WebSocketFrame.Parse (_innerStream, true); return readHttp<HttpResponse> (_innerStream, HttpResponse.Parse, millisecondsTimeout);
} }
public void ReadFrameAsync (Action<WebSocketFrame> completed, Action<Exception> error) internal WebSocketFrame ReadWebSocketFrame ()
{ {
WebSocketFrame.ParseAsync (_innerStream, true, completed, error); return WebSocketFrame.Parse (_innerStream, true);
} }
public HttpRequest ReadHandshakeRequest () internal void ReadWebSocketFrameAsync (
Action<WebSocketFrame> completed, Action<Exception> error)
{ {
return ReadHttp<HttpRequest> (HttpRequest.Parse, 90000); WebSocketFrame.ParseAsync (_innerStream, true, completed, error);
} }
public HttpResponse ReadHandshakeResponse () internal bool WriteBytes (byte[] data)
{ {
return ReadHttp<HttpResponse> (HttpResponse.Parse, 90000); lock (_forWrite) {
try {
_innerStream.Write (data, 0, data.Length);
return true;
}
catch {
return false;
}
}
} }
public bool WriteFrame (WebSocketFrame frame) #endregion
#region Public Methods
public void Close ()
{ {
return Write (frame.ToByteArray ()); _innerStream.Close ();
} }
public bool WriteHandshake (HttpBase handshake) public void Dispose ()
{ {
return Write (handshake.ToByteArray ()); _innerStream.Dispose ();
} }
#endregion #endregion

Write Preview
Loading…
Cancel
Save