huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update MessagePack version (#18726)

This commit is contained in:
Brennan 2020-02-03 14:14:37 -08:00 committed by GitHub
parent 36267e8baf
commit f798a68f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/Versions.props
View File

@ -242,7 +242,7 @@
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion> <IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>
<IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion> <IdentityServer4StoragePackageVersion>3.0.0</IdentityServer4StoragePackageVersion>
<IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion> <IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
<MessagePackPackageVersion>2.0.335</MessagePackPackageVersion> <MessagePackPackageVersion>2.1.80</MessagePackPackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion> <MoqPackageVersion>4.10.0</MoqPackageVersion>
<MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion> <MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion> <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>

2
src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs
View File

@ -54,6 +54,7 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
{ {
var msgPackOptions = options.Value; var msgPackOptions = options.Value;
SetupResolver(msgPackOptions); SetupResolver(msgPackOptions);
_msgPackSerializerOptions.WithSecurity(MessagePackSecurity.UntrustedData);
} }
private void SetupResolver(MessagePackHubProtocolOptions options) 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); var resolver = CompositeResolver.Create(Array.Empty<IMessagePackFormatter>(), (IReadOnlyList<IFormatterResolver>)options.FormatterResolvers);
_msgPackSerializerOptions = MessagePackSerializerOptions.Standard.WithResolver(resolver); _msgPackSerializerOptions = MessagePackSerializerOptions.Standard.WithResolver(resolver);
return; return;
} }