lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 08:37:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加PostgreSQL支持；

Browse Source 
修复DES加密
This commit is contained in:
yubaolee 2023-02-16 21:45:01 +08:00
parent 3890aa3fba
commit e0c8c46c9b
12 changed files with 1724 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Infrastructure/Define.cs
View File

@ -3,7 +3,7 @@
public static class Define
{
public static string USERROLE = "UserRole"; //用户角色关联KEY
public const string ROLERESOURCE= "RoleResource"; //角色资源关联KEY
public const string ROLERESOURCE = "RoleResource"; //角色资源关联KEY
public const string USERORG = "UserOrg"; //用户机构关联KEY
public const string ROLEELEMENT = "RoleElement"; //角色菜单关联KEY
public const string ROLEMODULE = "RoleModule"; //角色模块关联KEY
@ -11,6 +11,7 @@
public const string DBTYPE_SQLSERVER = "SqlServer"; //sql server
public const string DBTYPE_MYSQL = "MySql"; //mysql
public const string DBTYPE_PostgreSQL = "PostgreSQL"; //PostgreSQL
public const string DBTYPE_ORACLE = "Oracle"; //oracle

34
Infrastructure/Extensions/SecurityEncDecryptExtension.cs
View File

@ -7,14 +7,13 @@ namespace Infrastructure.Extensions
{
public static class SecurityEncDecryptExtensions
{
private static byte[] Keys = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
/// <summary>
/// DES加密字符串
/// </summary>
/// <param name="encryptString">待加密的字符串</param>
/// <param name="encryptKey">加密密钥,要求为16位</param>
/// <returns>加密成功返回加密后的字符串，失败返回源串</returns>
/// <summary>
/// DES加密字符串
/// </summary>
/// <param name="encryptString">待加密的字符串</param>
/// <param name="encryptKey">加密密钥,要求为16位</param>
/// <returns>加密成功返回加密后的字符串，失败返回源串</returns>
public static string EncryptDES(this string encryptString, string encryptKey)
{
@ -24,7 +23,7 @@ namespace Infrastructure.Extensions
byte[] rgbIV = Keys;
byte[] inputByteArray = Encoding.UTF8.GetBytes(encryptString);
using (var DCSP = Aes.Create())
using (var DCSP = DES.Create())
{
using (MemoryStream mStream = new MemoryStream())
{
@ -41,22 +40,21 @@ namespace Infrastructure.Extensions
{
throw new Exception("密码加密异常" + ex.Message);
}
}
/// <summary>
/// DES解密字符串
/// </summary>
/// <param name="decryptString">待解密的字符串</param>
/// <param name="decryptKey">解密密钥,要求为16位,和加密密钥相同</param>
/// <returns>解密成功返回解密后的字符串，失败返源串</returns>
/// <summary>
/// DES解密字符串
/// </summary>
/// <param name="decryptString">待解密的字符串</param>
/// <param name="decryptKey">解密密钥,要求为16位,和加密密钥相同</param>
/// <returns>解密成功返回解密后的字符串，失败返源串</returns>
public static string DecryptDES(this string decryptString, string decryptKey)
{
byte[] rgbKey = Encoding.UTF8.GetBytes(decryptKey.Substring(0, 16));
byte[] rgbIV = Keys;
byte[] inputByteArray = Convert.FromBase64String(decryptString.Replace('_', '+').Replace('~', '/'));
using (var DCSP = Aes.Create())
using (var DCSP = DES.Create())
{
using (MemoryStream mStream = new MemoryStream())
{
@ -69,8 +67,8 @@ namespace Infrastructure.Extensions
}
}
}
}
public static bool TryDecryptDES(this string decryptString, string decryptKey, out string result)
{
result = "";
@ -85,4 +83,4 @@ namespace Infrastructure.Extensions
}
}
}
}
}

59
OpenAuth.Mvc/Controllers/ModuleManagerController.cs
View File

