Skip to content

Commit b1e89ec

Browse files
yfakariyayfakariya
committed
Make polymorphic attributes support type based.
This commit add support qualifying types with polymorphic attributes (*RuntimeType and *KnownType). Also, this commit indluces: * Add type verifier for runtime type polymorphism. This is required to prevent potential malicious type injection atack in runtime type polymorphism. * Make PolymorphismSchema public API from internal API. This has been required to ensure generated code compatibility. This also allows app developers tweak polymorphism by themselfves. * Add tracing for polymorphism. This should improve debuggability. * Cosmetic changes.
1 parent 3fd20af commit b1e89ec

44 files changed

Lines changed: 17713 additions & 6673 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/MsgPack.Net35/MsgPack.Net35.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,9 @@
747747
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
748748
<Link>Serialization\PackHelpers.cs</Link>
749749
</Compile>
750+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
751+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
752+
</Compile>
750753
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
751754
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
752755
</Compile>
@@ -759,6 +762,9 @@
759762
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
760763
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
761764
</Compile>
765+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
766+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
767+
</Compile>
762768
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
763769
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
764770
</Compile>

‎src/MsgPack.Net45/MsgPack.Net45.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,9 @@
779779
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
780780
<Link>Serialization\PackHelpers.cs</Link>
781781
</Compile>
782+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
783+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
784+
</Compile>
782785
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
783786
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
784787
</Compile>
@@ -791,6 +794,9 @@
791794
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
792795
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
793796
</Compile>
797+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
798+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
799+
</Compile>
794800
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
795801
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
796802
</Compile>

‎src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@
530530
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
531531
<Link>Serialization\PackHelpers.cs</Link>
532532
</Compile>
533+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
534+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
535+
</Compile>
533536
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
534537
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
535538
</Compile>
@@ -542,6 +545,9 @@
542545
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
543546
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
544547
</Compile>
548+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
549+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
550+
</Compile>
545551
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
546552
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
547553
</Compile>

‎src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,9 @@
590590
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
591591
<Link>Serialization\PackHelpers.cs</Link>
592592
</Compile>
593+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
594+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
595+
</Compile>
593596
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
594597
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
595598
</Compile>
@@ -602,6 +605,9 @@
602605
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
603606
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
604607
</Compile>
608+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
609+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
610+
</Compile>
605611
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
606612
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
607613
</Compile>

‎src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,9 @@
497497
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
498498
<Link>Serialization\PackHelpers.cs</Link>
499499
</Compile>
500+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
501+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
502+
</Compile>
500503
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
501504
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
502505
</Compile>
@@ -509,6 +512,9 @@
509512
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
510513
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
511514
</Compile>
515+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
516+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
517+
</Compile>
512518
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
513519
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
514520
</Compile>

‎src/MsgPack.Unity/MsgPack.Unity.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
507507
<Link>Serialization\PackHelpers.cs</Link>
508508
</Compile>
509+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
510+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
511+
</Compile>
509512
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
510513
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
511514
</Compile>
@@ -518,6 +521,9 @@
518521
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
519522
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
520523
</Compile>
524+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
525+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
526+
</Compile>
521527
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
522528
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
523529
</Compile>

‎src/MsgPack.Uwp/MsgPack.Uwp.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,9 @@
602602
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
603603
<Link>Serialization\PackHelpers.cs</Link>
604604
</Compile>
605+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
606+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
607+
</Compile>
605608
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
606609
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
607610
</Compile>
@@ -614,6 +617,9 @@
614617
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
615618
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
616619
</Compile>
620+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
621+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
622+
</Compile>
617623
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
618624
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
619625
</Compile>

‎src/MsgPack.Xamarin.Android/MsgPack.Xamarin.Android.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,9 @@
524524
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
525525
<Link>Serialization\PackHelpers.cs</Link>
526526
</Compile>
527+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
528+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
529+
</Compile>
527530
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
528531
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
529532
</Compile>
@@ -536,6 +539,9 @@
536539
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
537540
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
538541
</Compile>
542+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
543+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
544+
</Compile>
539545
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
540546
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
541547
</Compile>

‎src/MsgPack.Xamarin.iOS.Unified/MsgPack.Xamarin.iOS.Unified.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,9 @@
520520
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
521521
<Link>Serialization\PackHelpers.cs</Link>
522522
</Compile>
523+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
524+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
525+
</Compile>
523526
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
524527
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
525528
</Compile>
@@ -532,6 +535,9 @@
532535
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
533536
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
534537
</Compile>
538+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
539+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
540+
</Compile>
535541
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
536542
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
537543
</Compile>

‎src/MsgPack.Xamarin.iOS/MsgPack.Xamarin.iOS.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,9 @@
520520
<Compile Include="..\MsgPack\Serialization\PackHelpers.cs">
521521
<Link>Serialization\PackHelpers.cs</Link>
522522
</Compile>
523+
<Compile Include="..\MsgPack\Serialization\PolymorphicTypeVerificationContext.cs">
524+
<Link>Serialization\PolymorphicTypeVerificationContext.cs</Link>
525+
</Compile>
523526
<Compile Include="..\MsgPack\Serialization\Polymorphic\IPolymorphicDeserializer.cs">
524527
<Link>Serialization\Polymorphic\IPolymorphicDeserializer.cs</Link>
525528
</Compile>
@@ -532,6 +535,9 @@
532535
<Compile Include="..\MsgPack\Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs">
533536
<Link>Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs</Link>
534537
</Compile>
538+
<Compile Include="..\MsgPack\Serialization\Polymorphic\RuntimeTypeVerifier.cs">
539+
<Link>Serialization\Polymorphic\RuntimeTypeVerifier.cs</Link>
540+
</Compile>
535541
<Compile Include="..\MsgPack\Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs">
536542
<Link>Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs</Link>
537543
</Compile>

0 commit comments

Comments
 (0)