Skip to content

Commit 231bc54

Browse files
SundasChoudyRskSundasChoudyRsk
authored
Merge pull request #37 from RockSolidKnowledge/feature/samlv5.0.0-preview1
Rsk.saml v5.0.0-preview1, .NET6 and Duende v6 preview4
2 parents afaac68 + 62915f4 commit 231bc54

File tree

19 files changed

+166
-220
lines changed

19 files changed

+166
-220
lines changed

‎DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

7-
<ItemGroup>
8-
<None Remove="idsrv3test.cer" />
9-
</ItemGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Duende.IdentityServer" Version="5.2.1" />
13-
<PackageReference Include="Rsk.Saml" Version="4.2.0" />
14-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="5.1.0" />
7+
<ItemGroup>
8+
<PackageReference Include="Duende.IdentityServer" Version="6.0.0-preview.4" />
9+
<PackageReference Include="Rsk.Saml" Version="5.0.0-preview1" />
10+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0-preview1" />
1511

1612
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
1713
</ItemGroup>
@@ -23,6 +19,9 @@
2319
<None Update="testclient.pfx">
2420
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2521
</None>
22+
<None Update="idsrv3test.cer">
23+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24+
</None>
2625
</ItemGroup>
2726

2827
</Project>

‎DuendeIdentityServer/DuendeDynamicProviders/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void ConfigureServices(IServiceCollection services)
3535
builder.AddSamlDynamicProvider(options =>
3636
{
3737
// unstorable/reusable data, such as license information and events. This will override the data stored
38-
options.Licensee = "";
39-
options.LicenseKey = "";
38+
options.Licensee = "your DEMO Licensee";
39+
options.LicenseKey = "your DEMO LicenseKey";
4040
})
4141

4242
// Use EntityFramework store for storing identity providers

‎DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Duende.IdentityServer" Version="5.0.0" />
9-
<PackageReference Include="Rsk.Saml" Version="4.0.0" />
10-
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="5.0.0" />
8+
<PackageReference Include="Duende.IdentityServer" Version="6.0.0-preview.4" />
9+
<PackageReference Include="Rsk.Saml" Version="5.0.0-preview1" />
10+
<PackageReference Include="Rsk.Saml.DuendeIdentityServer" Version="6.0.0-preview1" />
1111

1212
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
1313
</ItemGroup>

‎DuendeIdentityServer/DuendeIdP/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void ConfigureServices(IServiceCollection services)
5353

5454
builder.AddSamlPlugin(options =>
5555
{
56-
options.Licensee = "";
57-
options.LicenseKey = "";
56+
options.Licensee = "your DEMO Licensee";
57+
options.LicenseKey = "your DEMO LicenseKey";
5858

5959
options.WantAuthenticationRequestsSigned = false;
6060
})

