Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

authorization changes

Browse Source
This commit is contained in:
Shaun Walker
2020-02-17 19:48:26 -05:00
parent 2fa7f852d5
commit 066c616eca
44 changed files with 880 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
View File

@ -6,8 +6,8 @@ namespace Oqtane.Repository
public interface IModuleDefinitionRepository
{
IEnumerable<ModuleDefinition> GetModuleDefinitions(int SideId);
ModuleDefinition GetModuleDefinition(int ModuleDefinitionId, int SideId);
void UpdateModuleDefinition(ModuleDefinition ModuleDefinition);
void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId);
}
}

2
Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
View File

@ -10,5 +10,7 @@ namespace Oqtane.Repository
Module UpdateModule(Module Module);
Module GetModule(int ModuleId);
void DeleteModule(int ModuleId);
string ExportModule(int ModuleId);
bool ImportModule(int ModuleId, string Content);
}
}

64
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -23,7 +23,33 @@ namespace Oqtane.Repository
this.Permissions = Permissions;
}
private List<ModuleDefinition> LoadModuleDefinitions(int SiteId)
public IEnumerable<ModuleDefinition> GetModuleDefinitions(int SiteId)
{
return LoadModuleDefinitions(SiteId);
}
public ModuleDefinition GetModuleDefinition(int ModuleDefinitionId, int SiteId)
{
List<ModuleDefinition> moduledefinitions = LoadModuleDefinitions(SiteId);
return moduledefinitions.Find(item => item.ModuleDefinitionId == ModuleDefinitionId);
}
public void UpdateModuleDefinition(ModuleDefinition ModuleDefinition)
{
Permissions.UpdatePermissions(ModuleDefinition.SiteId, "ModuleDefinition", ModuleDefinition.ModuleDefinitionId, ModuleDefinition.Permissions);
_cache.Remove("moduledefinitions");
}
public void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId)
{
ModuleDefinition ModuleDefinition = db.ModuleDefinition.Find(ModuleDefinitionId);
Permissions.DeletePermissions(SiteId, "ModuleDefinition", ModuleDefinitionId);
db.ModuleDefinition.Remove(ModuleDefinition);
db.SaveChanges();
_cache.Remove("moduledefinitions");
}
public List<ModuleDefinition> LoadModuleDefinitions(int SiteId)
{
List<ModuleDefinition> ModuleDefinitions;
@ -35,9 +61,9 @@ namespace Oqtane.Repository
// sync module definitions with database
List<ModuleDefinition> moduledefs = db.ModuleDefinition.ToList();
List<Permission> permissions = Permissions.GetPermissions(SiteId, "ModuleDefinition").ToList();
foreach (ModuleDefinition moduledefinition in ModuleDefinitions)
{
IEnumerable<Permission> permissions = Permissions.GetPermissions(SiteId, "ModuleDefinition").ToList();
ModuleDefinition moduledef = moduledefs.Where(item => item.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).FirstOrDefault();
if (moduledef == null)
{
@ -47,6 +73,10 @@ namespace Oqtane.Repository
if (moduledefinition.Permissions != "")
{
Permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
foreach(Permission permission in Permissions.GetPermissions("ModuleDefinition", moduledef.ModuleDefinitionId))
{
permissions.Add(permission);
}
}
}
else
@ -65,6 +95,7 @@ namespace Oqtane.Repository
// any remaining module definitions are orphans
foreach (ModuleDefinition moduledefinition in moduledefs)
{
Permissions.DeletePermissions(SiteId, "ModuleDefinition", moduledefinition.ModuleDefinitionId);
db.ModuleDefinition.Remove(moduledefinition); // delete
}
@ -128,7 +159,7 @@ namespace Oqtane.Repository
ControlTypeTemplate = ModuleType + "." + Constants.ActionToken + ", " + typename[1],
ControlTypeRoutes = "",
AssemblyName = assembly.FullName.Split(",")[0],
Permissions = ""
Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"Administrators\"}]"
};
}
else
@ -150,8 +181,13 @@ namespace Oqtane.Repository
ControlTypeTemplate = ModuleType + "." + Constants.ActionToken + ", " + typename[1],
ControlTypeRoutes = "",
AssemblyName = assembly.FullName.Split(",")[0],
Permissions = ((QualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"Administrators\"}]" : "")
Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"" + Constants.AdminRole + "\"}]"
};
// make non-admin modules available by default to registered users on personalized pages
if (moduledefinition.Categories != "Admin")
{
moduledefinition.Permissions = "[{\"PermissionName\":\"Utilize\",\"Permissions\":\"" + Constants.AdminRole + ";" + Constants.RegisteredRole + "\"}]";
}
}
moduledefinitions.Add(moduledefinition);
index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == QualifiedModuleType);
@ -162,7 +198,7 @@ namespace Oqtane.Repository
string actions = (string)modulecontroltype.GetProperty("Actions").GetValue(modulecontrolobject);
if (actions != "")
{
foreach(string action in actions.Split(','))
foreach (string action in actions.Split(','))
{
moduledefinition.ControlTypeRoutes += (action + "=" + modulecontroltype.FullName + ", " + typename[1] + ";");
}
@ -183,23 +219,5 @@ namespace Oqtane.Repository
}
return Value;
}
public IEnumerable<ModuleDefinition> GetModuleDefinitions(int SiteId)
{
return LoadModuleDefinitions(SiteId);
}
public void UpdateModuleDefinition(ModuleDefinition ModuleDefinition)
{
Permissions.UpdatePermissions(ModuleDefinition.SiteId, "ModuleDefinition", ModuleDefinition.ModuleDefinitionId, ModuleDefinition.Permissions);
}
public void DeleteModuleDefinition(int ModuleDefinitionId, int SiteId)
{
ModuleDefinition ModuleDefinition = db.ModuleDefinition.Find(ModuleDefinitionId);
Permissions.DeletePermissions(SiteId, "ModuleDefinition", ModuleDefinitionId);
db.ModuleDefinition.Remove(ModuleDefinition);
db.SaveChanges();
}
}
}

