Skip to content

add option. Update sdk and lib #84

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

add option. Update sdk and lib #84

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
2 changes: 1 addition & 1 deletion Api.Client/Api.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion IdentityServer.LdapExtension.Unit/IdentityServer.LdapExtension.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
55 changes: 28 additions & 27 deletions IdentityServer.LdapExtension/IdentityServer.LdapExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<Authors>Nordès Ménard-Lamarre</Authors>
<Version>2.1.14</Version>
<Company>HoNoSoFt</Company>
<Description>Extension for IdentityServer 4 in order to use LDAP as a plugin. It is also extensible enough in order to use custom LDAP schema such as OpenLdap or Active Directory.</Description>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/</PackageProjectUrl>
<PackageReleaseNotes>Please visit the [GitHub repository](https://github.com/Nordes/IdentityServer4.LdapExtension/) for more details.</PackageReleaseNotes>
<PackageIconUrl>https://www.honosoft.com/img/logo.png</PackageIconUrl>
<Copyright>Nordès Ménard-Lamarre</Copyright>
<RepositoryUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/</RepositoryUrl>
<PackageTags>IdentityServer4, Ldap, OpenLdap, ActiveDirectory</PackageTags>
<IncludeSymbols>true</IncludeSymbols>
<IncludeSource>true</IncludeSource>
<NeutralLanguage />
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Authors>Nordès Ménard-Lamarre</Authors>
<Version>2.1.14</Version>
<Company>HoNoSoFt</Company>
<Description>Extension for IdentityServer 4 in order to use LDAP as a plugin. It is also extensible enough in order to use custom LDAP schema such as OpenLdap or Active Directory.</Description>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/</PackageProjectUrl>
<PackageReleaseNotes>Please visit the [GitHub repository](https://github.com/Nordes/IdentityServer4.LdapExtension/) for more details.</PackageReleaseNotes>
<PackageIconUrl>https://www.honosoft.com/img/logo.png</PackageIconUrl>
<Copyright>Nordès Ménard-Lamarre</Copyright>
<RepositoryUrl>https://github.com/Nordes/IdentityServer4.LdapExtension/</RepositoryUrl>
<PackageTags>IdentityServer4, Ldap, OpenLdap, ActiveDirectory</PackageTags>
<IncludeSymbols>true</IncludeSymbols>
<IncludeSource>true</IncludeSource>
<NeutralLanguage />
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="5.1.0" />
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="IdentityServer4" Version="4.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.96" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion IdentityServer.LdapExtension/LdapService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ public TUser FindUser(string username, string domain)
// Could become async
foreach (var matchConfig in allSearcheable)
{
using var ldapConnection = new LdapConnection { SecureSocketLayer = matchConfig.Ssl };
var options = new LdapConnectionOptions().ConfigureRemoteCertificateValidationCallback((_, _, _, _) => true);
using var ldapConnection = new LdapConnection(options) { SecureSocketLayer = matchConfig.Ssl };
ldapConnection.Connect(matchConfig.Url, matchConfig.FinalLdapConnectionPort);
ldapConnection.Bind(matchConfig.BindDn, matchConfig.BindCredentials);

Expand Down
2 changes: 1 addition & 1 deletion MvcVueClient/MvcVueClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Sample/Api/Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Sample/Client/MvcClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
</PropertyGroup>

Expand Down
58 changes: 29 additions & 29 deletions Sample/IdentityServer/QuickstartIdentityServer412.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
</PropertyGroup>

<ItemGroup>
<Content Remove="compilerconfig.json" />
</ItemGroup>

<ItemGroup>
<None Include="compilerconfig.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.5" />

<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />

<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
<!--<PackageReference Include="IdentityServer4.EntityFramework" />-->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" Version="5.0.5" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />

<PackageReference Include="IdentityServer4" Version="4.1.2" />
</ItemGroup>

<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
</PropertyGroup>
<ItemGroup>
<Content Remove="compilerconfig.json" />
</ItemGroup>
<ItemGroup>
<None Include="compilerconfig.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.5" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
<!--<PackageReference Include="IdentityServer4.EntityFramework" />-->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" Version="5.0.5" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="IdentityServer4" Version="4.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\IdentityServer.LdapExtension\IdentityServer.LdapExtension.csproj" />
</ItemGroup>
</ItemGroup>
</Project>