‎DuendeIdentityServer/DuendeIdP/keys/is-signing-key-B10AAF48CB2F925ED8E431B8A3A1EF09.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Version":1,"Id":"B10AAF48CB2F925ED8E431B8A3A1EF09","Created":"2021-12-06T22:14:42.9754091Z","Algorithm":"RS256","IsX509Certificate":true,"Data":"CfDJ8Gb-JiW3czNGk_YLGkrTDWKMH7ufW7-5XrKDIHbL7PZd-EDF7pfKVA8Y_xYxrGEqpYnZ2skm_GjKc9MY_5nfxpZKEEiXXdVQClAtxrkfBJHrrO48_B-Cv2rtZyeJKYAEchE_DaPyepKuVSna2eoV-kQNEBZA0USrXiSVTajaQU5fJR-ec7TSSKDnkasIpVBanIZKcruZYhmHLtvCh59-EfSsdP3jWAqADwvqbcIu4-dXE_Wy-3ZwwGWPWb8FUvdkY9scMgeU6sFXeB54f1vLXf_LRUQ-4kUrRhChwTLxHRCP6VY2EqNyXlc9ebr3u0GP5Gifbu4sOu_FBueTGKDRmrzqh-pLJB3cDvKcBSm_9Wp0j9_qs9Aq8qW4c-gK8CWbmjPKxpZvTPdd3sb1EtHAmi51hf-ozA28427TKoUAwbg2XfINvbILAWEq6FHlsthV2Wl8l5snQLdlx_oqWjOmHYiV7XiNMMoSvW4Z4QlWQg58W7xv30eiOoSPND68lpn0kU10EfrPnfU_tDlMYtu1msQT34qxobHk8OZhXNRf140v-Cr89b1GtpBq-sbkU5R_q0kH0aMDsSES6XIBwT6BSkzlMM503ZyfHf822TNypgHNgPKHYPVuFzXurobg9nw-3tu_mZdiFuPr_C-4Ug_3ozi4Tsegi9lbP4WK888nq0jPyi77PFiantUNdQY606AOZe7CnJy7lswrw4aDPTIEL-LST_2pvnZrWyBoteDKJ7gxqVneb7BWWGpH6ysUVer6Iu8NTD7karvsiN14JVirPhCAqbz6ZL9qgmWF5pxicQRqANsvx152DD7mvrri-g8DbWwno4PZWooNUqNxT03F5Fb3u045ejc0BZxWJraqizg-_IDfY1DZ1wHmmXHQ7_gdJPNUW6Rs6XYd1ktZ2rqrMLjPw7JiWfrldtxxkpGnUxdnLPb5DD-zNicDqcbzsC_cs0RTwu107V6WAQZihbnJ2TstPGVb2OxyndABMHwkW-Y-mpkIJaRxo5qd-99Iz7gfi7n8Ia8xCStyo-xxuC7EOnX541JsVTl6523eQ41pHTB840IjyWEg81mLIIeLYzt2Xsqo6uzh9N-CKVPI2xFVoEPnqTcUkDQxKCINLDYYsxucK2WNDrA4Uq3BmlmBP2DfZts-51JMYHlh5b1p6SgwWkEtY0VJuMegmha6a_OthBKf5gTNJ60Dyp8yU9z09JkfiN71UeQ_280FeQ_f2N41OAyf7tUJvfBEvgR3ZmFHV3BedcKwGIZOltSx0sc7NLlgY7VXBjZ3suCvaZre5qI90klAoxXztEge9KNC4yG4qURXnhk1qmszKUAPfhI04HZsVKfGsCWm4vvH9pSrYf2pwdCx1C04mKb3OjfnYdq_clWo2pmnVJIQEpQQacu_s3zwR7ItzaFyjSbNBYFVcU5LYqxk4xwO0sBTrY5VVl4_A9tvOEhqEdSPzdwJhPWb5eByxgII1j4eaaroHoNNfc5le-4az4rfKahWtsPVNpEUpR55GS_LpsX6TYDUwM8tf70_abdWBIvPM5FYr8G8imA7821Op-i6na7jRlVt8zVeDTKuNSWg6riGoeJg8VtpkLioZ-NjGxRd_avb5yuWZImt_TjKmnv0qVDm3lGSRLZ0oUPgJptc3HSpOQ22yYYvYcJYmQPO2o6q36Rps2w78eKt9qy5iRw9DpztiezyREcx_Zczsr5LYpyzMNb0bq2NRzY67QSlenh-KbaWbX1sHEHj_X0safM6Bq5nW_8Eo9wg1Ln7sBCmylFkaQSDwSXedDJw1SunO-w1y_9Eik0AhgHY7tmXVMe1hFLVfURJ18Oios8wYJXYfXXsJRHUt4kB04pv9Rb-NifGzp-mt2pZt5fP4nqWdKo9oHAQ5Ai_Xm1msEZC9NzRqpRN_9QcBuv6t3qTtcqYN_aUIxUVMt0W4AAKmRF1KxeWkZ5wvwy4AdBT_7pzGabsEjZwGSa2DQIQ40Qes54ijcTmovuw9yOSCcrnxzWO7CJVC-v6rNsUfYFmj1aVHmEiDqMVQECmze9EdigkdI2unulTbAgCS0_Aym1TEr57S-htvVLEs08Bot0Rgd0fRc2fRkLvOiCIjhvYCKd0Gw_oIkW6BATQ-B0TMnfvVkFQNcAzxOvcfj8_5QBBn61jG5npR7WG9OTch8s-j6VqTOccnzknPikR-jtFng22OtLcybNz4wBcAk_otzQhU7tS9jbURt_wLovt_h2cXatt8W3Gf1p88LUof5MRx6pIfAvqVdhv9H4hJ5W30meJbIp-Ed4CIb1Edf9xptXqtBOnAGmUAq9F8_j705j2qi2d4ObfzLbo4bPUehS3-XnCK-We6dk0FxCCSY75Q39FypHiQliASAO17bn0F0VbbiiwIrmkl2tbGQHOoDN8vswFScBfHCmpCKgRqF_Vmy9xvP_-EdrrctKoKvG7eO15SHqfMcs1dlyTwT0XIC8-_gM2VdOYYUrICzqqGhtrq-vBa4Q3KaqZ38n7caQNL0xIJCh3cqEnIsAA2QX-n-lAzZE4_45PAAsG5OustiIcvaMyhO1WK6MkmUY98L0Iuzmse6MyK1EgGPSuvGcm2sBbaFIkhbP0CiwgSac5rAKIad0kz7SP7vkSo6si8fqrQT2GSBzizQTmHhaiOnIWDbrbcI7szMq-rHIYQU4J85zy73Dgy9v88qdzruwxYv8q0YEyji8mlnbm57JSqeh0Yvu-AXe-k9zAun0Md1lwsj9dPoWkEuAoJNuEkbLouDd4xs8MSXf4gQcmgZNIw8oY-QqL81GUpCd3DyIOIyptDyNDc1orqPAUhrJH6KjUguLFfRFNe_kvhM8FyNxuKqNqKWVz2rTidOJRBmTPMyf-9LA7REYy1ovpoYCBD3cuKkOpSO6CiId5zwmJYVJ4ixeBG0QeCMq9w5Ws7Rmuz92htIBGjkiN_W3Yzb_fqgIOrzZjLUdemeLmYgccDgy6Cvwf_QxNLC0AhbEu059VqTrqh1GzHzoTWyFMdbFJIxoiF98rB6LMURsyZbFShGq-NuWz7ooe38hbghahaTCX-ZA44cGdSuNRRBBdHkOA_LXK46N_MICIpT7K8WRJJKInOHFegxhLAb_UBtLbOvp9_7gSn9pn7OqBoIpFUdWR2cteVbN8y0LTRkxjF4ViXXPoLRLf7Q-zr1Etduuz848O52KLQlhejT0eBTY_Qo3_lStkyqnFWA-LuUIz2TuHMY0BrVMy10_Z0sikaknZfBPr1UVEVGQTVtE2XmJ0UV-CMtSkMS18pwA-oaiW5qso3vEhurweGhvd1l_pnQaATOcNnb6e1wuS-K0Bd4V5O01J1BNSI6KTOu8Q5l4I3BIG56boJoYkkmqMC-oNmukEGaFIP8fferpuoLSjB8-LkN9li7K-jaL2UWRB93GzeAdLProDwjP4CXIysB5KjjW9myhqlEzWvbhJTUfp0-07C4aJ_B2TwrC9CxkBor5OxQ7-D5LNK9PCGR7oFsyC0IOY44qHk0mzE4VV-gp0zpLrHKwVeJtoqf-XXxhrwo5V3wWjjtbF2yI4cpSlAgqar7QCZnK9CxZFkyc4JwPF-XBYKD9DQ1uwJ_JvPo39Mh411lam8ofyP9BPJzfZ6M8S-A8g0Eru23L6drZF_fn0pov7gsYky0q-T_U4L4i739UonH_OumVuZbFQTyAWo9DT7ZPllyxzIj3cMpCqqMSRCudbX6PAX3PX-TNaAzYYVsOsVXToKN8b_SObR-z_FyaJAKHhIO5vg_1mYsyg0wLXm7nx4hTcymIpWSCmPG8ezDuN1-eTDWwNXSIuIyksoMfL7MvAxQM8EVwI584HVZss-K34wFu7vvdl1fGVDyy-aHkMZQNJk4krEYj7bFHeejBRITDQx57L65l8T9IADoT47vxS0afMkg3ttkJ-CCUMnQ0_nL04yHdCesGYDbu5hAOHl4qxaapEScOVbMTu5NWvRHOQpLEB0D2p8IcCNGnrJHnmD5fsZYJdbDlTvgt_e_Zhd9v187g6kWr6dCVqjutdr5aMcCPkJVaazmqYcyLNlwrvJ1wBCXyqfI8ug9ORQdu_JDdUva6rW28nGUl24doD2mXzrgFlB6b6tQI76JUmh7Z1T4jAtjp_KHeDjh5t4RFNPLtsJIDIdG73SM1fBYj17DQmTmWlY5f3bkD4WrT0LiE5rep-uBLET4fDLL9GLP7WtBOv7DCYEs1aUNbn6mfvvPFmMyhYpvTip7GM40NRD2I-uYQ8Tl9tc5Bs4gPe1SLs9lqjraE2q72loIBj5hXfA3Hvfkb28FmRpALzlWex2380y6VeQzqQGKIqTAKT6wmSAaXk3qnnjySsZpE7kyDcLNXhuX4g5YHjlo7wHokB_pxLK3boslNVryOCPQvN9hYAWnbPR-a99V844oCdHhpkha58T1I2OfEufsFxZjbh-xWAUOOCGBP27AlGMRJoWaDz2CZ48ns6V21SFmRkE29gZyDZMyG0TXUmcG8fxTGnjcVuXmfqpDEOdRBed89MZzeSJ3uBGNrQF8h9fIEKXC3PYxpLsn3yShUXeZWBqKTZVi6jov6akLEHQiVuKjAjOljcP4t7T2x6xgf6TjkQO5qfpHkYs3XdPLuP1qOBYuUWNZ_aqEVeQC5K0FwCRcNtnzce8fKKTSNS7UVTTwu4UqVjeOSN_dD37zCqQf2JxcX_DjEf7cIMJ584qkonp2Lb0CNTVBqmXMHfdGAl6REBBTeeRXeq8mwRwQjkYkSEi5Q8FzieSevbYoNCNvYZIaaDsocHX7Nk7Pg_PIRTfboIzFn-2CC1TZwGXs3T7sHaBielAO6pPYrBGJp9avSsKVnAh2Xqu08T2cIBYPcM3gu13KJSdqWoFg","DataProtected":true}