@ -1,12 +1,15 @@
using Infrastructure;
using OpenAuth.App;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
using OpenAuth.App.Interface;
using OpenAuth.App.Response;
using OpenAuth.Repository.Domain;
using System.Collections.Generic;
namespace OpenAuth.Mvc.Controllers
{
@ -19,13 +22,13 @@ namespace OpenAuth.Mvc.Controllers
}
// GET: /ModuleManager/
public ActionResult Index()
{
return View();
}
public ActionResult Assign()
{
return View();
@ -41,7 +44,7 @@ namespace OpenAuth.Mvc.Controllers
var modules = _app.LoadForRole(firstId);
return JsonHelper.Instance.Serialize(modules);
}
/// <summary>
/// <summary>
/// 获取角色已经分配的字段
/// </summary>
/// <param name="roleId">角色id</param>
@ -53,19 +56,19 @@ namespace OpenAuth.Mvc.Controllers
try
{
var props = _app.LoadPropertiesForRole(roleId, moduleCode);
var data = new Response<IEnumerable<string>>
var data = new Response<IEnumerable<string>>
{
Result = props.ToList(),
};
return JsonHelper.Instance.Serialize(data);
}
catch (Exception ex)
catch(Exception ex)
{
return JsonHelper.Instance.Serialize(new Response
{
Message =ex.Message,
Code = 500,
});
{
Message = ex.Message,
Code = 500,
});
}
}
@ -86,8 +89,8 @@ namespace OpenAuth.Mvc.Controllers
public string LoadAuthorizedMenus(string modulecode)
{
var user = _authUtil.GetCurrentUser();
var module = user.Modules.First(u =>u.Code == modulecode);
if (module != null)
var module = user.Modules.First(u => u.Code == modulecode);
if(module != null)
{
return JsonHelper.Instance.Serialize(module.Elements);
@ -100,31 +103,31 @@ namespace OpenAuth.Mvc.Controllers
//添加模块
[HttpPost]
public string Add(Module model)
{
try
{
_app.Add(model);
}
catch (Exception ex)
catch(Exception ex)
{
Result.Code = 500;
Result.Message = ex.InnerException?.Message??ex.Message;
Result.Message = ex.InnerException?.Message ?? ex.Message;
}
return JsonHelper.Instance.Serialize(Result);
}
//修改模块
[HttpPost]
public string Update(Module model)
{
try
{
_app.Update(model);
}
catch (Exception ex)
catch(Exception ex)
{
Result.Code = 500;
Result.Message = ex.InnerException?.Message ?? ex.Message;
@ -139,7 +142,7 @@ namespace OpenAuth.Mvc.Controllers
{
_app.Delete(ids);
}
catch (Exception e)
catch(Exception e)
{
Result.Code = 500;
Result.Message = e.InnerException?.Message ?? e.Message;
@ -160,7 +163,7 @@ namespace OpenAuth.Mvc.Controllers
var user = _authUtil.GetCurrentUser();
var module = user.Modules.Single(u => u.Id == moduleId);
var data = new TableData
{
data = module.Elements,
@ -171,14 +174,14 @@ namespace OpenAuth.Mvc.Controllers
//添加菜单
[HttpPost]
public string AddMenu(ModuleElement model)
{
try
{
_app.AddMenu(model);
}
catch (Exception ex)
catch(Exception ex)
{
Result.Code = 500;
Result.Message = ex.InnerException?.Message ?? ex.Message;
@ -188,14 +191,14 @@ namespace OpenAuth.Mvc.Controllers
//添加菜单
[HttpPost]
public string UpdateMenu(ModuleElement model)
{
try
{
_app.UpdateMenu(model);
}
catch (Exception ex)
catch(Exception ex)
{
Result.Code = 500;
Result.Message = ex.InnerException?.Message ?? ex.Message;
@ -214,7 +217,7 @@ namespace OpenAuth.Mvc.Controllers
{
_app.DelMenu(ids);
}
catch (Exception e)
catch(Exception e)
{
Result.Code = 500;
Result.Message = e.InnerException?.Message ?? e.Message;
@ -223,6 +226,6 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(Result);
}
}
}

20
OpenAuth.Mvc/Models/OpenAuthFilter.cs
View File

@ -1,8 +1,10 @@
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using OpenAuth.App;
using OpenAuth.App.Interface;
using OpenAuth.Repository.Domain;
@ -27,12 +29,12 @@ namespace OpenAuth.Mvc.Models
//添加有允许匿名的Action，可以不用登录访问，如Login/Index
var anonymous = description.MethodInfo.GetCustomAttribute(typeof(AllowAnonymousAttribute));
if (anonymous != null)
if(anonymous != null)
{
return;
}
if (!_authUtil.CheckLogin())
if(!_authUtil.CheckLogin())
{
context.Result = new RedirectResult("/Login/Index");
return;
@ -43,7 +45,7 @@ namespace OpenAuth.Mvc.Models
//如果是ajax请求的，跳过模块授权认证
var headers = context.HttpContext.Request.Headers;
var xreq = headers.ContainsKey("x-requested-with");
if (xreq && headers["x-requested-with"] == "XMLHttpRequest")
if(xreq && headers["x-requested-with"] == "XMLHttpRequest")
{
return;
}
@ -51,22 +53,22 @@ namespace OpenAuth.Mvc.Models
var Controllername = description.ControllerName.ToLower();
var Actionname = description.ActionName.ToLower();
//控制器白名单，在该名单中的控制器，需要登录，但不需要授权
var whiteController = new[] {"usersession","home","redirects"};
if (whiteController.Contains(Controllername))
var whiteController = new[] { "usersession", "home", "redirects" };
if(whiteController.Contains(Controllername))
{
return;
}
//URL白名单
var whiteurls = new[] {"usermanager/changepassword", "usermanager/profile"};
if (whiteurls.Contains(Controllername + "/" + Actionname))
var whiteurls = new[] { "usermanager/changepassword", "usermanager/profile" };
if(whiteurls.Contains(Controllername + "/" + Actionname))
{
return;
}
var currentModule = _authUtil.GetCurrentUser().Modules.FirstOrDefault(u => u.Url.ToLower().Contains(Controllername));
//当前登录用户没有Action记录
if (currentModule == null)
if(currentModule == null)
{
context.Result = new RedirectResult("/Error/Auth");
}

2
OpenAuth.Mvc/appsettings.Production.json
View File

@ -15,7 +15,7 @@
"SSOPassport": "http://localhost:52789",
"Version": "demo",
"DbTypes": {
"OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle
"OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
},
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123", //redis配置
"HttpHost": "http://*:1802" //启动绑定地址及端口

5
OpenAuth.Mvc/appsettings.json
View File

@ -7,8 +7,9 @@
"AllowedHosts": "*",
"DataProtection": "temp-keys/",
"ConnectionStrings": {
"OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000"
"OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000"
//"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql
//"OpenAuthDBContext": "Host=localhost;Port=5432;Database=OpenAuth;Username=postgres;Password=123;" //PostgreSQL
},
"AppSetting": {
//"IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
@ -16,7 +17,7 @@
"SSOPassport": "http://localhost:52789",
"Version": "1.0", //如果为demo，则可以防止post提交
"DbTypes": {
"OpenAuthDBContext":"SqlServer" //数据库类型：SqlServer、MySql、Oracle
"OpenAuthDBContext": "SqlServer" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
},
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123", //redis配置
"HttpHost": "http://*:1802" //启动绑定地址及端口

1
OpenAuth.Repository/OpenAuth.Repository.csproj
View File

@ -16,6 +16,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="MySql.Data" Version="8.0.13" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

42
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@ -1,20 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Infrastructure;
using Infrastructure.Extensions;
using Infrastructure.Utilities;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.QueryObj;
namespace OpenAuth.Repository
{
public partial class OpenAuthDBContext : DbContext
{
@ -23,7 +25,7 @@ namespace OpenAuth.Repository
private IConfiguration _configuration;
private IOptions<AppSetting> _appConfiguration;
public OpenAuthDBContext(DbContextOptions<OpenAuthDBContext> options, ILoggerFactory loggerFactory,
public OpenAuthDBContext(DbContextOptions<OpenAuthDBContext> options, ILoggerFactory loggerFactory,
IHttpContextAccessor httpContextAccessor, IConfiguration configuration, IOptions<AppSetting> appConfiguration)
: base(options)
{
@ -47,7 +49,7 @@ namespace OpenAuth.Repository
var tenantId = _httpContextAccessor.GetTenantId();
string connect = _configuration.GetConnectionString(tenantId);
if (string.IsNullOrEmpty(connect))
if(string.IsNullOrEmpty(connect))
{
throw new Exception($"未能找到租户{tenantId}对应的连接字符串信息");
}
@ -55,20 +57,24 @@ namespace OpenAuth.Repository
//这个地方如果用IOption，在单元测试的时候会获取不到AppSetting的值😅
var dbtypes = _configuration.GetSection("AppSetting:DbTypes").GetChildren()
.ToDictionary(x => x.Key, x => x.Value);
var dbType = dbtypes[tenantId];
if (dbType == Define.DBTYPE_SQLSERVER)
{
optionsBuilder.UseSqlServer(connect);
var dbType = dbtypes[tenantId];
if(dbType == Define.DBTYPE_SQLSERVER)
{
optionsBuilder.UseSqlServer(connect);
}
else if(dbType == Define.DBTYPE_MYSQL) //mysql
{
optionsBuilder.UseMySql(connect, new MySqlServerVersion(new Version(8, 0, 11)));
}
else
{
optionsBuilder.UseOracle(connect,options =>options.UseOracleSQLCompatibility("11"));
}
{
optionsBuilder.UseMySql(connect, new MySqlServerVersion(new Version(8, 0, 11)));
}
else if(dbType == Define.DBTYPE_PostgreSQL) //PostgreSQL
{
optionsBuilder.UseNpgsql(connect);
}
else
{
optionsBuilder.UseOracle(connect, options => options.UseOracleSQLCompatibility("11"));
}
}
@ -102,9 +108,9 @@ namespace OpenAuth.Repository
public virtual DbSet<SysLog> SysLogs { get; set; }
public virtual DbSet<SysMessage> SysMessages { get; set; }
public virtual DbSet<DataPrivilegeRule> DataPrivilegeRules { get; set; }
public virtual DbSet<WmsInboundOrderDtbl> WmsInboundOrderDtbls { get; set; }
public virtual DbSet<WmsInboundOrderTbl> WmsInboundOrderTbls { get; set; }
public virtual DbSet<OpenJob> OpenJobs { get; set; }

3
OpenAuth.WebApi/Model/TagByApiExplorerSettingsOperationFilter.cs
View File

@ -19,7 +19,7 @@ namespace OpenAuth.WebApi.Model
.Cast<ApiExplorerSettingsAttribute>().FirstOrDefault();
if (apiExplorerSettings != null && !string.IsNullOrWhiteSpace(apiExplorerSettings.GroupName))
{
operation.Tags = new List<OpenApiTag> {new OpenApiTag {Name = apiExplorerSettings.GroupName}};
operation.Tags = new List<OpenApiTag> { new OpenApiTag { Name = apiExplorerSettings.GroupName } };
}
else
{
@ -27,7 +27,6 @@ namespace OpenAuth.WebApi.Model
{new OpenApiTag {Name = controllerActionDescriptor.ControllerName}};
}
}
}
}
}

2
OpenAuth.WebApi/appsettings.Production.json
View File

@ -15,7 +15,7 @@
"IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
//"IdentityServerUrl": "http://demo.openauth.net.cn:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
"DbTypes": {
"OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle
"OpenAuthDBContext":"MySql" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
},
"UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录
"RedisConf": "your_redis_server:6379,password=your_redis_password", //redis配置信息

21
OpenAuth.WebApi/appsettings.json
View File

@ -7,20 +7,23 @@
"AllowedHosts": "*",
"DataProtection": "temp-keys/",
"ConnectionStrings": {
"OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthPro;User=sa;Password=000000"
"OpenAuthDBContext": "Data Source=.;Initial Catalog=OpenAuthDB;User=sa;Password=000000"
//"OpenAuthDBContext": "server=127.0.0.1;user id=root;database=openauthdb;password=000000" //my sql
//"OpenAuthDBContext": "Host=localhost;Port=5432;Database=OpenAuth;Username=postgres;Password=123;" //PostgreSQL
//"OpenAuthDBContext2": "DATA SOURCE=192.168.0.118:1521/YUBAO;PASSWORD=000000;Validate Connection=true;PERSIST SECURITY INFO=True;USER ID=yubaolee;" //Oracle
//"OpenAuthDBContext3": "server=127.0.0.1;user id=root;database=openauthpro;password=000000" //my sql
},
"AppSetting": {
"IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
// "IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
"IdentityServerUrl": "", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
// "IdentityServerUrl": "http://localhost:12796", //IdentityServer服务器地址。如果为空，则不启用OAuth认证
"DbTypes": {
"OpenAuthDBContext":"SqlServer" //数据库类型：SqlServer、MySql、Oracle
// ,"OpenAuthDBContext2":"Oracle"
// ,"OpenAuthDBContext3":"MySql"
},
"UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录
"OpenAuthDBContext": "SqlServer" //数据库类型：SqlServer、MySql、Oracle、PostgreSQL
// "OpenAuthDBContext":"PostgreSQL"
// ,"OpenAuthDBContext2":"Oracle"
// ,"OpenAuthDBContext3":"MySql"
},
"UploadPath": "", //附件上传的路径，如果为空则保存在站点根目录
"RedisConf": "redistest.cq-p.com.cn:8001,password=share_redis@123", //redis配置
"HttpHost": "http://*:52789" //启动绑定地址及端口
"HttpHost": "http://*:52789" //启动绑定地址及端口
}
}

1621
postgresql初始化备份/db_back.sql Normal file
View File

File diff suppressed because it is too large Load Diff