From 88477dffdd0811a5613dba0aa1db4818bf4fd058 Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 19 Dec 2022 12:24:54 +0800 Subject: Develop secret api. v43 --- .../CrupestApi.Commons/Crud/CrudService.cs | 11 +++-- .../Crud/CrudServiceCollectionExtensions.cs | 2 + .../Crud/CrudWebApplicationExtensions.cs | 8 +++- .../CrupestApi.Commons/Crud/TableInfo.cs | 4 +- .../CrupestApi.Commons/ISecretService.cs | 2 +- .../CrupestApi.Commons/Secrets/SecretInfo.cs | 48 ++++++++++++++++++++++ .../CrupestApi.Commons/Secrets/SecretService.cs | 20 +++++++++ .../Secrets/SecretServiceCollectionExtensions.cs | 12 ++++++ .../CrupestApi.Commons/Secrets/SecretsConstants.cs | 6 +++ 9 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs create mode 100644 docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs create mode 100644 docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs create mode 100644 docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs (limited to 'docker/crupest-api/CrupestApi/CrupestApi.Commons') diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs index 184ac0a..27f0c85 100644 --- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs @@ -12,9 +12,9 @@ public class CrudService : IDisposable where TEntity : class protected readonly EntityJsonHelper _jsonHelper; private readonly ILogger> _logger; - public CrudService(string? connectionName, ITableInfoFactory tableInfoFactory, IDbConnectionFactory dbConnectionFactory, EntityJsonHelper jsonHelper, ILoggerFactory loggerFactory) + public CrudService(ITableInfoFactory tableInfoFactory, IDbConnectionFactory dbConnectionFactory, EntityJsonHelper jsonHelper, ILoggerFactory loggerFactory) { - _connectionName = connectionName; + _connectionName = GetConnectionName(); _table = tableInfoFactory.Get(typeof(TEntity)); _dbConnection = dbConnectionFactory.Get(_connectionName); _jsonHelper = jsonHelper; @@ -23,6 +23,11 @@ public class CrudService : IDisposable where TEntity : class CheckDatabase(_dbConnection); } + protected virtual string GetConnectionName() + { + return typeof(TEntity).Name; + } + public EntityJsonHelper JsonHelper => _jsonHelper; protected virtual void CheckDatabase(IDbConnection dbConnection) @@ -33,7 +38,7 @@ public class CrudService : IDisposable where TEntity : class } } - private void DoInitializeDatabase(IDbConnection connection) + protected virtual void DoInitializeDatabase(IDbConnection connection) { using var transaction = connection.BeginTransaction(); connection.Execute(_table.GenerateCreateTableSql(), transaction: transaction); diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs index d51c0a1..e9f28bc 100644 --- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs @@ -1,3 +1,4 @@ +using CrupestApi.Commons.Secrets; using Microsoft.Extensions.DependencyInjection.Extensions; namespace CrupestApi.Commons.Crud; @@ -9,6 +10,7 @@ public static class CrudServiceCollectionExtensions services.TryAddSingleton(); services.TryAddSingleton(); services.TryAddSingleton(); + services.AddSecrets(); return services; } diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs index 9e85c68..b7bc6f1 100644 --- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs @@ -2,11 +2,11 @@ namespace CrupestApi.Commons.Crud; public static class CrudWebApplicationExtensions { - public static WebApplication UseCrud(this WebApplication app, string path, string? key) where TEntity : class + public static WebApplication MapCrud(this WebApplication app, string path, string? permission) where TEntity : class { app.MapGet(path, async (context) => { - + if (!context.RequirePermission(permission)) return; var crudService = context.RequestServices.GetRequiredService>(); var allEntities = crudService.GetAll(); await context.ResponseJsonAsync(allEntities.Select(e => crudService.JsonHelper.ConvertEntityToDictionary(e))); @@ -14,6 +14,7 @@ public static class CrudWebApplicationExtensions app.MapGet(path + "/{key}", async (context) => { + if (!context.RequirePermission(permission)) return; var crudService = context.RequestServices.GetRequiredService>(); var key = context.Request.RouteValues["key"]?.ToString(); if (key == null) @@ -28,6 +29,7 @@ public static class CrudWebApplicationExtensions app.MapPost(path, async (context) => { + if (!context.RequirePermission(permission)) return; var crudService = context.RequestServices.GetRequiredService>(); var jsonDocument = await context.Request.ReadJsonAsync(); var key = crudService.Create(jsonDocument.RootElement); @@ -36,6 +38,7 @@ public static class CrudWebApplicationExtensions app.MapPatch(path + "/{key}", async (context) => { + if (!context.RequirePermission(permission)) return; var crudService = context.RequestServices.GetRequiredService>(); var key = context.Request.RouteValues["key"]?.ToString(); if (key == null) @@ -52,6 +55,7 @@ public static class CrudWebApplicationExtensions app.MapDelete(path + "/{key}", async (context) => { + if (!context.RequirePermission(permission)) return; var crudService = context.RequestServices.GetRequiredService>(); var key = context.Request.RouteValues["key"]?.ToString(); if (key == null) diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs index b552e6b..3147e99 100644 --- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs @@ -393,7 +393,7 @@ CREATE TABLE {tableName}( /// /// ConvertParameters. Select. Call hooks. /// - public virtual List SelectDynamic(IDbConnection dbConnection, string? what, IWhereClause? where = null, IOrderByClause? orderBy = null, int? skip = null, int? limit = null) + public virtual List SelectDynamic(IDbConnection dbConnection, string? what = null, IWhereClause? where = null, IOrderByClause? orderBy = null, int? skip = null, int? limit = null) { var (sql, parameters) = GenerateSelectSql(what, where, orderBy, skip, limit); var queryResult = dbConnection.Query(sql, ConvertParameters(parameters)); @@ -431,7 +431,7 @@ CREATE TABLE {tableName}( /// /// Select and call hooks. /// - public virtual List Select(IDbConnection dbConnection, string? what, IWhereClause? where = null, IOrderByClause? orderBy = null, int? skip = null, int? limit = null) + public virtual List Select(IDbConnection dbConnection, string? what = null, IWhereClause? where = null, IOrderByClause? orderBy = null, int? skip = null, int? limit = null) { List queryResult = SelectDynamic(dbConnection, what, where, orderBy, skip, limit).ToList(); diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/ISecretService.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/ISecretService.cs index eeabb0d..c4c4467 100644 --- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/ISecretService.cs +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/ISecretService.cs @@ -1,6 +1,6 @@ namespace CrupestApi.Commons; -interface ISecretService +public interface ISecretService { List GetPermissions(string secret); } diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs new file mode 100644 index 0000000..8b9420a --- /dev/null +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs @@ -0,0 +1,48 @@ +using System.Security.Cryptography; +using System.Text; +using CrupestApi.Commons.Crud; + +namespace CrupestApi.Commons.Secrets; + +public class SecretInfo +{ + [Column(NotNull = true)] + public string Key { get; set; } = default!; + [Column(NotNull = true, Generated = true, NoUpdate = true, ActAsKey = true)] + public string Secret { get; set; } = default!; + [Column(DefaultEmptyForString = true)] + public string Description { get; set; } = default!; + [Column(NotNull = false)] + public DateTime? ExpireTime { get; set; } + [Column(NotNull = true)] + public bool Revoked { get; set; } + [Column(NotNull = true)] + public DateTime CreateTime { get; set; } + + private static RandomNumberGenerator RandomNumberGenerator = RandomNumberGenerator.Create(); + + private static string GenerateRandomKey(int length) + { + const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + var result = new StringBuilder(length); + lock (RandomNumberGenerator) + { + for (int i = 0; i < length; i++) + { + result.Append(chars[RandomNumberGenerator.GetInt32(chars.Length)]); + } + } + return result.ToString(); + } + + + public static string SecretDefaultValueGenerator() + { + return GenerateRandomKey(16); + } + + public static DateTime CreateTimeDefaultValueGenerator() + { + return DateTime.UtcNow; + } +} diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs new file mode 100644 index 0000000..fc13707 --- /dev/null +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs @@ -0,0 +1,20 @@ +using CrupestApi.Commons; +using CrupestApi.Commons.Crud; + +namespace CrupestApi.Commons.Secrets; + +public class SecretService : CrudService, ISecretService +{ + public SecretService(ITableInfoFactory tableInfoFactory, IDbConnectionFactory dbConnectionFactory, EntityJsonHelper jsonHelper, ILoggerFactory loggerFactory) + : base(tableInfoFactory, dbConnectionFactory, jsonHelper, loggerFactory) + { + + } + + public List GetPermissions(string secret) + { + var list = _table.Select(_dbConnection, + where: WhereClause.Create().Eq(nameof(SecretInfo.Secret), secret)); + return list.Select(x => x.Key).ToList(); + } +} diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs new file mode 100644 index 0000000..a9c0e5f --- /dev/null +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs @@ -0,0 +1,12 @@ +using Microsoft.Extensions.DependencyInjection.Extensions; + +namespace CrupestApi.Commons.Secrets; + +public static class SecretServiceCollectionExtensions +{ + public static IServiceCollection AddSecrets(this IServiceCollection services) + { + services.TryAddScoped(); + return services; + } +} diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs new file mode 100644 index 0000000..207cc45 --- /dev/null +++ b/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs @@ -0,0 +1,6 @@ +namespace CrupestApi.Commons.Secrets; + +public static class SecretsConstants +{ + public const string SecretManagementKey = "crupest.secrets.management"; +} -- cgit v1.2.3