fix decrypt

DGP-Studio · Feb 6, 2024 · beadaa7 · beadaa7
1 parent 7385017
commit beadaa7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/GithubAuthorizationController.cs b/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/GithubAuthorizationController.cs
@@ -12,6 +12,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http.Headers;
 using System.Security.Cryptography;
+using System.Security.Policy;
 
 namespace Snap.Hutao.Server.Controller;
 
@@ -80,15 +81,20 @@ public async Task<IActionResult> RedirectLoginAsync([FromQuery(Name = "token")]
     [HttpGet("Authorize")]
     public async Task<IActionResult> HandleAuthorizationCallbackAsync([FromQuery(Name = "code")] string code, [FromQuery(Name = "state")] string state)
     {
-        if (string.IsNullOrEmpty(code) || string.IsNullOrEmpty(state))
+        if (string.IsNullOrEmpty(code))
+        {
+            return RedirectToError(ReturnCode.GithubAuthrizationCanceled);
+        }
+
+        if (string.IsNullOrEmpty(state))
         {
             return RedirectToError(ReturnCode.InvalidQueryString);
         }
 
         UserIdentity? userIdentity;
         try
         {
-            userIdentity = JsonSerializer.Deserialize<UserIdentity>(DecryptState(state));
+            userIdentity = JsonSerializer.Deserialize<UserIdentity>(DecryptState(Uri.UnescapeDataString(state)));
             ArgumentNullException.ThrowIfNull(userIdentity);
         }
         catch (Exception)

diff --git a/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/Response/ReturnCode.cs b/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/Response/ReturnCode.cs
@@ -33,6 +33,7 @@ public enum ReturnCode
     InternalGithubAuthException = 514004,
     InvalidGithubAuthState      = 514005,
     GithubAlreadyAuthorized     = 514006,
+    GithubAuthrizationCanceled  = 514007,
     ReCaptchaVerifyFailed       = 515001,
     ServiceKeyInvalid           = 516001,
     UserNameNotExists           = 516002,