Skip to content

Commit 745242a

Browse files
committed
fix issue #691 - helpdesk idle timeout counter not working
1 parent ecd7a48 commit 745242a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

server/src/main/java/password/pwm/http/IdleTimeoutCalculator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,12 @@ public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest )
177177
throws PwmUnrecoverableException
178178
{
179179
final PwmURL pwmURL = pwmRequest.getURL();
180+
return idleTimeoutForRequest( pwmRequest, pwmURL );
181+
}
182+
183+
public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest, final PwmURL pwmURL )
184+
throws PwmUnrecoverableException
185+
{
180186
final PwmDomain pwmDomain = pwmRequest.getPwmDomain();
181187

182188
if ( pwmURL.isResourceURL() )

server/src/main/java/password/pwm/http/servlet/ClientApiServlet.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import password.pwm.http.PwmHttpRequestWrapper;
4646
import password.pwm.http.PwmRequest;
4747
import password.pwm.http.PwmSession;
48+
import password.pwm.http.PwmURL;
4849
import password.pwm.i18n.Display;
4950
import password.pwm.svc.sessiontrack.UserAgentUtils;
5051
import password.pwm.svc.stats.EpsStatistic;
@@ -68,6 +69,7 @@
6869
import javax.servlet.ServletException;
6970
import javax.servlet.annotation.WebServlet;
7071
import java.io.IOException;
72+
import java.net.URI;
7173
import java.time.Instant;
7274
import java.util.ArrayList;
7375
import java.util.Collection;
@@ -333,7 +335,8 @@ private static Map<String, Object> makeClientData(
333335
{
334336
try
335337
{
336-
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest );
338+
final PwmURL pwmUrl = PwmURL.create( URI.create( pageUrl ), pwmRequest.getContextPath(), pwmRequest.getAppConfig() );
339+
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest, pwmUrl );
337340
idleSeconds = maxIdleTime.as( TimeDuration.Unit.SECONDS );
338341
}
339342
catch ( final Exception e )

0 commit comments

Comments
 (0)