113
Oqtane.Server/Repository/ModuleRepository.cs
View File

@ -2,6 +2,11 @@
using System.Collections.Generic;
using System.Linq;
using Oqtane.Models;
using System.Reflection;
using System;
using Oqtane.Modules;
using Microsoft.Extensions.DependencyInjection;
using System.Text.Json;
namespace Oqtane.Repository
{
@ -9,19 +14,23 @@ namespace Oqtane.Repository
{
private TenantDBContext db;
private readonly IPermissionRepository Permissions;
private readonly IModuleDefinitionRepository ModuleDefinitions;
private readonly IServiceProvider ServiceProvider;
public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions)
public ModuleRepository(TenantDBContext context, IPermissionRepository Permissions, IModuleDefinitionRepository ModuleDefinitions, IServiceProvider ServiceProvider)
{
db = context;
this.Permissions = Permissions;
this.ModuleDefinitions = ModuleDefinitions;
this.ServiceProvider = ServiceProvider;
}
public IEnumerable<Module> GetModules()
public IEnumerable<Models.Module> GetModules()
{
return db.Module;
}
public Module AddModule(Module Module)
public Models.Module AddModule(Models.Module Module)
{
db.Module.Add(Module);
db.SaveChanges();
@ -29,7 +38,7 @@ namespace Oqtane.Repository
return Module;
}
public Module UpdateModule(Module Module)
public Models.Module UpdateModule(Models.Module Module)
{
db.Entry(Module).State = EntityState.Modified;
db.SaveChanges();
@ -37,9 +46,9 @@ namespace Oqtane.Repository
return Module;
}
public Module GetModule(int ModuleId)
public Models.Module GetModule(int ModuleId)
{
Module module = db.Module.Find(ModuleId);
Models.Module module = db.Module.Find(ModuleId);
if (module != null)
{
List<Permission> permissions = Permissions.GetPermissions("Module", module.ModuleId).ToList();
@ -50,10 +59,100 @@ namespace Oqtane.Repository
public void DeleteModule(int ModuleId)
{
Module Module = db.Module.Find(ModuleId);
Models.Module Module = db.Module.Find(ModuleId);
Permissions.DeletePermissions(Module.SiteId, "Module", ModuleId);
db.Module.Remove(Module);
db.SaveChanges();
}
public string ExportModule(int ModuleId)
{
string content = "";
try
{
Models.Module module = GetModule(ModuleId);
if (module != null)
{
List<ModuleDefinition> moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
if (moduledefinition != null)
{
ModuleContent modulecontent = new ModuleContent();
modulecontent.ModuleDefinitionName = moduledefinition.ModuleDefinitionName;
modulecontent.Version = moduledefinition.Version;
modulecontent.Content = "";
if (moduledefinition.ServerAssemblyName != "")
{
Assembly assembly = AppDomain.CurrentDomain.GetAssemblies()
.Where(item => item.FullName.StartsWith(moduledefinition.ServerAssemblyName)).FirstOrDefault();
if (assembly != null)
{
Type moduletype = assembly.GetTypes()
.Where(item => item.Namespace != null)
.Where(item => item.Namespace.StartsWith(moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","))))
.Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault();
if (moduletype != null)
{
var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype);
modulecontent.Content = ((IPortable)moduleobject).ExportModule(module);
}
}
}
content = JsonSerializer.Serialize(modulecontent);
}
}
}
catch
{
// error occurred during export
}
return content;
}
public bool ImportModule(int ModuleId, string Content)
{
bool success = false;
try
{
Models.Module module = GetModule(ModuleId);
if (module != null)
{
List<ModuleDefinition> moduledefinitions = ModuleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == module.ModuleDefinitionName).FirstOrDefault();
if (moduledefinition != null)
{
ModuleContent modulecontent = JsonSerializer.Deserialize<ModuleContent>(Content);
if (modulecontent.ModuleDefinitionName == moduledefinition.ModuleDefinitionName)
{
if (moduledefinition.ServerAssemblyName != "")
{
Assembly assembly = AppDomain.CurrentDomain.GetAssemblies()
.Where(item => item.FullName.StartsWith(moduledefinition.ServerAssemblyName)).FirstOrDefault();
if (assembly != null)
{
Type moduletype = assembly.GetTypes()
.Where(item => item.Namespace != null)
.Where(item => item.Namespace.StartsWith(moduledefinition.ModuleDefinitionName.Substring(0, moduledefinition.ModuleDefinitionName.IndexOf(","))))
.Where(item => item.GetInterfaces().Contains(typeof(IPortable))).FirstOrDefault();
if (moduletype != null)
{
var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype);
((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
success = true;
}
}
}
}
}
}
}
catch
{
// error occurred during import
}
return success;
}
}
}