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 ++ 6 files changed, 284 insertions(+) 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 (limited to 'pdf-over-gui/src/main/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); -- cgit v1.2.3