Skip to content

Bugfix. Validate signed response from IdP with Idp public key #27

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix. Validate signed response from IdP with Idp public key #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Source/Saml2.Authentication.Core/Providers/ConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace Saml2.Authentication.Core.Providers
using System.Collections.Generic;
using System.Security.Cryptography;

namespace Saml2.Authentication.Core.Providers
{
using System;
using System.IO;
Expand Down Expand Up @@ -56,6 +59,16 @@ public X509Certificate2 ServiceProviderSigningCertificate()
return certificate;
}

public List<AsymmetricAlgorithm> GetTrustedKeys()
{
var trustedKeys = _configuration.IdentityProviderConfiguration
.Select(idp => LoadCertificate(idp.Certificate))
.Select(c => c.PublicKey.Key)
.ToList();
trustedKeys.Add(ServiceProviderSigningCertificate().PublicKey.Key);
return trustedKeys;
}

private X509Certificate2 LoadCertificate(Certificate certificateDetails) =>
certificateDetails.Thumbprint.IsNotNullOrEmpty()
? FindCertificate(
Expand Down
7 changes: 6 additions & 1 deletion Source/Saml2.Authentication.Core/Providers/IConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
namespace Saml2.Authentication.Core.Providers
using System.Collections.Generic;
using System.Security.Cryptography;

namespace Saml2.Authentication.Core.Providers
{
using System.Security.Cryptography.X509Certificates;
using Configuration;
Expand All @@ -12,5 +15,7 @@ public interface IConfigurationProvider
X509Certificate2 GetIdentityProviderSigningCertificate(string providerName);

X509Certificate2 ServiceProviderSigningCertificate();

List<AsymmetricAlgorithm> GetTrustedKeys();
}
}
6 changes: 3 additions & 3 deletions Source/Saml2.Authentication.Core/Validation/SamlValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ public Saml2Assertion GetValidatedAssertion(XmlElement element)
var key = signingCertificate.PublicKey.Key;
var audience = ServiceProviderConfiguration.EntityId;

var keys = new List<AsymmetricAlgorithm> { key };
var assertion = new Saml2Assertion(assertionElement, keys, AssertionProfile.Core, new List<string> { audience }, false);
var trustedKeys = _configurationProvider.GetTrustedKeys();
var assertion = new Saml2Assertion(assertionElement, trustedKeys, AssertionProfile.Core, new List<string> { audience }, false);

if (!ServiceProviderConfiguration.OmitAssertionSignatureCheck)
{
// TODO: This is checked automatically if auto-validation is on
if (!assertion.CheckSignature(keys))
if (!assertion.CheckSignature(trustedKeys))
{
throw new Saml2Exception("Invalid signature in assertion");
}
Expand Down