Skip to content
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

Add session timeout #517

Merged
merged 6 commits into from
Jan 17, 2025
+99 −9
Merged

Add session timeout #517

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db5abe4
add session timeout
celuchmarek Jan 16, 2025
1ffa31f
Fix tests
jsuchal Jan 16, 2025
a0f0761
add token session timeout setting
celuchmarek Jan 17, 2025
fa7151b
update token session timeout info text
celuchmarek Jan 17, 2025
23aaad4
make number input smaller
celuchmarek Jan 17, 2025
dbcc179
rename style class
celuchmarek Jan 17, 2025
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
29 changes: 29 additions & 0 deletions src/main/java/digital/slovensko/autogram/core/Autogram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import java.io.File;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Consumer;
Expand All @@ -24,6 +26,7 @@ public class Autogram {
/** Current batch, should be null if no batch was started yet */
private Batch batch = null;
private final PasswordManager passwordManager;
private Timer tokenSessionTimer = null;

public Autogram(UI ui, UserSettings settings) {
this.ui = ui;
Expand Down Expand Up @@ -93,6 +96,8 @@ public void startVisualization(SigningJob job) {
private void signCommonAndThen(SigningJob job, SigningKey signingKey, Consumer<SigningJob> callback) {
try {
job.signWithKeyAndRespond(signingKey);
resetTokenSessionTimer();

if (batch == null || batch.isEnded() || batch.isAllProcessed())
passwordManager.reset();

Expand Down Expand Up @@ -214,6 +219,7 @@ private void fetchKeysAndThen(TokenDriver driver, Consumer<SigningKey> callback)
try {
var token = driver.createToken(passwordManager, settings);
var keys = token.getKeys();
resetTokenSessionTimer();

ui.onUIThreadDo(
() -> ui.pickKeyAndThen(keys, driver, (privateKey) -> callback.accept(new SigningKey(token, privateKey))));
Expand Down Expand Up @@ -266,4 +272,27 @@ public TSPSource getTspSource() {
public boolean isPlainXmlEnabled() {
return settings.isPlainXmlEnabled();
}

private void stopTokenSessionTimer() {
if (tokenSessionTimer == null)
return;

tokenSessionTimer.cancel();
}

private void startTokenSessionTimer() {
var timerTask = new TimerTask() {
@Override
public void run() {
ui.resetSigningKey();
}
};
tokenSessionTimer = new Timer();
tokenSessionTimer.schedule(timerTask, settings.getTokenSessionTimeout() * 60 * 1000);
}

private void resetTokenSessionTimer() {
stopTokenSessionTimer();
startTokenSessionTimer();
}
}
14 changes: 14 additions & 0 deletions src/main/java/digital/slovensko/autogram/core/UserSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class UserSettings implements PasswordManagerSettings, SignatureTokenSett
private String customTsaServer;
private boolean bulkEnabled;
private int pdfDpi;
private long tokenSessionTimeout;

public static UserSettings load() {
var prefs = Preferences.userNodeForPackage(UserSettings.class);
Expand All @@ -56,6 +57,7 @@ public static UserSettings load() {
settings.setCustomTsaServer(prefs.get("CUSTOM_TSA_SERVER", ""));
settings.setTsaEnabled(prefs.getBoolean("TSA_ENABLE", false));
settings.setPdfDpi(prefs.getInt("PDF_DPI", 100));
settings.setTokenSessionTimeout(prefs.getLong("TOKEN_SESSION_TIMEOUT", 5));

return settings;
}
Expand All @@ -81,6 +83,7 @@ public void save() {
prefs.put("CUSTOM_TSA_SERVER", customTsaServer);
prefs.putBoolean("TSA_ENABLE", tsaEnabled);
prefs.putInt("PDF_DPI", pdfDpi);
prefs.putLong("TOKEN_SESSION_TIMEOUT", tokenSessionTimeout);
}

private void setSignatureType(String signatureType) {
Expand Down Expand Up @@ -285,4 +288,15 @@ public int getPdfDpi() {
public void setPdfDpi(int value) {
pdfDpi = value;
}

public long getTokenSessionTimeout() {
return tokenSessionTimeout;
}

public void setTokenSessionTimeout(long value) {
if (value <= 0)
return;

tokenSessionTimeout = value;
}
}
2 changes: 2 additions & 0 deletions src/main/java/digital/slovensko/autogram/ui/UI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ public interface UI {
char[] getContextSpecificPassword();

public void updateBatch();

void resetSigningKey();
}
5 changes: 5 additions & 0 deletions src/main/java/digital/slovensko/autogram/ui/cli/CliUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,9 @@ public char[] getContextSpecificPassword() {
public void updateBatch() {
// TODO: no usage for this in CLI UI
}

@Override
public void resetSigningKey() {
activeKey = null;
}
}
7 changes: 5 additions & 2 deletions src/main/java/digital/slovensko/autogram/ui/gui/GUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import digital.slovensko.autogram.drivers.TokenDriver;
import digital.slovensko.autogram.ui.BatchUiResult;
import digital.slovensko.autogram.ui.UI;
import eu.europa.esig.dss.enumerations.KeyUsageBit;
import eu.europa.esig.dss.token.DSSPrivateKeyEntry;
import javafx.application.HostServices;
import javafx.application.Platform;
Expand Down Expand Up @@ -500,8 +499,12 @@ public void disableSigning() {
batchController.disableSigning();
}

@Override
public void resetSigningKey() {
setActiveSigningKeyAndThen(null, null);
onUIThreadDo(()->{
setActiveSigningKeyAndThen(null, null);
refreshKeyOnAllJobs();
});
}

public void cancelJob(SigningJob job) {
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/digital/slovensko/autogram/ui/gui/SettingsDialogController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class SettingsDialogController {
@FXML
private HBox plainXmlEnabledRadios;
@FXML
private TextField tokenSessionTimeoutTextField;
@FXML
private ChoiceBox<TokenDriver> driverChoiceBox;
@FXML
private VBox trustedCountriesList;
Expand Down Expand Up @@ -76,6 +78,7 @@ public void initialize() {
initializeBulkEnabledCheckbox();
initializeEn319132CheckBox();
initializePlainXmlEnabledCheckBox();
initializeTokenSessionTimeoutTextField();
initializeCorrectDocumentDisplayCheckBox();
initializeSignatureValidationCheckBox();
initializeCheckPDFAComplianceCheckBox();
Expand Down Expand Up @@ -297,6 +300,15 @@ private void initializeCustomKeystoreSettings() {
});
}

private void initializeTokenSessionTimeoutTextField() {
tokenSessionTimeoutTextField.setTextFormatter(new TextFormatter <> (change -> change.getControlNewText().matches("[0-9]*") ? change : null));
tokenSessionTimeoutTextField.setText(String.valueOf(userSettings.getTokenSessionTimeout()));
tokenSessionTimeoutTextField.setOnKeyTyped((e) -> {
if (!tokenSessionTimeoutTextField.getText().isEmpty())
userSettings.setTokenSessionTimeout(Long.parseLong(tokenSessionTimeoutTextField.getText()));
});
}

public void onSaveButtonAction() {
userSettings.save();
var stage = (Stage) saveButton.getScene().getWindow();
Expand Down
29 changes: 23 additions & 6 deletions src/main/resources/digital/slovensko/autogram/ui/gui/settings-dialog.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,17 @@
<VBox styleClass="left">
<TextFlow>
<Text styleClass="autogram-heading-s">
Použitie nového štandardu
Čas pre odpojenie podpisového certifikátu
celuchmarek marked this conversation as resolved.
Show resolved Hide resolved
</Text>
</TextFlow>
<TextFlow>
<Text styleClass="autogram-description">
Podpisovanie štandardom ETSI EN 319 132 a&#160;ETSI EN 319 122.
Pozor, systémy verejnej správy tento štandard väčšinou nepodporujú.
Po koľkých minútach nečinnosti bude podpisový certifikát odpojený.
</Text>
</TextFlow>
</VBox>
<VBox styleClass="autogram-checkbox-container">
<HBox fx:id="en319132Radios"
styleClass="autogram-smaller-radio-buttons" />
<VBox styleClass="autogram-textfield-container">
<TextField fx:id="tokenSessionTimeoutTextField" styleClass="autogram-input" />
</VBox>
</HBox>
<HBox styleClass="autogram-settings-row">
Expand All @@ -183,6 +181,25 @@
styleClass="autogram-smaller-radio-buttons" />
</VBox>
</HBox>
<HBox styleClass="autogram-settings-row">
<VBox styleClass="left">
<TextFlow>
<Text styleClass="autogram-heading-s">
Použitie nového štandardu
</Text>
</TextFlow>
<TextFlow>
<Text styleClass="autogram-description">
Podpisovanie štandardom ETSI EN 319 132 a&#160;ETSI EN 319 122.
Pozor, systémy verejnej správy tento štandard väčšinou nepodporujú.
</Text>
</TextFlow>
</VBox>
<VBox styleClass="autogram-checkbox-container">
<HBox fx:id="en319132Radios"
styleClass="autogram-smaller-radio-buttons" />
</VBox>
</HBox>
</VBox>
</ScrollPane>
</content>
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/digital/slovensko/autogram/AutogramTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ public void onSignatureCheckCompleted(ValidationReports wrapper) {
public void updateBatch() {

}

@Override
public void resetSigningKey() {

}
}

private class TestSettings extends UserSettings {
Expand Down
Loading