Skip to content

Commit bd7e480

Browse files
TratcherTratcher
committed
Remove System.IdentityModel, SecurityToken. Move to SecurityKey.
1 parent 4f4e086 commit bd7e480

File tree

42 files changed

+153
-217
lines changed

Some content is hidden

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

42 files changed

+153
-217
lines changed

‎build/CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation All rights reserved.")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyVersion("4.0.0.0")]
11-
[assembly: AssemblyFileVersion("4.0.60210.0")]
12-
[assembly: AssemblyInformationalVersion("4.0.0-alpha1-60210-000")]
11+
[assembly: AssemblyFileVersion("4.0.60801.0")]
12+
[assembly: AssemblyInformationalVersion("4.0.0-alpha1-60801-000")]
1313
[assembly: AssemblyMetadata("Serviceable", "True")]

‎build/DevAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation All rights reserved.")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyVersion("0.31.0.0")]
11-
[assembly: AssemblyFileVersion("0.31.60210.0")]
12-
[assembly: AssemblyInformationalVersion("0.31.0-pre-60210-000")]
11+
[assembly: AssemblyFileVersion("0.31.60801.0")]
12+
[assembly: AssemblyInformationalVersion("0.31.0-pre-60801-000")]
1313
[assembly: AssemblyMetadata("Serviceable", "True")]

‎build/Katana.version.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<PropertyGroup>
44
<ShipVersion>4.0.0</ShipVersion>
55
<ShipStrongNameVersion>4.0.0.0</ShipStrongNameVersion>
6-
<ShipFullVersion>4.0.0-alpha1-60210-000</ShipFullVersion>
7-
<ShipFileVersion>4.0.60210.0</ShipFileVersion>
6+
<ShipFullVersion>4.0.0-alpha1-60801-000</ShipFullVersion>
7+
<ShipFileVersion>4.0.60801.0</ShipFileVersion>
88
<MajorVersion>4</MajorVersion>
99
<MinorVersion>0</MinorVersion>
1010
<PatchVersion>0</PatchVersion>
1111
<BuildQuality>alpha1</BuildQuality>
12-
<BuildDate>60210</BuildDate>
12+
<BuildDate>60801</BuildDate>
1313
<BranchSuffix></BranchSuffix>
14-
<Eula>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</Eula>
14+
<Eula>https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</Eula>
1515
<ProjectUrl>https://github.com/aspnet/AspNetKatana/</ProjectUrl>
1616
<Tags>Microsoft OWIN Katana</Tags>
1717
</PropertyGroup>

‎build/Sakefile.shade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var SHIP='${Version(4, 0, 0, "alpha1")}'
55
var DEV='${Version(0, 31, 0, "pre")}'
66
set FINAL_MILESTONE='${false}'
77
var AZUREAD_VERSION='5.2.0'
8-
var AZUREAD_SUFFIX='.406020025-pre'
8+
var AZUREAD_SUFFIX='.407281058-pre'
99
var VERSION='${SHIP.VERSION}'
1010
var FULL_VERSION='${SHIP.FULL_VERSION}'
1111
var EULA='https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm'

‎src/Microsoft.Owin.Security.ActiveDirectory/ActiveDirectoryFederationServicesBearerAuthenticationExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static IAppBuilder UseActiveDirectoryFederationServicesBearerAuthenticati
2727
throw new ArgumentNullException("options");
2828
}
2929

30-
var cachingSecurityTokenProvider = new WsFedCachingSecurityTokenProvider(options.MetadataEndpoint,
30+
var cachingSecurityTokenProvider = new WsFedCachingSecurityKeyProvider(options.MetadataEndpoint,
3131
options.BackchannelCertificateValidator, options.BackchannelTimeout, options.BackchannelHttpHandler);
3232

3333
#pragma warning disable 618

‎src/Microsoft.Owin.Security.ActiveDirectory/IssuerSigningKeys.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
5-
using System.IdentityModel.Tokens;
5+
using Microsoft.IdentityModel.Tokens;
66

77
namespace Microsoft.Owin.Security.ActiveDirectory
88
{
@@ -19,6 +19,6 @@ internal class IssuerSigningKeys
1919
/// <summary>
2020
/// Signing tokens.
2121
/// </summary>
22-
public IEnumerable<X509SecurityToken> Tokens { get; set; }
22+
public IEnumerable<SecurityKey> Keys { get; set; }
2323
}
2424
}

‎src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,27 @@
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
44+
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Microsoft.IdentityModel.Protocols, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
48+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Microsoft.IdentityModel.Protocols.WsFederation, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
52+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
56+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Microsoft.IdentityModel.Tokens.Saml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
60+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.IdentityModel.Xml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0.406020025-pre\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
64+
<HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -75,9 +75,8 @@
7575
<Reference Include="System" />
7676
<Reference Include="System.Core" />
7777
<Reference Include="Microsoft.CSharp" />
78-
<Reference Include="System.IdentityModel" />
7978
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0.406020025-pre\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
79+
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0.407281058-pre\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
8180
<Private>True</Private>
8281
</Reference>
8382
<Reference Include="System.Net.Http" />
@@ -96,7 +95,7 @@
9695
<DesignTime>True</DesignTime>
9796
<DependentUpon>Resources.resx</DependentUpon>
9897
</Compile>
99-
<Compile Include="WsFedCachingSecurityTokenProvider.cs" />
98+
<Compile Include="WsFedCachingSecurityKeyProvider.cs" />
10099
<Compile Include="IssuerSigningKeys.cs" />
101100
<Compile Include="WsFedMetadataRetriever.cs" />
102101
<Compile Include="WindowsAzureActiveDirectoryBearerAuthenticationExtensions.cs" />

