1 files changed, 9 insertions, 47 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
index a7b4a5bc7..8f83812a6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
@@ -1,14 +1,10 @@
 package at.gv.egovernment.moa.id.protocols.pvp2x.binding;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
 import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,7 +15,6 @@ import org.apache.velocity.runtime.RuntimeConstants;
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.binding.BasicSAMLMessageContext;
 import org.opensaml.saml2.binding.encoding.HTTPArtifactEncoder;
-import org.opensaml.saml2.binding.encoding.HTTPPostEncoder;
 import org.opensaml.saml2.core.RequestAbstractType;
 import org.opensaml.saml2.core.StatusResponseType;
 import org.opensaml.saml2.metadata.SingleSignOnService;
@@ -28,13 +23,12 @@ import org.opensaml.ws.message.decoder.MessageDecodingException;
 import org.opensaml.ws.message.encoder.MessageEncodingException;
 import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.security.credential.BasicCredential;
-import org.opensaml.xml.security.credential.UsageType;
+import org.opensaml.xml.security.credential.Credential;
 import org.opensaml.xml.signature.Signature;
-import org.opensaml.xml.signature.SignatureConstants;
 
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPAssertionStorage;
-import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
+import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialProvider;
+import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialsNotAvailableException;
 
 public class ArtifactBinding implements IDecoder, IEncoder {
 
@@ -48,30 +42,13 @@ public class ArtifactBinding implements IDecoder, IEncoder {
 	public void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
 			StatusResponseType response, String targetLocation)
 			throws MessageEncodingException, SecurityException {
-		KeyStore keyStore;
-
 		try {
-			keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-
-			FileInputStream inputStream = new FileInputStream(
-					"/home/afitzek/server/moaid_conf/moaid/pvp.ks");
-			keyStore.load(inputStream, "123456".toCharArray());
-			inputStream.close();
-
-			BasicCredential credentials = new BasicCredential();
-			PrivateKey key = (PrivateKey) keyStore.getKey("pvpIDP",
-					"123456".toCharArray());
-			Certificate cert = keyStore.getCertificate("pvpIDP");
-			credentials.setPublicKey(cert.getPublicKey());
-			credentials.setPrivateKey(key);
-			credentials.setUsageType(UsageType.SIGNING);
-
-			Signature signer = SAML2Utils.createSAMLObject(Signature.class);
-			signer.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
-			signer.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-			signer.setSigningCredential(credentials);
+			Credential credentials = CredentialProvider
+					.getIDPSigningCredential();
 
+			Signature signer = CredentialProvider.getIDPSignature(credentials);
 			response.setSignature(signer);
+			
 			VelocityEngine engine = new VelocityEngine();
 			engine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
 			engine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
@@ -100,24 +77,9 @@ public class ArtifactBinding implements IDecoder, IEncoder {
 			context.setOutboundMessageTransport(responseAdapter);
 
 			encoder.encode(context);
-		} catch (KeyStoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (NoSuchAlgorithmException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (CertificateException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (UnrecoverableKeyException e) {
-			// TODO Auto-generated catch block
+		} catch (CredentialsNotAvailableException e) {
 			e.printStackTrace();
+			throw new SecurityException(e);
 		}
 	}