diff --git a/HHWMS.Web/Controllers/HomeController.cs b/HHWMS.Web/Controllers/HomeController.cs index 430e469..7b6f262 100644 --- a/HHWMS.Web/Controllers/HomeController.cs +++ b/HHWMS.Web/Controllers/HomeController.cs @@ -3,11 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; +using System.Threading.Tasks; using System.Web; +using HHWMS.Web.Support; +using HHWMS.Web.ViewModels.HomeVMs; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; @@ -153,6 +157,18 @@ namespace HHWMS.Web.Controllers return JsonMore("No Data"); } + [Public] + public IActionResult CheckLogin() + { + return Ok(); + } + + [Public] + public IActionResult BeforeLogin(LoginVM vm) + { + return JsonMore(UserSessionManager.AllSignined().ToList()); + } + //[AllowAnonymous] //public github GetGithubInfo() //{ diff --git a/HHWMS.Web/Controllers/LoginController.cs b/HHWMS.Web/Controllers/LoginController.cs index 9f45cef..54cca77 100644 --- a/HHWMS.Web/Controllers/LoginController.cs +++ b/HHWMS.Web/Controllers/LoginController.cs @@ -14,6 +14,11 @@ using WalkingTec.Mvvm.Mvc.Admin.ViewModels.FrameworkUserVms; using HHWMS.Web.ViewModels.HomeVMs; using System.Collections.Generic; using System.Linq; +using System.Text; +using HHWMS.Web.Support; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Caching.Distributed; +using WalkingTec.Mvvm.Core.Support.Quartz; namespace HHWMS.Web.Controllers { @@ -33,7 +38,7 @@ namespace HHWMS.Web.Controllers } return View(vm); } - + [Public] [HttpPost] public async Task Login(LoginVM vm) @@ -47,7 +52,9 @@ namespace HHWMS.Web.Controllers return View(vm); } }*/ + var user = Wtm.DoLogin(vm.ITCode, vm.Password, vm.Tenant); + if (user == null) { vm.MSD.AddModelError("", Localizer["Sys.LoginFailed"]); @@ -55,6 +62,13 @@ namespace HHWMS.Web.Controllers } else { + var bb = UserSessionManager.IsUserSignined(user.Name); + if (bb) + { + // 踢人下线 + await KickUser(user.Name); + } + //其他属性可以通过user.Attributes["aaa"] = "bbb"方式赋值 Wtm.LoginUserInfo = user; string url = string.Empty; @@ -77,7 +91,9 @@ namespace HHWMS.Web.Controllers }; } var principal = user.CreatePrincipal(); + await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, principal, properties); + UserSessionManager.AddUserSession(user.Name,principal.Claims.First(c => c.Type == "SessionId").Value); return Redirect(HttpUtility.UrlDecode(url)); } } @@ -120,6 +136,7 @@ namespace HHWMS.Web.Controllers [ActionDescription("Logout")] public async Task Logout() { + UserSessionManager.RemoveUserSession(Wtm.LoginUserInfo.Name); HttpContext.Session.Clear(); await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); if (ConfigInfo.HasMainHost == false || Wtm.LoginUserInfo?.CurrentTenant != null) @@ -132,7 +149,15 @@ namespace HHWMS.Web.Controllers HttpContext.Response.Redirect(ConfigInfo.MainHost); } } - + + [AllRights] + public async Task KickUser(string ITcode) + { + UserSessionManager.KickUser(ITcode); + await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); + return Ok(); + } + [AllRights] [ActionDescription("ChangePassword")] public ActionResult ChangePassword() diff --git a/HHWMS.Web/Program.cs b/HHWMS.Web/Program.cs index b763197..1f62ec5 100644 --- a/HHWMS.Web/Program.cs +++ b/HHWMS.Web/Program.cs @@ -76,6 +76,7 @@ app.UseSession(); app.UseWtmSwagger(false); app.UseSwaggerExt(); app.UseWtm(); +app.UseMiddleware(); app.AddQuartzJobs(); app.UseEndpoints(endpoints => { diff --git a/HHWMS.Web/Support/SessionValidationMiddleware.cs b/HHWMS.Web/Support/SessionValidationMiddleware.cs new file mode 100644 index 0000000..794bb6e --- /dev/null +++ b/HHWMS.Web/Support/SessionValidationMiddleware.cs @@ -0,0 +1,38 @@ +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Http; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Support.Quartz; + +namespace HHWMS.Web.Support; + +public class SessionValidationMiddleware +{ + private readonly RequestDelegate _next; + + public SessionValidationMiddleware(RequestDelegate next) + { + _next = next; + } + + public async Task InvokeAsync(HttpContext context) + { + if (context.User.Identity.IsAuthenticated) + { + var userId = context.User.Identity.Name; + var sessionId = context.User.Claims.FirstOrDefault(c => c.Type == "SessionId")?.Value; + + if (!UserSessionManager.IsUserSessionValid(userId, sessionId)) + { + // UserSessionManager.RemoveUserSession(userId); + await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); + context.Response.Redirect(new Configs().CookieOptions.LogoutPath); + return; + } + } + + await _next(context); + } +} \ No newline at end of file diff --git a/HHWMS.Web/Support/UserSessionManger.cs b/HHWMS.Web/Support/UserSessionManger.cs new file mode 100644 index 0000000..3c16139 --- /dev/null +++ b/HHWMS.Web/Support/UserSessionManger.cs @@ -0,0 +1,42 @@ +using System.Linq; +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Support; + +using System.Collections.Concurrent; + +public class UserSessionManager +{ + private static ConcurrentDictionary userSessions = new ConcurrentDictionary(); + + public static void AddUserSession(string userId, string sessionId) + { + userSessions[userId.ToLower()] = sessionId; + } + + public static void RemoveUserSession(string userId) + { + userSessions.TryRemove(userId, out _); + } + + public static bool IsUserSessionValid(string userId, string sessionId) + { + return userSessions.TryGetValue(userId.ToLower(), out var storedSessionId) && storedSessionId == sessionId; + } + + public static bool IsUserSignined(string userId) + { + return userSessions.ContainsKey(userId); + } + + public static void KickUser(string userId) + { + userSessions.TryRemove(userId, out _); + } + + public static ConcurrentDictionary AllSignined() + { + return userSessions; + } +} \ No newline at end of file diff --git a/HHWMS.Web/Views/Home/Index.cshtml b/HHWMS.Web/Views/Home/Index.cshtml index b1d2e1d..03041ee 100644 --- a/HHWMS.Web/Views/Home/Index.cshtml +++ b/HHWMS.Web/Views/Home/Index.cshtml @@ -1 +1,28 @@ + diff --git a/HHWMS.Web/Views/Login/Login.cshtml b/HHWMS.Web/Views/Login/Login.cshtml index cab682e..d2ac63d 100644 --- a/HHWMS.Web/Views/Login/Login.cshtml +++ b/HHWMS.Web/Views/Login/Login.cshtml @@ -36,7 +36,7 @@ + diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index c58d986..9c5095c 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -41,9 +41,9 @@ //} ], "CookiePre": "HHWMS", //cookie前缀 - "IsQuickDebug": true, //是否启用debug模式 + "IsQuickDebug": false, //是否启用debug模式 "EnableTenant": false, //是否启动多租户 - "SyncDb": true, //是否自动同步数据库 + "SyncDb": false, //是否自动同步数据库 "EncryptKey": "", //加密密钥 "PageMode": "Tab", //页面显示模式,Single或者Tab "TabMode": "Simple", //Tab页显示方式,Default或者Simple diff --git a/src/WalkingTec.Mvvm.Core/Extensions/LoginUserInfoExtension.cs b/src/WalkingTec.Mvvm.Core/Extensions/LoginUserInfoExtension.cs index 5b90d9f..272dd03 100644 --- a/src/WalkingTec.Mvvm.Core/Extensions/LoginUserInfoExtension.cs +++ b/src/WalkingTec.Mvvm.Core/Extensions/LoginUserInfoExtension.cs @@ -15,7 +15,11 @@ namespace WalkingTec.Mvvm.Core.Extensions public static ClaimsPrincipal CreatePrincipal(this LoginUserInfo self) { if (string.IsNullOrEmpty(self.ITCode)) throw new ArgumentException("Id is mandatory", nameof(self.ITCode)); - var claims = new List { new Claim(AuthConstants.JwtClaimTypes.Subject, self.ITCode) }; + var claims = new List + { + new Claim(AuthConstants.JwtClaimTypes.Subject, self.ITCode) , + new Claim("SessionId", Guid.NewGuid().ToString()) + }; if (!string.IsNullOrEmpty(self.Name)) { diff --git a/version.props b/version.props index 8b097df..a044000 100644 --- a/version.props +++ b/version.props @@ -1,6 +1,6 @@ - 6.3.7 + 6.4.0