‎src/Microsoft.Owin.Security.ActiveDirectory/WindowsAzureActiveDirectoryBearerAuthenticationExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static IAppBuilder UseWindowsAzureActiveDirectoryBearerAuthentication(thi
4040
options.MetadataAddress = string.Format(CultureInfo.InvariantCulture, SecurityTokenServiceAddressFormat, options.Tenant);
4141
}
4242

43-
var cachingSecurityTokenProvider = new WsFedCachingSecurityTokenProvider(options.MetadataAddress,
43+
var cachingSecurityTokenProvider = new WsFedCachingSecurityKeyProvider(options.MetadataAddress,
4444
options.BackchannelCertificateValidator, options.BackchannelTimeout, options.BackchannelHttpHandler);
4545

4646
#pragma warning disable 618

‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedCachingSecurityTokenProvider.cs‎ renamed to ‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedCachingSecurityKeyProvider.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics.CodeAnalysis;
7-
using System.IdentityModel.Tokens;
87
using System.Net.Http;
98
using System.Threading;
9+
using Microsoft.IdentityModel.Tokens;
1010
using Microsoft.Owin.Security.Jwt;
1111

1212
namespace Microsoft.Owin.Security.ActiveDirectory
@@ -15,7 +15,7 @@ namespace Microsoft.Owin.Security.ActiveDirectory
1515
/// A security token provider which retrieves the issuer and signing tokens from a WSFed metadata endpoint.
1616
/// </summary>
1717
[SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "This type is only controlled through the interface, which is not disposable.")]
18-
internal class WsFedCachingSecurityTokenProvider : IIssuerSecurityTokenProvider
18+
internal class WsFedCachingSecurityKeyProvider : IIssuerSecurityKeyProvider
1919
{
2020
private readonly TimeSpan _refreshInterval = new TimeSpan(1, 0, 0, 0);
2121

@@ -28,9 +28,9 @@ internal class WsFedCachingSecurityTokenProvider : IIssuerSecurityTokenProvider
2828

2929
private string _issuer;
3030

31-
private IEnumerable<SecurityToken> _tokens;
31+
private IEnumerable<SecurityKey> _keys;
3232

33-
public WsFedCachingSecurityTokenProvider(string metadataEndpoint, ICertificateValidator backchannelCertificateValidator,
33+
public WsFedCachingSecurityKeyProvider(string metadataEndpoint, ICertificateValidator backchannelCertificateValidator,
3434
TimeSpan backchannelTimeout, HttpMessageHandler backchannelHttpHandler)
3535
{
3636
_metadataEndpoint = metadataEndpoint;
@@ -72,12 +72,12 @@ public string Issuer
7272
/// <value>
7373
/// All known security tokens.
7474
/// </value>
75-
public IEnumerable<SecurityToken> SecurityTokens
75+
public IEnumerable<SecurityKey> SecurityKeys
7676
{
7777
get
7878
{
7979
RefreshMetadata();
80-
return _tokens;
80+
return _keys;
8181
}
8282
}
8383

@@ -110,7 +110,7 @@ private void RetrieveMetadata()
110110
IssuerSigningKeys metaData = WsFedMetadataRetriever.GetSigningKeys(_metadataEndpoint,
111111
_backchannelTimeout, _backchannelHttpHandler);
112112
_issuer = metaData.Issuer;
113-
_tokens = metaData.Tokens;
113+
_keys = metaData.Keys;
114114
}
115115
}
116116
}

‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedMetadataRetriever.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using System.Collections.ObjectModel;
6-
using System.IdentityModel.Tokens;
76
using System.IO;
87
using System.Net.Http;
98
using System.Xml;
@@ -32,22 +31,14 @@ public static IssuerSigningKeys GetSigningKeys(string metadataEndpoint, TimeSpan
3231
{
3332
var serializer = new WsFederationMetadataSerializer();
3433
var wsFederationConfiguration = serializer.ReadMetadata(metaDataReader);
35-
var x509SecurityTokens = new Collection<X509SecurityToken>();
36-
37-
var issuerSigningKeys = new IssuerSigningKeys();
38-
issuerSigningKeys.Issuer = wsFederationConfiguration.Issuer;
34+
var keys = new Collection<SecurityKey>();
3935

4036
foreach (var key in wsFederationConfiguration.SigningKeys)
4137
{
42-
var x509SecurityKey = key as X509SecurityKey;
43-
44-
if (x509SecurityKey != null)
45-
{
46-
x509SecurityTokens.Add(new X509SecurityToken(x509SecurityKey.Certificate));
47-
}
38+
keys.Add(key);
4839
}
4940

50-
return new IssuerSigningKeys { Issuer = wsFederationConfiguration.Issuer, Tokens = x509SecurityTokens };
41+
return new IssuerSigningKeys { Issuer = wsFederationConfiguration.Issuer, Keys = keys };
5142
}
5243
}
5344
}

0 commit comments

Comments
 (0)