1 files changed, 26 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
index 3d2bd33b0..c18296383 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
@@ -8,9 +8,13 @@ import org.opensaml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry
 import org.opensaml.saml2.core.ArtifactResolve;
 import org.opensaml.saml2.core.ArtifactResponse;
 
+import at.gv.egovernment.moa.id.MOAIDException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPAssertionStorage;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.MOARequest;
+import at.gv.egovernment.moa.id.protocols.pvp2x.binding.SoapBinding;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.RequestDeniedException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
+import at.gv.egovernment.moa.logging.Logger;
 
 public class ArtifactResolution implements IRequestHandler {
 
@@ -19,24 +23,33 @@ public class ArtifactResolution implements IRequestHandler {
 	}
 
 	public void process(MOARequest obj, HttpServletRequest req,
-			HttpServletResponse resp) {
-		if(!handleObject(obj)) {
-			// TODO: throw exception
-			return;
+			HttpServletResponse resp) throws MOAIDException {
+		if (!handleObject(obj)) {
+			throw new MOAIDException("pvp2.13", null);
 		}
-		
-		ArtifactResolve artifactResolve = (ArtifactResolve)obj.getSamlRequest();
+
+		ArtifactResolve artifactResolve = (ArtifactResolve) obj
+				.getSamlRequest();
 		String artifactID = artifactResolve.getArtifact().getArtifact();
-		
+
 		PVPAssertionStorage pvpAssertion = PVPAssertionStorage.getInstance();
-		if(!pvpAssertion.contains(artifactID)) {
-			// TODO: send not found ...
+
+		if (!pvpAssertion.contains(artifactID)) {
+			throw new RequestDeniedException();
 		} else {
-			SAMLArtifactMapEntry assertion = pvpAssertion.get(artifactID);
-			ArtifactResponse response = SAML2Utils.createSAMLObject(ArtifactResponse.class);
-			response.setMessage(assertion.getSamlMessage());
-			response.setIssueInstant(new DateTime());
+			try {
+				SAMLArtifactMapEntry assertion = pvpAssertion.get(artifactID);
+				ArtifactResponse response = SAML2Utils
+						.createSAMLObject(ArtifactResponse.class);
+				response.setMessage(assertion.getSamlMessage());
+				response.setIssueInstant(new DateTime());
+				SoapBinding encoder = new SoapBinding();
+				encoder.encodeRespone(req, resp, response, null);
+			} catch (Exception e) {
+				Logger.error("Failed to resolve artifact", e);
+			}
 		}
+
 	}
 
 }