From f798a68f2d0b6484e13e3109fef6c8315501e886 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Mon, 3 Feb 2020 14:14:37 -0800
Subject: [PATCH] Update MessagePack version (#18726)
---
eng/Versions.props | 2 +-
.../src/Protocol/MessagePackHubProtocol.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index be46e3619b2..bc9a12b3e2b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -242,7 +242,7 @@
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>
<IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion>
<IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
- <MessagePackPackageVersion>2.0.335</MessagePackPackageVersion>
+ <MessagePackPackageVersion>2.1.80</MessagePackPackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion>
<MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
diff --git a/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs b/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs
index b42dcf7cfd3..bd16161b0e6 100644
--- a/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs
+++ b/src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs
@@ -54,6 +54,7 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
{
var msgPackOptions = options.Value;
SetupResolver(msgPackOptions);
+ _msgPackSerializerOptions.WithSecurity(MessagePackSecurity.UntrustedData);
}
private void SetupResolver(MessagePackHubProtocolOptions options)
@@ -64,7 +65,6 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
{
var resolver = CompositeResolver.Create(Array.Empty<IMessagePackFormatter>(), (IReadOnlyList<IFormatterResolver>)options.FormatterResolvers);
_msgPackSerializerOptions = MessagePackSerializerOptions.Standard.WithResolver(resolver);
-
return;
}
--
GitLab