Add another section for RadiusRouter.HandleRequest

MultifactorLab · Jun 27, 2024 · 29d7faf · 29d7faf
1 parent d6fdc2d
commit 29d7faf
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/MultiFactor.Radius.Adapter/Server/RadiusRouter.cs b/MultiFactor.Radius.Adapter/Server/RadiusRouter.cs
@@ -215,6 +215,7 @@ public async Task HandleRequest(PendingRequest request)
                 if (request.AuthenticationState.SecondFactor == AuthenticationCode.Awaiting)
                 {
                     var code = await ProcessSecondAuthenticationFactor(request);
+
                     if (code == PacketCode.AccessChallenge) 
                     {
                         request.ResponseCode = request.AuthenticationState.GetResultPacketCode();
@@ -223,7 +224,17 @@ public async Task HandleRequest(PendingRequest request)
                         return;
                     }
 
-                    if (code != PacketCode.AccessAccept)
+                    if (code == PacketCode.AccessAccept)
+                    {
+                        _logger.Information("Second factor accepted for user '{user:l}' from {host:l}:{port}",
+                            request.UserName, request.RemoteEndpoint.Address, request.RemoteEndpoint.Port);
+                        request.AuthenticationState.SetSecondFactor(AuthenticationCode.Accept);
+                        request.ResponseCode = request.AuthenticationState.GetResultPacketCode();
+                        CreateAndSendRadiusResponse(request);
+                        return;
+                    }
+
+                    if (code == PacketCode.AccessReject)
                     {
                         _logger.Information("Second factor rejected for user '{user:l}' from {host:l}:{port}",
                             request.UserName, request.RemoteEndpoint.Address, request.RemoteEndpoint.Port);
@@ -232,11 +243,6 @@ public async Task HandleRequest(PendingRequest request)
                         CreateAndSendRadiusResponse(request);
                         return;
                     }
-
-                    request.AuthenticationState.SetSecondFactor(AuthenticationCode.Accept);
-                    request.ResponseCode = request.AuthenticationState.GetResultPacketCode();
-                    CreateAndSendRadiusResponse(request);
-                    return;     
                 }
 
                 request.ResponseCode = request.AuthenticationState.GetResultPacketCode();