esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-05-06 11:32:59 +00:00
Code Issues Projects Releases Wiki Activity

SSL

Browse Source
This commit is contained in:
Ahmed Zamil 2020-05-22 14:32:28 +03:00
parent 5991cec92d
commit cca00ca97e
4 changed files with 253 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Esyur/Net/HTTP/HTTPServer.cs
View File

@ -306,9 +306,9 @@ namespace Esyur.Net.HTTP
else
ipAdd = IPAddress.Parse(IP);
// if (ssl)
// listener = new SSLSocket(new IPEndPoint(ipAdd, port), new X509Certificate2(certificate));
// else
if (SSL)
listener = new SSLSocket(new IPEndPoint(ipAdd, Port), new X509Certificate2(Certificate));
else
listener = new TCPSocket(new IPEndPoint(ipAdd, Port));
Start(listener);

4
Esyur/Net/IIP/DistributedConnectionProtocol.cs
View File

@ -1200,7 +1200,7 @@ namespace Esyur.Net.IIP
return;
}
if (rt is System.Collections.IEnumerable && !(rt is Array || rt is Structure))
if (rt is System.Collections.IEnumerable && !(rt is Array || rt is Structure || rt is string))
{
var enu = rt as System.Collections.IEnumerable;
@ -1361,7 +1361,7 @@ namespace Esyur.Net.IIP
return;
}
if (rt is System.Collections.IEnumerable && !(rt is Array))
if (rt is System.Collections.IEnumerable && !(rt is Array || rt is Structure || rt is string))
{
var enu = rt as System.Collections.IEnumerable;

330
Esyur/Net/Sockets/SSLSocket.cs
View File

@ -44,14 +44,18 @@ namespace Esyur.Net.Sockets
Socket sock;
byte[] receiveBuffer;
bool held;
//ArraySegment<byte> receiveBufferSegment;
NetworkBuffer receiveNetworkBuffer = new NetworkBuffer();
object sendLock = new object();
readonly object sendLock = new object();
Queue<byte[]> sendBufferQueue = new Queue<byte[]>();
Queue<KeyValuePair<AsyncReply<bool>, byte[]>> sendBufferQueue = new Queue<KeyValuePair<AsyncReply<bool>, byte[]>>();// Queue<byte[]>();
bool asyncSending;
bool began = false;
SocketState state = SocketState.Initial;
@ -60,79 +64,118 @@ namespace Esyur.Net.Sockets
public event ISocketCloseEvent OnClose;
public event DestroyedEvent OnDestroy;
SocketAsyncEventArgs socketArgs = new SocketAsyncEventArgs();
SslStream ssl;
X509Certificate2 cert;
bool server;
string hostname;
private void Connected(Task t)
{
if (server)
{
ssl.AuthenticateAsServerAsync(cert).ContinueWith(Authenticated);
}
else
{
ssl.AuthenticateAsClientAsync(hostname).ContinueWith(Authenticated);
}
}
public AsyncReply<bool> Connect(string hostname, ushort port)
public async AsyncReply<bool> Connect(string hostname, ushort port)
{
var rt = new AsyncReply<bool>();
state = SocketState.Connecting;
await sock.ConnectAsync(hostname, port);
if (server)
await ssl.AuthenticateAsServerAsync(cert);
else
await ssl.AuthenticateAsClientAsync(hostname);
try
{
state = SocketState.Connecting;
sock.ConnectAsync(hostname, port).ContinueWith((x) =>
{
if (x.IsFaulted)
rt.TriggerError(x.Exception);
else
rt.Trigger(true);
state = SocketState.Established;
OnConnect?.Invoke();
Connected(x);
});
if (!server)
Begin();
}
catch (Exception ex)
{
rt.TriggerError(ex);
state = SocketState.Terminated;
Close();
Global.Log(ex);
}
return rt;
return true;
}
private void DataSent(Task task)
{
try
{
//private void DataSent(Task task)
//{
// try
// {
// if (sendBufferQueue.Count > 0)
// {
// byte[] data = sendBufferQueue.Dequeue();
// lock (sendLock)
// ssl.WriteAsync(data, 0, data.Length).ContinueWith(DataSent);
// }
// else
// {
// asyncSending = false;
// }
// }
// catch (Exception ex)
// {
// if (state != SocketState.Closed && !sock.Connected)
// {
// state = SocketState.Terminated;
// Close();
// }
// asyncSending = false;
// Global.Log("SSLSocket", LogType.Error, ex.ToString());
// }
//}
private void SendCallback(IAsyncResult ar)
{
if (ar != null && ar.AsyncState != null)
((AsyncReply<bool>)ar.AsyncState).Trigger(true);
lock (sendLock)
{
if (sendBufferQueue.Count > 0)
{
byte[] data = sendBufferQueue.Dequeue();
lock (sendLock)
ssl.WriteAsync(data, 0, data.Length).ContinueWith(DataSent);
}
else
var kv = sendBufferQueue.Dequeue();
try
{
asyncSending = false;
}
ssl.BeginWrite(kv.Value, 0, kv.Value.Length, SendCallback, kv.Key);
}
catch (Exception ex)
{
asyncSending = false;
try
{
kv.Key.Trigger(false);
if (state != SocketState.Closed && !sock.Connected)
{
state = SocketState.Terminated;
Close();
}
}
catch (Exception ex2)
{
state = SocketState.Terminated;
}
Global.Log("TCPSocket", LogType.Error, ex.ToString());
}
}
else
{
asyncSending = false;
Global.Log("SSLSocket", LogType.Error, ex.ToString());
}
}
}
public IPEndPoint LocalEndPoint
{
@ -215,65 +258,137 @@ namespace Esyur.Net.Sockets
OnClose?.Invoke();
}
public void Send(byte[] message)
{
Send(message, 0, message.Length);
}
public void Send(byte[] message, int offset, int size)
{
var msg = message.Clip((uint)offset, (uint)size);
lock (sendLock)
{
if (asyncSending)
if (!sock.Connected)
return;
if (asyncSending || held)
{
sendBufferQueue.Enqueue(message.Clip((uint)offset, (uint)size));
sendBufferQueue.Enqueue(new KeyValuePair<AsyncReply<bool>, byte[]>(null, msg));// message.Clip((uint)offset, (uint)size));
}
else
{
asyncSending = true;
ssl.WriteAsync(message, offset, size).ContinueWith(DataSent);
}
}
}
void Authenticated(Task task)
{
try
{
state = SocketState.Established;
OnConnect?.Invoke();
if (!server)
Begin();
ssl.BeginWrite(msg, 0, msg.Length, SendCallback, null);
}
catch (Exception ex)
catch
{
asyncSending = false;
state = SocketState.Terminated;
Close();
Global.Log(ex);
}
}
}
}
private void DataReceived(Task<int> task)
//public void Send(byte[] message)
//{
// Send(message, 0, message.Length);
//}
//public void Send(byte[] message, int offset, int size)
//{
// lock (sendLock)
// {
// if (asyncSending)
// {
// sendBufferQueue.Enqueue(message.Clip((uint)offset, (uint)size));
// }
// else
// {
// asyncSending = true;
// ssl.WriteAsync(message, offset, size).ContinueWith(DataSent);
// }
// }
//}
//private void DataReceived(Task<int> task)
//{
// try
// {
// if (state == SocketState.Closed || state == SocketState.Terminated)
// return;
// if (task.Result <= 0)
// {
// Close();
// return;
// }
// receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)task.Result);
// OnReceive?.Invoke(receiveNetworkBuffer);
// if (state == SocketState.Established)
// ssl.ReadAsync(receiveBuffer, 0, receiveBuffer.Length).ContinueWith(DataReceived);
// }
// catch (Exception ex)
// {
// if (state != SocketState.Closed && !sock.Connected)
// {
// state = SocketState.Terminated;
// Close();
// }
// Global.Log("SSLSocket", LogType.Error, ex.ToString());
// }
//}
public bool Begin()
{
if (began)
return false;
began = true;
if (state == SocketState.Established)
{
ssl.BeginRead(receiveBuffer, 0, receiveBuffer.Length, ReceiveCallback, this);
return true;
}
else
return false;
}
private void ReceiveCallback(IAsyncResult results)
{
try
{
// SocketError err;
if (state == SocketState.Closed || state == SocketState.Terminated)
if (state != SocketState.Established)
return;
if (task.Result <= 0)
var bytesReceived = ssl.EndRead(results);
if (bytesReceived <= 0)
{
Close();
return;
}
receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)bytesReceived);
receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)task.Result);
OnReceive?.Invoke(receiveNetworkBuffer);
if (state == SocketState.Established)
ssl.ReadAsync(receiveBuffer, 0, receiveBuffer.Length).ContinueWith(DataReceived);
ssl.BeginRead(receiveBuffer, 0, receiveBuffer.Length, ReceiveCallback, this);
}
catch (Exception ex)
{
@ -287,19 +402,6 @@ namespace Esyur.Net.Sockets
}
}
public bool Begin()
{
if (state == SocketState.Established)
{
ssl.ReadAsync(receiveBuffer, 0, receiveBuffer.Length).ContinueWith(DataReceived);
return true;
}
else
return false;
}
public bool Trigger(ResourceTrigger trigger)
{
return true;
@ -313,49 +415,77 @@ namespace Esyur.Net.Sockets
public async AsyncReply<ISocket> AcceptAsync()
{
//var reply = new AsyncReply<ISocket>();
try
{
return new SSLSocket(await sock.AcceptAsync(), cert, true);
//sock.AcceptAsync().ContinueWith((x) =>
//{
// try
// {
// reply.Trigger(new SSLSocket(x.Result, cert, true));
// }
// catch
// {
// reply.Trigger(null);
// }
//}, null);
var s = await sock.AcceptAsync();
return new SSLSocket(s, cert, true);
}
catch
{
state = SocketState.Terminated;
return null;
}
//return reply;
}
public void Hold()
{
throw new NotImplementedException();
held = true;
}
public void Unhold()
{
throw new NotImplementedException();
try
{
SendCallback(null);
}
catch (Exception ex)
{
Console.WriteLine(ex);
}
finally
{
held = false;
}
}
public AsyncReply<bool> SendAsync(byte[] message, int offset, int length)
{
throw new NotImplementedException();
var msg = message.Clip((uint)offset, (uint)length);
lock (sendLock)
{
if (!sock.Connected)
return new AsyncReply<bool>(false);
var rt = new AsyncReply<bool>();
if (asyncSending || held)
{
sendBufferQueue.Enqueue(new KeyValuePair<AsyncReply<bool>, byte[]>(rt, msg));
}
else
{
asyncSending = true;
try
{
ssl.BeginWrite(msg, 0, msg.Length, SendCallback, rt);// null);
}
catch (Exception ex)
{
rt.TriggerError(ex);
asyncSending = false;
state = SocketState.Terminated;
Close();
}
}
return rt;
}
}
public ISocket Accept()
{

23
Esyur/Net/Sockets/TCPSocket.cs
View File

@ -128,22 +128,12 @@ namespace Esyur.Net.Sockets
return;
}
//if (receiveNetworkBuffer.Protected)
// Console.WriteLine();
//lock (receiveNetworkBuffer.SyncLock)
receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)task.Result);
//Console.WriteLine("TC IN: " + (uint)task.Result + " " + DC.ToHex(receiveBuffer, 0, (uint)task.Result));
OnReceive?.Invoke(receiveNetworkBuffer);
if (state == SocketState.Established)
{
sock.ReceiveAsync(receiveBufferSegment, SocketFlags.None).ContinueWith(DataReceived);
}
}
catch (Exception ex)
{
if (state != SocketState.Closed && !sock.Connected)
@ -376,9 +366,10 @@ namespace Esyur.Net.Sockets
asyncSending = true;
try
{
sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, PacketSent, null);
sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, SendCallback, null);
}
catch {
catch
{
asyncSending = false;
state = SocketState.Terminated;
Close();
@ -389,7 +380,7 @@ namespace Esyur.Net.Sockets
}
private void PacketSent(IAsyncResult ar)
private void SendCallback(IAsyncResult ar)
{
if (ar != null && ar.AsyncState != null)
((AsyncReply<bool>)ar.AsyncState).Trigger(true);
@ -402,7 +393,7 @@ namespace Esyur.Net.Sockets
try
{
sock.BeginSend(kv.Value, 0, kv.Value.Length, SocketFlags.None, PacketSent, kv.Key);
sock.BeginSend(kv.Value, 0, kv.Value.Length, SocketFlags.None, SendCallback, kv.Key);
}
catch (Exception ex)
{
@ -482,7 +473,7 @@ namespace Esyur.Net.Sockets
{
try
{
PacketSent(null);
SendCallback(null);
}
catch (Exception ex)
{
@ -515,7 +506,7 @@ namespace Esyur.Net.Sockets
asyncSending = true;
try
{
sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, PacketSent, rt);// null);
sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, SendCallback, rt);// null);
}
catch (Exception ex)
{