‎IdentityServer4/idp/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public void ConfigureServices(IServiceCollection services)
3030
// Configure SAML Identity Provider and authorized Service Providers
3131
builder.AddSamlPlugin(options =>
3232
{
33-
options.Licensee = "";
34-
options.LicenseKey = "";
33+
options.Licensee = "your DEMO Licensee";
34+
options.LicenseKey = "your DEMO LicenseKey";
3535

3636
options.WantAuthenticationRequestsSigned = false;
3737
})

‎IdentityServer4/idp/idp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityServer4" Version="4.1.1" />
9-
<PackageReference Include="Rsk.Saml" Version="4.0.0" />
10-
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="4.1.0" />
8+
<PackageReference Include="IdentityServer4" Version="4.1.2" />
9+
<PackageReference Include="Rsk.Saml" Version="5.0.0-preview1" />
10+
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0-preview1" />
1111

1212
<PackageReference Include="Serilog" Version="2.9.0" />
1313
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />

‎IdentityServer4/idpWithEf/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public void ConfigureServices(IServiceCollection services)
4141
// Configure SAML Identity Provider and authorized Service Providers
4242
builder.AddSamlPlugin(options =>
4343
{
44-
options.Licensee = "";
45-
options.LicenseKey = "";
44+
options.Licensee = "your DEMO Licensee";
45+
options.LicenseKey = "your DEMO LicenseKey";
4646

4747
options.WantAuthenticationRequestsSigned = false;
4848
})

