Merge pull request #1 from izanhzh/dev

Fix: cache expiration time setting bug

Author: izanhzh

src/Directory.Build.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Copyright>Amos Huang</Copyright>
     <Authors>Amos Huang</Authors>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://github.com/izanhzh/pow-cap-server</PackageProjectUrl>

src/PowCapServer.Core/DefaultCaptchaService.cs

@@ -80,24 +80,24 @@ public virtual async Task<RedeemChallengeResult> RedeemChallengeAsync(ChallengeS
         var hash = DigestUtil.Sha256Hex(vertoken);
         var id = RandomUtil.ToHexString(RandomUtil.RandomBytes(8));
 
-        await _captchaStore.SaveCaptchaTokenInfoAsync(new CaptchaTokenInfo($"{id}:{hash}", expires), cancellationToken).ConfigureAwait(false);
+        await _captchaStore.SaveCaptchaTokenInfoAsync(new CaptchaTokenInfo($"{id}_{hash}", expires), cancellationToken).ConfigureAwait(false);
 
-        return RedeemChallengeResult.Ok($"{id}:{vertoken}", expires);
+        return RedeemChallengeResult.Ok($"{id}_{vertoken}", expires);
     }
 
     public virtual async Task<bool> ValidateCaptchaTokenAsync(string captchaToken, CancellationToken cancellationToken = default)
     {
         await _captchaStore.CleanExpiredTokensAsync(cancellationToken).ConfigureAwait(false);
 
-        var idAndVertoken = captchaToken?.Split(':');
+        var idAndVertoken = captchaToken?.Split('_');
         if (idAndVertoken == null || idAndVertoken.Length != 2)
         {
             return false;
         }
 
         var id = idAndVertoken[0];
         var hash = DigestUtil.Sha256Hex(idAndVertoken[1]);
-        var actualToken = $"{id}:{hash}";
+        var actualToken = $"{id}_{hash}";
 
         var captchaTokenInfo = await _captchaStore.GetCaptchaTokenInfoAsync(actualToken, cancellationToken).ConfigureAwait(false);
         if (captchaTokenInfo == null)

src/PowCapServer.Core/DefaultCaptchaStore.cs

@@ -11,6 +11,9 @@ namespace PowCapServer;
 
 public class DefaultCaptchaStore : ICaptchaStore
 {
+    public const string ChallengeTokenCachePrefix = "Captcha:ChallengeToken:";
+    public const string CaptchaTokenCachePrefix = "Captcha:CaptchaToken:";
+
     private readonly IDistributedCache _distributedCache;
 
     public DefaultCaptchaStore(IDistributedCache distributedCache)
@@ -37,16 +40,16 @@ public virtual async Task SaveChallengeTokenInfoAsync(ChallengeTokenInfo challen
 
         var options = new DistributedCacheEntryOptions
         {
-            AbsoluteExpirationRelativeToNow = TimeSpan.FromMilliseconds(challengeTokenInfo.Expires)
+            AbsoluteExpiration = DateTimeOffset.FromUnixTimeMilliseconds(challengeTokenInfo.Expires)
         };
         using var stream = new MemoryStream();
         await JsonSerializer.SerializeAsync(stream, challengeTokenInfo, cancellationToken: cancellationToken).ConfigureAwait(false);
-        await _distributedCache.SetAsync(challengeTokenInfo.Token, stream.ToArray(), options, cancellationToken).ConfigureAwait(false);
+        await _distributedCache.SetAsync($"{ChallengeTokenCachePrefix}{challengeTokenInfo.Token}", stream.ToArray(), options, cancellationToken).ConfigureAwait(false);
     }
 
     public virtual async Task<ChallengeTokenInfo?> GetChallengeTokenInfoAsync(string challengeToken, CancellationToken cancellationToken = default)
     {
-        var value = await _distributedCache.GetAsync(challengeToken, cancellationToken).ConfigureAwait(false);
+        var value = await _distributedCache.GetAsync($"{ChallengeTokenCachePrefix}{challengeToken}", cancellationToken).ConfigureAwait(false);
         if (value == null)
         {
             return null;
@@ -62,7 +65,7 @@ public virtual async Task DeleteChallengeTokenInfoAsync(ChallengeTokenInfo chall
             throw new ArgumentNullException(nameof(challengeTokenInfo));
         }
 
-        await _distributedCache.RemoveAsync(challengeTokenInfo.Token, cancellationToken).ConfigureAwait(false);
+        await _distributedCache.RemoveAsync($"{ChallengeTokenCachePrefix}{challengeTokenInfo.Token}", cancellationToken).ConfigureAwait(false);
     }
 
     public virtual async Task SaveCaptchaTokenInfoAsync(CaptchaTokenInfo captchaTokenInfo, CancellationToken cancellationToken = default)
@@ -74,17 +77,17 @@ public virtual async Task SaveCaptchaTokenInfoAsync(CaptchaTokenInfo captchaToke
 
         var options = new DistributedCacheEntryOptions
         {
-            AbsoluteExpirationRelativeToNow = TimeSpan.FromMilliseconds(captchaTokenInfo.Expires)
+            AbsoluteExpiration = DateTimeOffset.FromUnixTimeMilliseconds(captchaTokenInfo.Expires)
         };
 
         using var stream = new MemoryStream();
         await JsonSerializer.SerializeAsync(stream, captchaTokenInfo, cancellationToken: cancellationToken).ConfigureAwait(false);
-        await _distributedCache.SetAsync(captchaTokenInfo.Token, stream.ToArray(), options, cancellationToken).ConfigureAwait(false);
+        await _distributedCache.SetAsync($"{CaptchaTokenCachePrefix}{captchaTokenInfo.Token}", stream.ToArray(), options, cancellationToken).ConfigureAwait(false);
     }
 
     public virtual async Task<CaptchaTokenInfo?> GetCaptchaTokenInfoAsync(string captchaToken, CancellationToken cancellationToken = default)
     {
-        var value = await _distributedCache.GetAsync(captchaToken, cancellationToken).ConfigureAwait(false);
+        var value = await _distributedCache.GetAsync($"{CaptchaTokenCachePrefix}{captchaToken}", cancellationToken).ConfigureAwait(false);
         if (value == null)
         {
             return null;
@@ -100,6 +103,6 @@ public virtual async Task DeleteCaptchaTokenInfoAsync(CaptchaTokenInfo captchaTo
             throw new ArgumentNullException(nameof(captchaTokenInfo));
         }
 
-        await _distributedCache.RemoveAsync(captchaTokenInfo.Token, cancellationToken).ConfigureAwait(false);
+        await _distributedCache.RemoveAsync($"{CaptchaTokenCachePrefix}{captchaTokenInfo.Token}", cancellationToken).ConfigureAwait(false);
     }
 }

src/PowCapServer.Core/Microsoft/Extensions/DependencyInjection/PowCapServerServiceCollectionExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using PowCapServer;
 using PowCapServer.Abstractions;
 
@@ -23,8 +22,8 @@ public static IServiceCollection AddPowCapServer(this IServiceCollection service
     public static IServiceCollection AddPowCapServer(this IServiceCollection services, Action<PowCapServerOptions> options)
     {
         services.AddDistributedMemoryCache();
-        services.TryAddSingleton<ICaptchaService, DefaultCaptchaService>();
-        services.TryAddSingleton<ICaptchaStore, DefaultCaptchaStore>();
+        services.AddSingleton<ICaptchaService, DefaultCaptchaService>();
+        services.AddSingleton<ICaptchaStore, DefaultCaptchaStore>();
         services.Configure(options);
         return services;
     }