Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modifications to sync with M.IM.WsTrust. #4398

Closed
wants to merge 2 commits into from

Conversation

brentschmaltz
Copy link
Contributor

WSFederationHttpBinding.CreateMessgeSecurity uses Security.Message.EstablishSecurityContext to control SCT bootstrap
Remove Target and EstablishSecurityContest properties from WSTrustTokenParameters
Use DiagnosticUtility to trace exceptions
Remove M.IM.Logging direct dependency
Add comments to Federation classes
Format comments using InvariantCulture

…tablishSecurityContext to control SCT bootstrap

Remove Target and EstablishSecurityContest properties from WSTrustTokenParameters
Use DiagnosticUtility to trace exceptions
Remove M.IM.Logging direct dependency
Add comments to Federation classes
Format comments using InvariantCulture
@@ -21,13 +18,13 @@ public class WSTrustChannelSecurityTokenManager : ClientCredentialsSecurityToken
private WSTrustChannelClientCredentials _wsTrustChannelClientCredentials;

/// <summary>
///
/// Instaintiates a <see cref="WSTrustChannelSecurityTokenManager"/>.
/// </summary>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo on Instantiates

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in: 9a8f277

@@ -27,7 +24,8 @@ namespace System.ServiceModel.Federation
{

/// <summary>
/// Custom WSTrustChannelSecurityTokenProvider that returns a SAML assertion
/// <see cref="WSTrustChannelSecurityTokenProvider"/> has been designed to work with <see cref="WSFederationHttpBinding"/> to that will send a WsTrust message to obtain a token from an STS and add the token as
/// an issued token when communicating with a WCF relying party.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you merged two different phrases in your head. "to that will send" doesn't make sense.

Copy link
Contributor Author

@brentschmaltz brentschmaltz Oct 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in: 9a8f277


/// <summary>
/// Values that are used to obtain a token from an IdentityProvider
/// Instantiates aa <see cref="wsTrustTokenParameters"/> that describe the parameters for a WSTrust request.
/// </summary>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: aa

Copy link
Contributor Author

@brentschmaltz brentschmaltz Oct 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in: 9a8f277

@@ -32,7 +32,6 @@ public static void WSFederationHttpBindingTests_Succeeds()
{
// *** SETUP *** \\
issuerAddress = new EndpointAddress(new Uri(Endpoints.WSFederationAuthorityLocalSTS));
tokenTargetAddress = Endpoints.Https_SecModeTransWithMessCred_ClientCredTypeIssuedTokenSaml2;
serviceEndpointAddress = new EndpointAddress(new Uri(tokenTargetAddress));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke the test as it's used on the next line to create the serviceEndpointAddress.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in: 9a8f277

Check for WSTrustParameters as IssuedSecurityTokenParameters in ctor of WSTrustChannelSecurityTokenProvider
Use DiagnosticUtility when throwing
@mconnew
Copy link
Member

mconnew commented Oct 16, 2020

I don't know how this build on the PR machine. I cloned your repo locally and I'm getting lots of errors on the restore step.

error NU1103: Unable to find a stable package Microsoft.IdentityModel.Xml with version (>= 6.8.0) [C:\git\wcf-brent\System.ServiceModel.sln]
error NU1103:   - Found 18 version(s) in myget [ Nearest version: 6.8.1-preview-11014204844 ] [C:\git\wcf-brent\System.ServiceModel.sln]
error NU1103:   - Found 0 version(s) in dotnet-eng [C:\git\wcf-brent\System.ServiceModel.sln]error NU1103:   - Found 0 version(s) in dotnet-tools [C:\git\wcf-brent\System.ServiceModel.sln]
error NU1103: Unable to find a stable package Microsoft.IdentityModel.Tokens.Saml with version (>= 6.8.0) [C:\git\wcf-brent\System.ServiceModel.sln]
error NU1103:   - Found 18 version(s) in myget [ Nearest version: 6.8.1-preview-11014204844 ] [C:\git\wcf-brent\System.ServiceModel.sln]
error NU1103:   - Found 0 version(s) in dotnet-eng [C:\git\wcf-brent\System.ServiceModel.sln]error NU1103:   - Found 0 version(s) in dotnet-tools [C:\git\wcf-brent\System.ServiceModel.sln]

@mconnew
Copy link
Member

mconnew commented Oct 17, 2020

I found the source of the errors. Apparently our build system removes nuget.org as a package source when the tests are targeting .net5. This only affects local building as the package restore is done differently for our PR and CI system.

@mconnew
Copy link
Member

mconnew commented Oct 19, 2020

Closing in preference of #4400 which contains all these commits.

@mconnew mconnew closed this Oct 19, 2020
@brentschmaltz
Copy link
Contributor Author

@mconnew thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants