From 8e644e3b7a3f043ad1f57065554271f728440285 Mon Sep 17 00:00:00 2001 From: Tobias Kellner Date: Mon, 12 Oct 2015 11:51:45 +0200 Subject: Add remaining keystore cli arguments --- .../gui/cliarguments/KeystoreAliasArgument.java | 68 ++++++++++++++++++++++ .../gui/cliarguments/KeystoreFileArgument.java | 8 +++ .../gui/cliarguments/KeystoreKeyPassArgument.java | 68 ++++++++++++++++++++++ .../cliarguments/KeystoreStorePassArgument.java | 68 ++++++++++++++++++++++ .../gui/cliarguments/KeystoreTypeArgument.java | 68 ++++++++++++++++++++++ .../workflow/states/PrepareConfigurationState.java | 4 ++ .../at/asit/pdfover/gui/messages.properties | 15 ++++- .../at/asit/pdfover/gui/messages_de.properties | 11 +++- 8 files changed, 306 insertions(+), 4 deletions(-) create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java new file mode 100644 index 00000000..3673ce0b --- /dev/null +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012 by A-SIT, Secure Information Technology Center Austria + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://joinup.ec.europa.eu/software/page/eupl + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + */ +package at.asit.pdfover.gui.cliarguments; + +// Imports +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.asit.pdfover.gui.exceptions.InitializationException; +import at.asit.pdfover.gui.utils.Messages; + +/** + * CLI Argument to provide the keystore alias + */ +public class KeystoreAliasArgument extends Argument { + /** + * Constructor + */ + public KeystoreAliasArgument() { + super(new String[] {"-ksalias"}, "argument.help.keystorealias"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * SLF4J Logger instance + **/ + private static final Logger log = LoggerFactory + .getLogger(KeystoreAliasArgument.class); + + /* (non-Javadoc) + * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler) + */ + @Override + public int handleArgument(String[] args, int argOffset, + ArgumentHandler handler) + throws InitializationException { + try { + if (args.length > argOffset + 1) { + + String ksAlias = args[argOffset + 1]; + + getConfiguration().setKeyStoreAliasOverlay(ksAlias); + + return argOffset + 1; + } + } catch (Exception ex) { + log.error("Keystore alias argument invalid!", ex); //$NON-NLS-1$ + throw new InitializationException( + Messages.getString("argument.invalid.keystorealias") + this.getHelpText(), ex); //$NON-NLS-1$ + } + + throw new InitializationException( + Messages.getString("argument.invalid.keystorealias") + this.getHelpText(), null); //$NON-NLS-1$ + } + +} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java index e24f1663..04aa1756 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java @@ -16,10 +16,13 @@ package at.asit.pdfover.gui.cliarguments; // Imports +import java.io.File; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import at.asit.pdfover.gui.exceptions.InitializationException; +import at.asit.pdfover.gui.exceptions.KeystoreDoesntExistException; import at.asit.pdfover.gui.utils.Messages; /** @@ -51,7 +54,12 @@ public class KeystoreFileArgument extends Argument { String ksFile = args[argOffset + 1]; + File ks = new File(ksFile); + if(!ks.exists() || !ks.isFile()) + throw new KeystoreDoesntExistException(ks, 0); + getConfiguration().setKeyStoreFileOverlay(ksFile); + getConfiguration().setKeyStoreEnabledOverlay(true); return argOffset + 1; } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java new file mode 100644 index 00000000..54dcba1c --- /dev/null +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012 by A-SIT, Secure Information Technology Center Austria + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://joinup.ec.europa.eu/software/page/eupl + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + */ +package at.asit.pdfover.gui.cliarguments; + +// Imports +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.asit.pdfover.gui.exceptions.InitializationException; +import at.asit.pdfover.gui.utils.Messages; + +/** + * CLI Argument to provide the keystore key password + */ +public class KeystoreKeyPassArgument extends Argument { + /** + * Constructor + */ + public KeystoreKeyPassArgument() { + super(new String[] {"-kskeypass"}, "argument.help.keystorekeypass"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * SLF4J Logger instance + **/ + private static final Logger log = LoggerFactory + .getLogger(KeystoreKeyPassArgument.class); + + /* (non-Javadoc) + * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler) + */ + @Override + public int handleArgument(String[] args, int argOffset, + ArgumentHandler handler) + throws InitializationException { + try { + if (args.length > argOffset + 1) { + + String ksKeyPass = args[argOffset + 1]; + + getConfiguration().setKeyStoreKeyPassOverlay(ksKeyPass); + + return argOffset + 1; + } + } catch (Exception ex) { + log.error("Keystore key password argument invalid!", ex); //$NON-NLS-1$ + throw new InitializationException( + Messages.getString("argument.invalid.keystorekeypass") + this.getHelpText(), ex); //$NON-NLS-1$ + } + + throw new InitializationException( + Messages.getString("argument.invalid.keystorekeypass") + this.getHelpText(), null); //$NON-NLS-1$ + } + +} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java new file mode 100644 index 00000000..2519b59a --- /dev/null +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012 by A-SIT, Secure Information Technology Center Austria + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://joinup.ec.europa.eu/software/page/eupl + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + */ +package at.asit.pdfover.gui.cliarguments; + +// Imports +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.asit.pdfover.gui.exceptions.InitializationException; +import at.asit.pdfover.gui.utils.Messages; + +/** + * CLI Argument to provide the keystore password + */ +public class KeystoreStorePassArgument extends Argument { + /** + * Constructor + */ + public KeystoreStorePassArgument() { + super(new String[] {"-kspass"}, "argument.help.keystorestorepass"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * SLF4J Logger instance + **/ + private static final Logger log = LoggerFactory + .getLogger(KeystoreStorePassArgument.class); + + /* (non-Javadoc) + * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler) + */ + @Override + public int handleArgument(String[] args, int argOffset, + ArgumentHandler handler) + throws InitializationException { + try { + if (args.length > argOffset + 1) { + + String ksStorePass = args[argOffset + 1]; + + getConfiguration().setKeyStoreStorePassOverlay(ksStorePass); + + return argOffset + 1; + } + } catch (Exception ex) { + log.error("Keystore password argument invalid!", ex); //$NON-NLS-1$ + throw new InitializationException( + Messages.getString("argument.invalid.keystorestorepass") + this.getHelpText(), ex); //$NON-NLS-1$ + } + + throw new InitializationException( + Messages.getString("argument.invalid.keystorestorepass") + this.getHelpText(), null); //$NON-NLS-1$ + } + +} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java new file mode 100644 index 00000000..6e900c95 --- /dev/null +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java @@ -0,0 +1,68 @@ +/* + * Copyright 2012 by A-SIT, Secure Information Technology Center Austria + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://joinup.ec.europa.eu/software/page/eupl + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + */ +package at.asit.pdfover.gui.cliarguments; + +// Imports +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.asit.pdfover.gui.exceptions.InitializationException; +import at.asit.pdfover.gui.utils.Messages; + +/** + * CLI Argument to provide the keystore type + */ +public class KeystoreTypeArgument extends Argument { + /** + * Constructor + */ + public KeystoreTypeArgument() { + super(new String[] {"-kstype"}, "argument.help.keystoretype"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * SLF4J Logger instance + **/ + private static final Logger log = LoggerFactory + .getLogger(KeystoreTypeArgument.class); + + /* (non-Javadoc) + * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler) + */ + @Override + public int handleArgument(String[] args, int argOffset, + ArgumentHandler handler) + throws InitializationException { + try { + if (args.length > argOffset + 1) { + + String ksType = args[argOffset + 1]; + + getConfiguration().setKeyStoreTypeOverlay(ksType); + + return argOffset + 1; + } + } catch (Exception ex) { + log.error("Keystore type argument invalid!", ex); //$NON-NLS-1$ + throw new InitializationException( + Messages.getString("argument.invalid.keystoretype") + this.getHelpText(), ex); //$NON-NLS-1$ + } + + throw new InitializationException( + Messages.getString("argument.invalid.keystoretype") + this.getHelpText(), null); //$NON-NLS-1$ + } + +} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java index c919a9c4..8280a302 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java @@ -82,6 +82,10 @@ public class PrepareConfigurationState extends State { this.handler.addCLIArgument(PhoneNumberArgument.class); this.handler.addCLIArgument(PasswordArgument.class); this.handler.addCLIArgument(KeystoreFileArgument.class); + this.handler.addCLIArgument(KeystoreTypeArgument.class); + this.handler.addCLIArgument(KeystoreStorePassArgument.class); + this.handler.addCLIArgument(KeystoreAliasArgument.class); + this.handler.addCLIArgument(KeystoreKeyPassArgument.class); this.handler.addCLIArgument(ProxyHostArgument.class); this.handler.addCLIArgument(ProxyPortArgument.class); this.handler.addCLIArgument(ProxyUserArgument.class); diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index 5ca9051e..ccb3872c 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -44,12 +44,16 @@ advanced_config.UpdateCheck_Title=Updates advanced_config.UpdateCheck_ToolTip=Shows a notification when a new version is available argument.error.output=is not a directory argument.help.autopos=Enables automatic signature positioning -argument.help.bku=Select the CCE to use. Values are\: LOCAL, MOBILE. Example\: -b MOBILE +argument.help.bku=Select the CCE to use. Possible values are\: LOCAL, MOBILE, KS. Example\: -b MOBILE argument.help.config=Defines which configuration file to use. Example\: -c argument.help.emblem=Sets the signature logo file to use for the signature. Example\: -e argument.help.help=Shows this help message argument.help.input=Sets the document to sign. Example\: -i +argument.help.keystorealias=Sets the keystore key alias. Example \: -ksalias argument.help.keystorefile=Sets the keystore file. Example \: -ks +argument.help.keystorekeypass=Sets the keystore password. Example \: -kspass +argument.help.keystorestorepass=Sets the keystore key password. Example \: -kskeypass +argument.help.keystoretype=Sets the keystore type. Example \: -kstype [PKCS12|JKS|JCEKS] argument.help.number=Sets the telephone number to use for mobile CCE. Example\: -n argument.help.output=Sets the output folder or file to use. Example\: -o argument.help.password=Sets the password to use for mobile CCE. Example\: -p @@ -63,7 +67,11 @@ argument.invalid.bku=CCE argument invalid\! Usage\: argument.invalid.config=Configuration file argument invalid\! Usage\: argument.invalid.emblem=Signature logo argument invalid\! Usage\: argument.invalid.input=Document to sign argument invalid\! Usage\: -argument.invalid.keystorefile=Keystore file invalid\! Usage\: +argument.invalid.keystorealias=Keystore alias invalid\! Usage\: +argument.invalid.keystorefile=Keystore file invalid\! Usage\: +argument.invalid.keystorekeypass=Keystore key password invalid\! Usage\: +argument.invalid.keystorestorepass=Keystore password invalid\! Usage\: +argument.invalid.keystoretype=Keystore type invalid\! Usage\: argument.invalid.number=Phone number argument invalid\! Usage\: argument.invalid.output=Output folder argument invalid\! Usage\: argument.invalid.password=Mobile CCE password invalid\! Usage\: @@ -113,6 +121,7 @@ error.InvalidLocale=Locale not valid error.InvalidPhoneNumber=Given phone number is invalid\! Example\: +43664123456789 error.InvalidSettings=Invalid settings are still present. Please check your input. error.KeyStore=Error loading they keystore. Wrong password? +error.KeyStoreAlias=Key alias %s not found in keystore error.LocalBKU=Please check if a local CCE (citizen card environment) is running\n\nYou need a CCE to access your citizen card. Further information under www.buergerkarte.at error.MayNotBeAPDF=This may not be a PDF file error.NoTan=No TAN entered @@ -152,7 +161,7 @@ keystore_config.KeystoreType=Keystore type keystore_config.KeystoreType_JKS=Java keystore keystore_config.KeystoreType_PKCS12=PKCS12 keystore_config.Load=Load keystore -keystore_config.Load_Tooltip=Load keystore to show available key aliases +keystore_config.Load_ToolTip=Load keystore to show available key aliases main.about=About %s main.configuration=Configuration main.done=Finish diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties index fba8318e..e584b353 100644 --- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties @@ -44,12 +44,16 @@ advanced_config.UpdateCheck_Title=Updates advanced_config.UpdateCheck_ToolTip=Zeigt eine Benachrichtigung, wenn eine neue Version verf\u00FCgbar ist argument.error.output=ist kein Ordner argument.help.autopos=Aktiviert automatische Positionierung der Signatur -argument.help.bku=W\u00E4hlen Sie die BKU. G\u00FCltige Werte\: LOCAL, MOBILE. Bsp.\: -b MOBILE +argument.help.bku=W\u00E4hlen Sie die BKU. G\u00FCltige Werte\: LOCAL, MOBILE, KS. Bsp.\: -b MOBILE argument.help.config=Auswahl der Konfigurationsdatei. Bsp.\: -c argument.help.emblem=W\u00E4hlt die Bildmarke f\u00FCr die Signatur. Bsp.\: -e argument.help.help=Zeigt diese Hilfe an argument.help.input=W\u00E4hlt das zu signierende Dokument. Bsp.\: -i +argument.help.keystorealias=W\u00E4hlt das Keystore Key-Alias. Bsp.\: -ksalias argument.help.keystorefile=W\u00E4hlt die Keystore-Datei. Bsp.\: -ks +argument.help.keystorekeypass=W\u00E4hlt das Keystore Key-Password. Bsp.\: -kskeypass +argument.help.keystorestorepass=W\u00E4hlt das Keystore-Password. Bsp.\: -kspass +argument.help.keystoretype=W\u00E4hlt den Keystore-Typ. Bsp.\: -kstype [PKCS12|JKS|JCEKS] argument.help.number=W\u00E4hlt die Telefonnummer f\u00FCr die Handy-BKU. Bsp.\: -n argument.help.output=W\u00E4hlt den Ausgabeordner oder die Ausgabedatei. Bsp.\: -o argument.help.password=W\u00E4hlt das Passwort f\u00FCr die Handy-BKU. Bsp.\: -p @@ -63,7 +67,11 @@ argument.invalid.bku=BKU-Auswahl ung\u00FCltig\! Verwendung\: argument.invalid.config=Konfigurationsdatei ung\u00FCltig\! Verwendung\: argument.invalid.emblem=Bildmarke ung\u00FCltig\! Verwendung\: argument.invalid.input=Dokument ung\u00FCltig\! Verwendung\: +argument.invalid.keystorealias=Keystore-Alias ung\u00FCltig\! Verwendung\: argument.invalid.keystorefile=Keystore-Datei ung\u00FCltig\! Verwendung\: +argument.invalid.keystorekeypass=Keystore Key-Passwort ung\u00FCltig\! Verwendung\: +argument.invalid.keystorestorepass=Keystore-Passwort ung\u00FCltig\! Verwendung\: +argument.invalid.keystoretype=Keystore-Typ ung\u00FCltig\! Verwendung\: argument.invalid.number=Telefonnummer ung\u00FCltig\! Verwendung\: argument.invalid.output=Ausgabeordner ung\u00FCltig\! Verwendung\: argument.invalid.password=Handy-BKU Passwort ung\u00FCltig\! Verwendung\: @@ -113,6 +121,7 @@ error.InvalidLocale=Ung\u00FCltige Sprache error.InvalidPhoneNumber=Telefonnummer ung\u00FCltig\! Beispiel\: +43664123456789 error.InvalidSettings=Ung\u00FCltige Einstellungen vorhanden. Bitte \u00FCberpr\u00FCfen. error.KeyStore=Fehler beim Laden des KeyStores. Falsches Passwort? +error.KeyStoreAlias=Key-Alias %s nicht im Keystore gefunden error.LocalBKU=Bitte pr\u00FCfen sie, ob Ihre lokale BKU (B\u00FCrgerkartenumgebung) l\u00E4uft\n\nSie ben\u00F6tigen eine BKU, um auf Ihre B\u00FCrgerkarte zuzugreifen. Weitere Informationen unter www.buergerkarte.at error.MayNotBeAPDF=Dies ist m\u00F6glicherweise keine PDF-Datei error.NoTan=Keine TAN eingeben -- cgit v1.2.3