From 8daf38654dea267f74f68e85b50045ff5214ba68 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 20 Sep 2023 12:33:43 -0400 Subject: [PATCH] prevent System Update in development environment --- .../Modules/Admin/Upgrade/Index.razor | 78 +++++++++++-------- .../Modules/Admin/Upgrade/Index.resx | 5 +- Oqtane.Server/Managers/UserManager.cs | 6 +- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index 2ea14802..2c91688e 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -7,34 +7,38 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - @if (_package != null && _upgradeavailable) - { - - - - } - else - { - - } - - - -
-
- -
- +@if (_initialized) +{ + + + @if (_package != null && _upgradeavailable) + { + + + + } + else + { + + } + + + +
+
+ +
+ +
-
- - - + + + +} @code { + private bool _initialized = false; private Package _package; private bool _upgradeavailable = false; @@ -44,18 +48,26 @@ { try { - List packages = await PackageService.GetPackagesAsync("framework", "", "", ""); - if (packages != null) + if (NavigationManager.BaseUri.Contains("localhost:")) { - _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault(); - if (_package != null) + AddModuleMessage(Localizer["Localhost.Text"], MessageType.Info); + } + else + { + List packages = await PackageService.GetPackagesAsync("framework", "", "", ""); + if (packages != null) { - _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); - } - else - { - _package = new Package { Name = Constants.PackageId, Version = Constants.Version }; + _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault(); + if (_package != null) + { + _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); + } + else + { + _package = new Package { Name = Constants.PackageId, Version = Constants.Version }; + } } + _initialized = true; } } catch diff --git a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx index 5f1fa146..40d8af4c 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx @@ -144,7 +144,10 @@ Framework Is Already Up To Date - + Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade + + You Cannot Perform A System Update In A Development Environment + \ No newline at end of file diff --git a/Oqtane.Server/Managers/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs index 1a856607..49f2cf01 100644 --- a/Oqtane.Server/Managers/UserManager.cs +++ b/Oqtane.Server/Managers/UserManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Globalization; using System.IO; @@ -106,9 +107,10 @@ namespace Oqtane.Managers { if (string.IsNullOrEmpty(user.Password)) { - // create random password ie. Jan-01-2023+12:00:00! + // create random interal password based on random date and punctuation ie. Jan-23-1981+14:43:12! Random rnd = new Random(); - user.Password = DateTime.UtcNow.ToString("MMM-dd-yyyy+HH:mm:ss", CultureInfo.InvariantCulture) + (char)rnd.Next(33, 47); + var date = DateTime.UtcNow.AddDays(-rnd.Next(50 * 365)).AddHours(rnd.Next(0, 24)).AddMinutes(rnd.Next(0, 60)).AddSeconds(rnd.Next(0, 60)); + user.Password = date.ToString("MMM-dd-yyyy+HH:mm:ss", CultureInfo.InvariantCulture) + (char)rnd.Next(33, 47); } identityuser = new IdentityUser(); identityuser.UserName = user.Username;