AppStd/DigitalData.StaffDBServer
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: LdapOptions erstellt anstelle statischer (fest codierter) Konfigurationswerte, LdapOptions und Abhängigkeitsinjektionen dafür hinzugefügt

Browse Source
This commit is contained in:
Developer 02
2024-08-05 14:18:20 +02:00
parent bc04c2d36d
commit d434a5964b
8 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
HRD.LDAPService/DIExtensions.cs Normal file
View File

@@ -0,0 +1,30 @@
using HRD.LDAPService.JWT;
using HRD.LDAPService.Ldap;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using System;
namespace HRD.LDAPService
{
public static class DIExtensions
{
private static IServiceCollection AddJwtManagerWithLdap(this IServiceCollection services)
{
services
.AddSingleton<LdapAuthenticationService>()
.AddSingleton<JwtManager>();
return services;
}
public static IServiceCollection AddJwtManagerWithLdap(this IServiceCollection services, Action<LdapOptions> configureOptions)
=> services
.Configure(configureOptions)
.AddJwtManagerWithLdap();
public static IServiceCollection AddJwtManagerWithLdap(this IServiceCollection services, IConfiguration configuration)
=> services
.Configure<LdapOptions>(configuration)
.AddJwtManagerWithLdap();
}
}

21
HRD.LDAPService/JWT/JwtManager.cs
View File

@@ -8,11 +8,18 @@ using System.Text;
namespace HRD.LDAPService.JWT
{
public static class JwtManager
public class JwtManager
{
private const string GlbExtendedAttributes = "ExtendedAttributes_";
private readonly LdapAuthenticationService _ldapAuthService;
public JwtManager(LdapAuthenticationService ldapAuthService)
{
_ldapAuthService = ldapAuthService;
}
public static LdapUser DecryptTokenAsLdapUser(string token)
{
if (string.IsNullOrEmpty(token)) { return default; }
@@ -67,7 +74,7 @@ namespace HRD.LDAPService.JWT
}
}
public static LdapUser RenewLdapUserWithJwtToken(string token)
public LdapUser RenewLdapUserWithJwtToken(string token)
{
LdapUser renewLdapUser = null;
try
@@ -77,7 +84,7 @@ namespace HRD.LDAPService.JWT
throw new ArgumentNullException($"Token is missing!");
}
renewLdapUser = LdapAuthenticationService.RenewIdentity(token);
renewLdapUser = _ldapAuthService.RenewIdentity(token);
if (renewLdapUser is null)
{
throw new Exception($"Can't renew from token!");
@@ -110,7 +117,7 @@ namespace HRD.LDAPService.JWT
}
}
public static LdapUser RenewLdapUserWithJwtToken(LdapUser ldapUser)
public LdapUser RenewLdapUserWithJwtToken(LdapUser ldapUser)
{
LdapUser renewLdapUser = null;
try
@@ -120,7 +127,7 @@ namespace HRD.LDAPService.JWT
throw new Exception($"Token is missing (Login:{ldapUser.LoginName})");
}
renewLdapUser = LdapAuthenticationService.RenewIdentity(ldapUser);
renewLdapUser = _ldapAuthService.RenewIdentity(ldapUser);
if (renewLdapUser is null)
{
return default;
@@ -164,11 +171,11 @@ namespace HRD.LDAPService.JWT
}
}
public static bool GenerateLdapUserWithJwtToken(LdapUser ldapUser)
public bool GenerateLdapUserWithJwtToken(LdapUser ldapUser)
{
try
{
if (!LdapAuthenticationService.CheckAndUpdateIdentityWithPassword(ldapUser))
if (!_ldapAuthService.CheckAndUpdateIdentityWithPassword(ldapUser))
{
return false;
}

21
HRD.LDAPService/Ldap/LdapAuthenticationService.cs
View File

@@ -1,15 +1,22 @@
using HRD.LDAPService.JWT;
using HRD.LDAPService.Ldap;
using Microsoft.Extensions.Options;
using System;
using System.DirectoryServices.AccountManagement;
using System.Linq;
namespace HRD.LDAPService
{
public static class LdapAuthenticationService
public class LdapAuthenticationService
{
private const string LDAP_DOMAIN = "dhr.local";
private readonly string LDAP_DOMAIN;
private static UserPrincipal GetUserPrincipal(string loginName, PrincipalContext principalContext)
public LdapAuthenticationService(IOptions<LdapOptions> options)
{
LDAP_DOMAIN = options.Value.LDAP_DOMAIN;
}
private UserPrincipal GetUserPrincipal(string loginName, PrincipalContext principalContext)
{
try
{
@@ -36,7 +43,7 @@ namespace HRD.LDAPService
/// </summary>
/// <param name="ldapUser"></param>
/// <returns></returns>
public static LdapUser RenewIdentity(string token)
public LdapUser RenewIdentity(string token)
{
if (string.IsNullOrEmpty(token)) { throw new ArgumentNullException("Token is empty!"); }
@@ -64,7 +71,7 @@ namespace HRD.LDAPService
/// </summary>
/// <param name="ldapUser"></param>
/// <returns></returns>
public static LdapUser RenewIdentity(LdapUser ldapUser)
public LdapUser RenewIdentity(LdapUser ldapUser)
{
if (ldapUser == default) { return default; }
try
@@ -127,7 +134,7 @@ namespace HRD.LDAPService
/// </summary>
/// <param name="ldapUser"></param>
/// <returns></returns>
public static bool CheckAndUpdateIdentityWithPassword(LdapUser ldapUser)
public bool CheckAndUpdateIdentityWithPassword(LdapUser ldapUser)
{
if (ldapUser == default) { return false; }
try
@@ -184,7 +191,7 @@ namespace HRD.LDAPService
}
}
private static void UpdateLdapUserFromPrincipalContext(ref LdapUser ldapUser, PrincipalContext principalContext)
private void UpdateLdapUserFromPrincipalContext(ref LdapUser ldapUser, PrincipalContext principalContext)
{
UserPrincipal userPrincipal = GetUserPrincipal(ldapUser.LoginName, principalContext);
if (userPrincipal == default)

25
HRD.LDAPService/Ldap/LdapOptions.cs Normal file
View File

@@ -0,0 +1,25 @@
namespace HRD.LDAPService.Ldap
{
public class LdapOptions
{
public bool LDAP_WebAppGroup_Is_Live { get; init; }
public string LDAP_WINDREAM { get; init; }
public string LDAP_DOMAIN { get; init; }
public string LDAP_PATH_EDM { get; init; }
public string LDAP_PATH_WEBAPPS { get; init; }
public string LDAP_EDMUser_Prefix { get; init; }
public string LDAP_EDMAdmin_Prefix { get; init; }
public string LDAP_EDM_Prefix { get; init; }
public string LDAP_WebAppp_Prefix { get; init; }
public string LDAP_Prefix_Test { get; init; }
}
}