add result decryption for SL2.0 authentication module

2 files changed, 6 insertions, 11 deletions

diff --git a/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/CreateQualeIDRequestTask.java b/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/CreateQualeIDRequestTask.java
index 1e15e893e..b1dfa9b0d 100644
--- a/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/CreateQualeIDRequestTask.java
+++ b/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/CreateQualeIDRequestTask.java
@@ -1,6 +1,5 @@
 package at.gv.egovernment.moa.id.auth.modules.sl20_auth.tasks;
 
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -16,7 +15,6 @@ import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,8 +76,6 @@ public class CreateQualeIDRequestTask extends AbstractAuthServletTask {
 				//build DataURL for qualified eID response
 				String dataURL = new DataURLBuilder().buildDataURL(
 						pendingReq.getAuthURL(), Constants.HTTP_ENDPOINT_DATAURL, pendingReq.getRequestID());
-//				String dataURL = new DataURLBuilder().buildDataURL(
-//						"http://labda.iaik.tugraz.at:8080/moa-id-auth/", Constants.HTTP_ENDPOINT_DATAURL, pendingReq.getRequestID());
 				
 				//build qualifiedeID command
 				Map<String, String> qualifiedeIDParams = new HashMap<String, String>();
@@ -146,6 +142,7 @@ public class CreateQualeIDRequestTask extends AbstractAuthServletTask {
 					requestStoreage.storePendingRequest(pendingReq);
 
 					//forward SL2.0 command
+					//TODO: maybe add SL2ClientType Header from execution context
 					SL20HttpBindingUtils.writeIntoResponse(request, response, sl20Forward, redirectURL);
 													
 				} else {
diff --git a/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/ReceiveQualeIDTask.java b/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/ReceiveQualeIDTask.java
index 6d2163ff1..698546a4f 100644
--- a/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/ReceiveQualeIDTask.java
+++ b/id/server/modules/moa-id-module-sl20_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/tasks/ReceiveQualeIDTask.java
@@ -92,7 +92,6 @@ public class ReceiveQualeIDTask extends AbstractAuthServletTask {
 			
 			
 			//validate signature
-			//TODO:
 			VerificationResult payLoadContainer = SL20JSONExtractorUtils.extractSL20PayLoad(sl20ReqObj, joseTools, true);
 			if (payLoadContainer.isValidSigned() == null || 
 					!payLoadContainer.isValidSigned()) {
@@ -104,6 +103,7 @@ public class ReceiveQualeIDTask extends AbstractAuthServletTask {
 			//TODO validate certificate
 			List<X509Certificate> sigCertChain = payLoadContainer.getCertChain();
 			
+			
 			//extract payloaf
 			JsonObject payLoad = payLoadContainer.getPayload();
 			
@@ -112,12 +112,10 @@ public class ReceiveQualeIDTask extends AbstractAuthServletTask {
 					payLoad, SL20Constants.SL20_COMMAND_CONTAINER_NAME, true)
 						.equals(SL20Constants.SL20_COMMAND_IDENTIFIER_QUALIFIEDEID)) {
 				Logger.debug("Find " + SL20Constants.SL20_COMMAND_IDENTIFIER_QUALIFIEDEID + " result .... ");
-				
-				
-				//TODO: add decryption
-				JsonElement qualeIDResult = SL20JSONExtractorUtils.extractSL20Result(payLoad, null, false);
-				
-				
+								
+				//TODO: activate decryption in 'SL20JSONExtractorUtils.extractSL20Result'
+				JsonElement qualeIDResult = SL20JSONExtractorUtils.extractSL20Result(payLoad, joseTools, false);
+								
 				//extract attributes from result
 				String idlB64 = SL20JSONExtractorUtils.getStringValue(qualeIDResult.getAsJsonObject(), 
 										SL20Constants.SL20_COMMAND_PARAM_EID_RESULT_IDL, true);