Fix xml serializer encoding #3891

maheshnlrb · 2019-09-09T18:28:50Z

For #3870

… FixEnableUnsecuredResponse

…gElement dotnet#3859

dnfclas · 2019-09-09T18:29:05Z

All CLA requirements met.

…et#3862

[P2] Support System.ServiceModel.Channels.BinaryMessageEncodingBindin…

[P2] Support System.ServiceModel.Security.SecurityKeyEntropyMode dotnet#3862

* Tracked by work item dotnet#3865

…curityTokenParameters dotnet#3864

…tion Add S.SM.S.SecurityTokenParameters to the public contract.

StephenBonikowsky · 2019-09-11T00:40:35Z

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

@@ -83,7 +90,8 @@ protected override void AddHeadersToMessage(Message message, MessageDescription
                    MemoryStream memoryStream = new MemoryStream();
                    XmlDictionaryWriter bufferWriter = XmlDictionaryWriter.CreateTextWriter(memoryStream);
                    bufferWriter.WriteStartElement("root");
-                    serializer.Serialize(bufferWriter, headerValues, null);
+                  //  serializer.Serialize(bufferWriter, headerValues, null);


This can be removed entirely.

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

StephenBonikowsky · 2019-09-11T00:42:02Z

Just a couple initial nits, @mconnew or I will do a little deeper review in the next day or so.
Thanks for doing this @maheshnlrb !

[P2] Support System.ServiceModel.Security.Tokens.SecureConversationSe…

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

mconnew · 2019-09-11T04:03:38Z

@maheshnlrb, I've verified you have fixed all the places where code is missing.
@StephenBonikowsky, we should leave the issue open as we should have scenario tests to validate this functionality.

mconnew · 2019-09-11T04:05:47Z

@maheshnlrb, it looks like you need to rebase your branch as github has found some conflicts and can't automatically merge your fixes.

maheshnlrb · 2019-09-11T13:04:19Z

@maheshnlrb, it looks like you need to rebase your branch as github has found some conflicts and can't automatically merge your fixes.

@mconnew, I merged wcf/mater to my branch, but I am getting lot of errors while package restore. What do I need to do to fix this?
'C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Unit\UnitTests.Common.csproj : error NU1102: Unable to find package Microsoft.NET.Test.Sdk with version (>= 16.1.1) [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Unit\UnitTests.Common.csproj : error NU1102: - Found 24 version(s) in dotnet-core [ Nearest version: 15.5.0-preview-20170810-02 ] [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: Unable to find package Microsoft.NET.Test.Sdk with version (>= 16.1.1) [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: - Found 24 version(s) in dotnet-core [ Nearest version: 15.5.0-preview-20170810-02 ] [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: Unable to find package xunit.extensibility.core with version (>= 2.4.1) [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: - Found 1 version(s) in dotnet-core [ Nearest version: 2.1.0 ] [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: Unable to find package xunit.extensibility.execution with version (>= 2.4.1) [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]
C:\Test\DotNetCore\wcf\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj : error NU1102: - Found 1 version(s) in dotnet-core [ Nearest version: 2.1.0 ] [C:\Test\DotNetCore\wcf\System.ServiceModel.sln]'

mconnew · 2019-09-12T04:14:25Z

@maheshnlrb, I don't know what's going on. Did you try cleaning your workspace? Also I always rebase instead of merging as I've had better luck with that. But once you've merged, rebasing afterwards can mess things up.

…eters dotnet#3867

…et#3860

* Also had to make the class public in the implementation.

* Update dependencies from https://github.com/dotnet/arcade build 20190909.10 - Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19459.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19459.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10 - Microsoft.DotNet.SignTool - 1.0.0-beta.19459.10 * Update dependencies from https://github.com/dotnet/arcade build 20190910.3 - Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19460.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19460.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3 - Microsoft.DotNet.SignTool - 1.0.0-beta.19460.3 * Update dependencies from https://github.com/dotnet/arcade build 20190911.7 - Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19461.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19461.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7 - Microsoft.DotNet.SignTool - 1.0.0-beta.19461.7

…lrb/wcf into FixXmlSerializerEncoding # Conflicts: # src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

StephenBonikowsky · 2019-10-04T15:58:48Z

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

@@ -236,7 +243,7 @@ protected override void GetHeadersFromMessage(Message message, MessageDescriptio
                if (!bufferReader.IsEmptyElement)
                {
                    bufferReader.ReadStartElement();
-                    object[] headerValues = (object[])serializer.Deserialize(bufferReader);
+                    object[] headerValues = (object[])serializer.Deserialize(bufferReader, isEncoded ? GetEncoding(message.Version.Envelope) : null);


Same as other comment, should be _isEncoded

StephenBonikowsky · 2019-10-04T16:05:06Z

The build errors are because of the name change from isEncoded to _isEncoded

Once that is fixed we just need to clean-up the commit history mess.

@maheshnlrb

* This fix was initially produced by @maheshnlrb with PR dotnet#3891 but the commit history got sufficiently scrambled that is was easier to reproduce his changes in a clean up-to-date branch.

StephenBonikowsky · 2019-10-29T23:22:44Z

I created a new PR #4001 with a clean commit history.
Thanks @maheshnlrb for doing the work.

@maheshnlrb

* This fix was initially produced by @maheshnlrb with PR dotnet#3891 but the commit history got sufficiently scrambled that is was easier to reproduce his changes in a clean up-to-date branch.

@maheshnlrb

* This fix was initially produced by @maheshnlrb with PR dotnet#3891 but the commit history got sufficiently scrambled that is was easier to reproduce his changes in a clean up-to-date branch.

maheshnlrb and others added 6 commits June 18, 2019 12:23

Propagating EnableUnsecuredResponse while cloning

258dd36

Fixed formatting in copy constructor

a776b7b

Fixed XML Serializer to include encoding if required.

4f2447a

Merge remote-tracking branch 'origin/FixEnableUnsecuredResponse' into…

b076785

… FixEnableUnsecuredResponse

[P2] Support System.ServiceModel.Channels.BinaryMessageEncodingBindin…

a3cfd02

…gElement dotnet#3859

update per PR review feedback

bc556b9

HongGit and others added 7 commits September 9, 2019 12:12

[P2] Support System.ServiceModel.Security.SecurityKeyEntropyMode dotn…

7ba3ca5

…et#3862

Merge pull request dotnet#3886 from dotnet/hongli/3859

38131f4

[P2] Support System.ServiceModel.Channels.BinaryMessageEncodingBindin…

Merge pull request dotnet#3892 from dotnet/hongli/3862

9dc1388

[P2] Support System.ServiceModel.Security.SecurityKeyEntropyMode dotnet#3862

Add S.SM.S.SecurityTokenParameters to the public contract.

20b568a

* Tracked by work item dotnet#3865

[P2] Support System.ServiceModel.Security.Tokens.SecureConversationSe…

fc3ac18

…curityTokenParameters dotnet#3864

Merge pull request dotnet#3896 from StephenBonikowsky/stebon/wsfedera…

0056e63

…tion Add S.SM.S.SecurityTokenParameters to the public contract.

add a space within setter

cd05acd

StephenBonikowsky reviewed Sep 11, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Outdated Show resolved Hide resolved

Merge pull request dotnet#3899 from dotnet/hongli/3864

3a91b5d

[P2] Support System.ServiceModel.Security.Tokens.SecureConversationSe…

mconnew reviewed Sep 11, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Outdated Show resolved Hide resolved

mconnew reviewed Sep 11, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Outdated Show resolved Hide resolved

mconnew reviewed Sep 11, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Show resolved Hide resolved

mconnew reviewed Sep 11, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Show resolved Hide resolved

HongGit added 4 commits September 11, 2019 21:21

[P2] Support System.ServiceModel.Security.Tokens.SupportingTokenParam…

ea42f25

…eters dotnet#3867

need to use the fully qualified path - fix build issue

de8c69c

add default to the getter per PR feedback

0c5cb3f

[P2] Support System.ServiceModel.Channels.SecurityBindingElement dotn…

9a59e68

…et#3860

HongGit and others added 6 commits September 11, 2019 21:21

fixing a build error

4d7e8de

Add S.IM.T.SymmetricSecurityKey to the public contract.

3ca5caa

* Also had to make the class public in the implementation.

Fixed XML Serializer to include encoding if required.

1527f60

Formatting fixes

628ebb6

Merge branch 'FixXmlSerializerEncoding' of https://github.com/maheshn…

62d3d72

…lrb/wcf into FixXmlSerializerEncoding # Conflicts: # src/System.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs

StephenBonikowsky reviewed Oct 4, 2019

View reviewed changes

...m.Private.ServiceModel/src/System/ServiceModel/Dispatcher/XmlSerializerOperationFormatter.cs Show resolved Hide resolved

StephenBonikowsky reviewed Oct 4, 2019

View reviewed changes

StephenBonikowsky mentioned this pull request Oct 28, 2019

OperationFormatUse.Encoded not adding "encodingStyle" attribute to generated SOAP message #3870

Closed

2 tasks

StephenBonikowsky mentioned this pull request Oct 29, 2019

Add "encodingStyle" attribute to generated SOAP message. #4001

Merged

StephenBonikowsky closed this Oct 29, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix xml serializer encoding #3891

Fix xml serializer encoding #3891

maheshnlrb commented Sep 9, 2019

dnfclas commented Sep 9, 2019 •

edited

Loading

StephenBonikowsky Sep 11, 2019

StephenBonikowsky commented Sep 11, 2019

mconnew commented Sep 11, 2019

mconnew commented Sep 11, 2019

maheshnlrb commented Sep 11, 2019

mconnew commented Sep 12, 2019

StephenBonikowsky Oct 4, 2019

StephenBonikowsky commented Oct 4, 2019

StephenBonikowsky commented Oct 29, 2019

Fix xml serializer encoding #3891

Fix xml serializer encoding #3891

Conversation

maheshnlrb commented Sep 9, 2019

dnfclas commented Sep 9, 2019 • edited Loading

StephenBonikowsky Sep 11, 2019

Choose a reason for hiding this comment

StephenBonikowsky commented Sep 11, 2019

mconnew commented Sep 11, 2019

mconnew commented Sep 11, 2019

maheshnlrb commented Sep 11, 2019

mconnew commented Sep 12, 2019

StephenBonikowsky Oct 4, 2019

Choose a reason for hiding this comment

StephenBonikowsky commented Oct 4, 2019

StephenBonikowsky commented Oct 29, 2019

dnfclas commented Sep 9, 2019 •

edited

Loading