‎IdentityServer4/idpWithEf/idpWithEf.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="IdentityServer4" Version="4.1.1" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.9" />
10-
<PackageReference Include="Rsk.Saml" Version="4.0.0" />
11-
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="4.1.0" />
12-
<PackageReference Include="Rsk.Saml.IdentityServer4.EntityFramework" Version="3.1.0" />
8+
<PackageReference Include="IdentityServer4" Version="4.1.2" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.21" />
10+
<PackageReference Include="Rsk.Saml" Version="5.0.0-preview1" />
11+
<PackageReference Include="Rsk.Saml.IdentityServer4" Version="5.0.0-preview1" />
12+
<PackageReference Include="Rsk.Saml.IdentityServer4.EntityFramework" Version="4.0.0-preview1" />
1313

1414
<PackageReference Include="Serilog" Version="2.9.0" />
1515
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />

‎IdentityServer4/idpWithIdpInitiated/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public void ConfigureServices(IServiceCollection services)
3030
// Configure SAML Identity Provider and authorized Service Providers
3131
builder.AddSamlPlugin(options =>
3232
{
33-
options.Licensee = "";
34-
options.LicenseKey = "";
33+
options.Licensee = "your DEMO Licensee";
34+
options.LicenseKey = "your DEMO LicenseKey";
3535

3636
options.WantAuthenticationRequestsSigned = false;
3737
})

0 commit comments

Comments
 (0)