no response event was added (#34)

MultifactorLab · Jun 13, 2023 · 1677600 · 1677600
1 parent 15306a7
commit 1677600
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...iFactor.Radius.Adapter/Server/FirstAuthFactorProcessing/RadiusFirstAuthFactorProcessor.cs b/...iFactor.Radius.Adapter/Server/FirstAuthFactorProcessing/RadiusFirstAuthFactorProcessor.cs
@@ -87,7 +87,7 @@ public async Task<PacketCode> ProcessRadiusAuthentication(PendingRequest request
                     if (response == null)
                     {
                         _logger.Warning("Remote Radius Server did not respond on message with id={id}", request.RequestPacket.Identifier);
-                        return PacketCode.AccessReject; //reject by default
+                        return PacketCode.DisconnectNak;
                     }
 
                     var responsePacket = _packetParser.Parse(response, request.RequestPacket.SharedSecret, request.RequestPacket.Authenticator);

diff --git a/MultiFactor.Radius.Adapter/Server/RadiusRouter.cs b/MultiFactor.Radius.Adapter/Server/RadiusRouter.cs
@@ -24,6 +24,7 @@ public class RadiusRouter
         private ILogger _logger;
         private MultiFactorApiClient _multifactorApiClient;
         public event EventHandler<PendingRequest> RequestProcessed;
+        public event EventHandler<PendingRequest> RequestWillNotBeProcessed;
         private readonly ConcurrentDictionary<string, PendingRequest> _stateChallengePendingRequests = new ConcurrentDictionary<string, PendingRequest>();
         private PasswordChangeHandler _passwordChangeHandler;
         private readonly FirstAuthFactorProcessorProvider _firstAuthFactorProcessorProvider;
@@ -87,6 +88,12 @@ public async Task HandleRequest(PendingRequest request, ClientConfiguration clie
 
                 var firstAuthFactorProcessor = _firstAuthFactorProcessorProvider.GetProcessor(clientConfig.FirstFactorAuthenticationSource);
                 var firstFactorAuthenticationResultCode = await firstAuthFactorProcessor.ProcessFirstAuthFactorAsync(request, clientConfig);
+                if (firstFactorAuthenticationResultCode == PacketCode.DisconnectNak)
+                {
+                    RequestWillNotBeProcessed?.Invoke(this, request);
+                    return;
+                }
+
                 if (firstFactorAuthenticationResultCode != PacketCode.AccessAccept)
                 {
                     //User password expired ot must be changed

diff --git a/MultiFactor.Radius.Adapter/Server/RadiusServer.cs b/MultiFactor.Radius.Adapter/Server/RadiusServer.cs
@@ -94,6 +94,7 @@ public void Start()
                 var receiveTask = Receive();
 
                 _radiusRouter.RequestProcessed += RouterRequestProcessed;
+                _radiusRouter.RequestWillNotBeProcessed += RouterRequestWillNotBeProcessed;
 
                 _logger.Information("Server started");
             }
@@ -114,6 +115,7 @@ public void Stop()
                 Running = false;
                 _server?.Close();
                 _radiusRouter.RequestProcessed -= RouterRequestProcessed;
+                _radiusRouter.RequestWillNotBeProcessed -= RouterRequestWillNotBeProcessed;
                 _logger.Information("Stopped");
             }
             else
@@ -390,6 +392,8 @@ private async void RouterRequestProcessed(object sender, PendingRequest request)
             Send(responsePacket, request.RequestPacket?.UserName, request.RemoteEndpoint, request.ProxyEndpoint, debugLog);
         }
 
+        private void RouterRequestWillNotBeProcessed(object sender, PendingRequest request) { }
+
         private void AddCustomReplyAttributes(PendingRequest request, IRadiusPacket responsePacket, ClientConfiguration clientConfiguration)
         {
             foreach (var attr in clientConfiguration.RadiusReplyAttributes)