This commit is contained in:
2026-08-21 11:17:55 +03:00
parent f14dc633ae
commit 61ec566f63
11 changed files with 403 additions and 28 deletions
+30
View File
@@ -369,17 +369,25 @@ public partial class EpConnection : NetworkConnection, IStore
var provider = _session.EncryptionProvider
?? throw new InvalidOperationException("Session encryption is active without a provider.");
var maximumRecordSize = ParsingWarehouse.Configuration.Encryption.MaximumRecordSize;
var remoteMaximumRecordSize = _session?.RemoteMaximumEncryptedRecordSize ?? 0;
if (maximumRecordSize > 0
&& (ulong)plaintext.LongLength + provider.MaximumRecordOverhead > maximumRecordSize)
throw new ParserLimitException(
$"Encrypted record would exceed the {maximumRecordSize}-byte limit.");
if (remoteMaximumRecordSize > 0
&& (ulong)plaintext.LongLength + provider.MaximumRecordOverhead > remoteMaximumRecordSize)
throw new RemoteParserLimitException(
$"Encrypted record would exceed the peer's advertised {remoteMaximumRecordSize}-byte limit.");
var protectedPayload = cipher.Encrypt(plaintext);
if (maximumRecordSize > 0 && protectedPayload.Length > maximumRecordSize)
throw new InvalidOperationException(
$"Encryption provider `{provider.DefaultName}` exceeded its declared record overhead.");
if (remoteMaximumRecordSize > 0 && protectedPayload.Length > remoteMaximumRecordSize)
throw new RemoteParserLimitException(
$"Encrypted record of {protectedPayload.Length} bytes exceeds the peer's advertised {remoteMaximumRecordSize}-byte limit.");
if (protectedPayload.Length > int.MaxValue - EncryptedRecordHeaderSize)
throw new ParserLimitException("Encrypted record exceeds the runtime allocation limit.");
@@ -454,6 +462,7 @@ public partial class EpConnection : NetworkConnection, IStore
}
}
PopulateLocalLimitHeaders();
var headers = _session.LocalHeaders.Copy();
// Anonymous sessions still exchange typed records. They therefore
@@ -491,6 +500,16 @@ public partial class EpConnection : NetworkConnection, IStore
| ((byte)_session.EncryptionMode & 0x3)), headers);
}
void PopulateLocalLimitHeaders()
{
var configuration = ParsingWarehouse.Configuration;
_session.LocalHeaders.MaximumPacketSize = configuration.Parser.MaximumPacketSize;
_session.LocalHeaders.MaximumAllocationSize = configuration.Parser.MaximumAllocationSize;
_session.LocalHeaders.MaximumCollectionItems = configuration.Parser.MaximumCollectionItems;
_session.LocalHeaders.MaximumTypeMetadataDepth = configuration.Parser.MaximumTypeMetadataDepth;
_session.LocalHeaders.MaximumEncryptedRecordSize = configuration.Encryption.MaximumRecordSize;
}
void PrepareEncryptionOffer()
{
if (_session.AuthenticationMode == AuthenticationMode.None)
@@ -1653,6 +1672,7 @@ public partial class EpConnection : NetworkConnection, IStore
? $"anonymous:{RemoteEndPoint?.Address}"
: remoteHeaders.Domain;
_session.AuthenticationMode = _authPacket.AuthMode;
PopulateLocalLimitHeaders();
var localHeaders = _session.LocalHeaders.Copy();
if (!NegotiateEncryptionAsResponder(localHeaders))
@@ -1787,6 +1807,16 @@ public partial class EpConnection : NetworkConnection, IStore
if (_session.AuthenticationMode == AuthenticationMode.None
&& _authPacket.Method == EpAuthPacketMethod.SessionEstablished)
{
var remoteHeaders = new SessionHeaders();
if (_authPacket.Tdu != null)
{
remoteHeaders = Codec.ParseIndexedType<SessionHeaders>(
_authPacket.Tdu.Value,
ParsingWarehouse);
remoteHeaders.AuthenticationData = null;
}
_session.RemoteHeaders = remoteHeaders;
_session.Authenticated = true;
_session.LocalIdentity = null;
_session.RemoteIdentity = null;
+118 -25
View File
@@ -329,7 +329,18 @@ partial class EpConnection
//callbackCounter++; // avoid thread racing
_requests.Add(c, reply);
SendRequestPacket(action, c, args);
try
{
SendRequestPacket(action, c, args);
}
catch (RemoteParserLimitException ex)
{
_requests.Take(c);
reply.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
}
return reply;
}
@@ -372,7 +383,18 @@ partial class EpConnection
() => SendRequest(EpPacketRequest.ResumeExecution, callbackId));
_requests.Add(callbackId, reply);
SendRequestPacket(action, callbackId, args);
try
{
SendRequestPacket(action, callbackId, args);
}
catch (RemoteParserLimitException ex)
{
_requests.Take(callbackId);
reply.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
}
return reply;
}
@@ -387,7 +409,18 @@ partial class EpConnection
() => SendRequest(EpPacketRequest.ResumeExecution, callbackId));
_requests.Add(callbackId, reply);
SendRequestPacket(action, callbackId, args);
try
{
SendRequestPacket(action, callbackId, args);
}
catch (RemoteParserLimitException ex)
{
_requests.Take(callbackId);
reply.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
}
return reply;
}
@@ -502,28 +535,42 @@ partial class EpConnection
if (Instance == null)
return;
if (args.Length == 0)
try
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0x80 | (byte)action))
.AddUInt32(callbackId);
Send(bl.ToArray());
if (args.Length == 0)
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0x80 | (byte)action))
.AddUInt32(callbackId);
Send(bl.ToArray());
}
else if (args.Length == 1)
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0xA0 | (byte)action))
.AddUInt32(callbackId)
.AddUInt8Array(Codec.Compose(args[0], this.Instance?.Warehouse ?? _serverWarehouse, this));
Send(bl.ToArray());
}
else
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0xA0 | (byte)action))
.AddUInt32(callbackId)
.AddUInt8Array(Codec.Compose(args, this.Instance?.Warehouse ?? _serverWarehouse, this));
Send(bl.ToArray());
}
}
if (args.Length == 1)
catch (RemoteParserLimitException ex) when (
action != EpPacketReply.PermissionError
&& action != EpPacketReply.ExecutionError
&& action != EpPacketReply.Warning)
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0xA0 | (byte)action))
.AddUInt32(callbackId)
.AddUInt8Array(Codec.Compose(args[0], this.Instance?.Warehouse ?? _serverWarehouse, this));
Send(bl.ToArray());
}
else
{
var bl = new BinaryList();
bl.AddUInt8((byte)(0xA0 | (byte)action))
.AddUInt32(callbackId)
.AddUInt8Array(Codec.Compose(args, this.Instance?.Warehouse ?? _serverWarehouse, this));
Send(bl.ToArray());
SendError(
ErrorType.Exception,
callbackId,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message);
}
}
@@ -677,7 +724,19 @@ partial class EpConnection
return;
}
var pr = Codec.Parse(tdu.Value, this, null);
object pr;
try
{
pr = Codec.Parse(tdu.Value, this, null);
}
catch (ParserLimitException ex)
{
req.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
return;
}
if (pr is AsyncReply asyncReply)
{
@@ -724,7 +783,20 @@ partial class EpConnection
return;
}
var value = Codec.Parse(tdu, this, null);
object value;
try
{
value = Codec.Parse(tdu, this, null);
}
catch (ParserLimitException ex)
{
_requests.Take(callbackId);
req.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
return;
}
if (value is AsyncReply reply)
{
@@ -819,7 +891,20 @@ partial class EpConnection
if (req == null)
return;
var value = Codec.Parse(tdu, this, null);
object value;
try
{
value = Codec.Parse(tdu, this, null);
}
catch (ParserLimitException ex)
{
_requests.Take(callbackId);
req.TriggerError(new AsyncException(
ErrorType.Management,
(ushort)ExceptionCode.ParserLimitExceeded,
ex.Message));
return;
}
if (value is AsyncReply asyncReply)
{
@@ -3993,6 +4078,14 @@ partial class EpConnection
private void Instance_PropertyModified(PropertyModificationInfo info)
{
// Attachment permission does not imply property-read permission. A
// method-only resource can be attached so its exported functions are
// callable while all of its properties remain private. Re-evaluate the
// property operation before broadcasting each modification, matching
// the permission checks already applied to event notifications.
if (!IsOperationAllowed(info.Resource, info.PropertyDef, ActionType.GetProperty))
return;
SendNotification(EpPacketNotification.PropertyModified,
info.Resource.Instance.Id,
info.Cursor.Generation.ToByteArray(),