You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2015/01/12 16:07:32 UTC
camel git commit: NPE fix and make it possible to use a Camel
KeyStoreParameters object with xades
Repository: camel
Updated Branches:
refs/heads/master 55f6734d9 -> 9ea07f899
NPE fix and make it possible to use a Camel KeyStoreParameters object with xades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ea07f89
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ea07f89
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ea07f89
Branch: refs/heads/master
Commit: 9ea07f899e4d58198b10e68131cf532a8042cad6
Parents: 55f6734
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 12 15:06:37 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 12 15:07:07 2015 +0000
----------------------------------------------------------------------
.../api/DefaultXAdESSignatureProperties.java | 44 ++++++++++++++++----
.../processor/XmlVerifierConfiguration.java | 1 -
2 files changed, 36 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ea07f89/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXAdESSignatureProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXAdESSignatureProperties.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXAdESSignatureProperties.java
index 173559d..8b6f52a 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXAdESSignatureProperties.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXAdESSignatureProperties.java
@@ -16,36 +16,55 @@
*/
package org.apache.camel.component.xmlsecurity.api;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.util.jsse.KeyStoreParameters;
+
/**
* Default implementation for the XAdES signature properties which determines
* the Signing Certificate from a keystore and an alias.
*
*/
-public class DefaultXAdESSignatureProperties extends XAdESSignatureProperties {
-
- private KeyStore keystore;
+public class DefaultXAdESSignatureProperties
+ extends XAdESSignatureProperties implements CamelContextAware {
- private String alias;
+ private final KeyStoreAndAlias keyStoreAndAlias = new KeyStoreAndAlias();
+
+ private CamelContext context;
public DefaultXAdESSignatureProperties() {
}
public void setKeystore(KeyStore keystore) {
- this.keystore = keystore;
+ keyStoreAndAlias.setKeyStore(keystore);
}
public void setAlias(String alias) {
- this.alias = alias;
+ keyStoreAndAlias.setAlias(alias);
+ }
+
+ public void setKeyStoreParameters(KeyStoreParameters parameters)
+ throws GeneralSecurityException, IOException {
+ if (parameters != null) {
+ keyStoreAndAlias.setKeyStore(parameters.createKeyStore());
+ }
}
@Override
protected X509Certificate getSigningCertificate() throws Exception { //NOPMD
- X509Certificate cert = (X509Certificate) keystore.getCertificate(alias);
+ if (keyStoreAndAlias.getKeyStore() == null) {
+ throw new XmlSignatureException("No keystore has been configured");
+ }
+ X509Certificate cert =
+ (X509Certificate) keyStoreAndAlias.getKeyStore().getCertificate(keyStoreAndAlias.getAlias());
if (cert == null) {
- throw new XmlSignatureException(String.format("No certificate found in keystore for alias '%s'", alias));
+ throw new XmlSignatureException(
+ String.format("No certificate found in keystore for alias '%s'", keyStoreAndAlias.getAlias()));
}
return cert;
}
@@ -55,4 +74,13 @@ public class DefaultXAdESSignatureProperties extends XAdESSignatureProperties {
return null;
}
+ @Override
+ public CamelContext getCamelContext() {
+ return context;
+ }
+
+ @Override
+ public void setCamelContext(CamelContext context) {
+ this.context = context;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9ea07f89/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
index 4ec50ca..edd43e5 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.xmlsecurity.api.DefaultXmlSignature2Message;
import org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler;
import org.apache.camel.component.xmlsecurity.api.XmlSignature2Message;
import org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker;
-import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
public class XmlVerifierConfiguration extends XmlSignatureConfiguration {