Skip to content

Commit

Permalink
fix issue #691 - helpdesk idle timeout counter not working
Browse files Browse the repository at this point in the history
  • Loading branch information
jrivard committed Feb 10, 2023
1 parent ecd7a48 commit 745242a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest )
throws PwmUnrecoverableException
{
final PwmURL pwmURL = pwmRequest.getURL();
return idleTimeoutForRequest( pwmRequest, pwmURL );
}

public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest, final PwmURL pwmURL )
throws PwmUnrecoverableException
{
final PwmDomain pwmDomain = pwmRequest.getPwmDomain();

if ( pwmURL.isResourceURL() )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import password.pwm.http.PwmHttpRequestWrapper;
import password.pwm.http.PwmRequest;
import password.pwm.http.PwmSession;
import password.pwm.http.PwmURL;
import password.pwm.i18n.Display;
import password.pwm.svc.sessiontrack.UserAgentUtils;
import password.pwm.svc.stats.EpsStatistic;
Expand All @@ -68,6 +69,7 @@
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import java.io.IOException;
import java.net.URI;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -333,7 +335,8 @@ private static Map<String, Object> makeClientData(
{
try
{
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest );
final PwmURL pwmUrl = PwmURL.create( URI.create( pageUrl ), pwmRequest.getContextPath(), pwmRequest.getAppConfig() );
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest, pwmUrl );
idleSeconds = maxIdleTime.as( TimeDuration.Unit.SECONDS );
}
catch ( final Exception e )
Expand Down

0 comments on commit 745242a

Please sign in to comment.