From e0c2763c9f09d40e629c53326f345dae20997613 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 28 May 2021 07:53:49 -0400 Subject: [PATCH] refactoring in preparation for release --- Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj | 2 +- .../Oqtane.Database.PostgreSQL.csproj | 2 +- .../Oqtane.Database.SqlServer.csproj | 2 +- .../Oqtane.Database.Sqlite.csproj | 2 +- Oqtane.Server/Infrastructure/InstallationManager.cs | 4 ++-- Oqtane.Server/Security/PermissionHandler.cs | 4 ---- .../Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak | Bin .../Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak | Bin .../Oqtane.Database.SqlServer.1.0.0.nupkg.bak | Bin .../Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak | Bin 10 files changed, 6 insertions(+), 10 deletions(-) rename Oqtane.Server/{ => wwwroot}/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak (100%) rename Oqtane.Server/{ => wwwroot}/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak (100%) rename Oqtane.Server/{ => wwwroot}/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak (100%) rename Oqtane.Server/{ => wwwroot}/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak (100%) diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj index 29b1c80e..218ae73e 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj @@ -27,6 +27,6 @@ - + diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj index 7b29da52..881153c5 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj @@ -29,6 +29,6 @@ - + diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj index 7db77845..2765330b 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj @@ -27,7 +27,7 @@ - + diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj index 2ecb1178..1f30300b 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj @@ -27,7 +27,7 @@ - + diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index cbc6f661..ba72d8ee 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -44,8 +44,8 @@ namespace Oqtane.Infrastructure Directory.CreateDirectory(sourceFolder); } - // support for legacy folder locations - foreach (var folder in "Modules,Themes".Split(",")) + // move packages to secure location + foreach (var folder in "Modules,Themes,Packages".Split(",")) { foreach(var file in Directory.GetFiles(Path.Combine(webRootPath, folder), "*.nupkg")) { diff --git a/Oqtane.Server/Security/PermissionHandler.cs b/Oqtane.Server/Security/PermissionHandler.cs index 4bd01a3c..e5c7e7cc 100644 --- a/Oqtane.Server/Security/PermissionHandler.cs +++ b/Oqtane.Server/Security/PermissionHandler.cs @@ -31,10 +31,6 @@ namespace Oqtane.Security { entityId = int.Parse(ctx.Request.Query["auth" + requirement.EntityName.ToLower() + "id"]); } - if (entityId == -1 && ctx.Request.Query.ContainsKey("entityid")) - { - entityId = int.Parse(ctx.Request.Query["entityid"]); - } if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName)) { context.Succeed(requirement); diff --git a/Oqtane.Server/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak similarity index 100% rename from Oqtane.Server/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak rename to Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak diff --git a/Oqtane.Server/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak similarity index 100% rename from Oqtane.Server/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak rename to Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak diff --git a/Oqtane.Server/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak similarity index 100% rename from Oqtane.Server/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak rename to Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak diff --git a/Oqtane.Server/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak similarity index 100% rename from Oqtane.Server/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak rename to Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak