Skip to content

Fix 2FA shutdown timer terminating a healthy logged-in session #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chapinmark wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 2FA shutdown timer terminating a healthy logged-in session #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/ibcalpha/ibc/LoginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,17 @@ void secondFactorAuthenticationDialogClosed() {
Utils.logToConsole("Re-login after second factor authentication timeout in 5 second");
MyScheduledExecutorService.getInstance().schedule(() -> {
GuiDeferredExecutor.instance().execute(
() -> {getLoginHandler().initiateLogin(getLoginFrame());}
() -> {
// The login may have completed by itself during this delay: TWS/Gateway
// sometimes closes the 2FA dialog right on the timeout boundary and then
// proceeds to log in anyway. Re-initiating the login here would take the
// session back out of LOGGED_IN, and it never returns to it.
if (getLoginState() == LoginState.LOGGED_IN) {
Utils.logToConsole("Login has already completed - no need to re-login");
return;
}
getLoginHandler().initiateLogin(getLoginFrame());
}
);
}, 5, TimeUnit.SECONDS);
}
Expand All @@ -167,6 +177,14 @@ private boolean reloginPermitted() {

void restartAfterTime(final int secondsTillShutdown, final String message) {
try {
// Only one shutdown task may be outstanding. Overwriting the field without
// cancelling leaves the previous task scheduled but unreachable, so the
// LOGGED_IN handler can no longer cancel it: it fires later and kills a
// perfectly healthy session that happens not to be LOGGED_IN at that instant.
if (shutdownAfterTimeTask != null) {
shutdownAfterTimeTask.cancel(false);
shutdownAfterTimeTask = null;
}
shutdownAfterTimeTask = MyScheduledExecutorService.getInstance().schedule(()->{
GuiExecutor.instance().execute(()->{
if (getLoginState() == LoginManager.LoginState.LOGGED_IN) {
Expand Down