aboutsummaryrefslogtreecommitdiff
path: root/id/server/modules/module-stork/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-01-13 08:36:55 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-01-13 08:36:55 +0100
commitfc19526f8e32ad2de2df5ea60263f8d1c2355b88 (patch)
tree11fa54ea89f0566995a067171118078a2dbab711 /id/server/modules/module-stork/src/main/java
parent05e959fac7cca57540a768afb81fb06c3a0ae121 (diff)
parent29f01a4975f637c26fbcd0b43a9c844d7d3d2e54 (diff)
downloadmoa-id-spss-fc19526f8e32ad2de2df5ea60263f8d1c2355b88.tar.gz
moa-id-spss-fc19526f8e32ad2de2df5ea60263f8d1c2355b88.tar.bz2
moa-id-spss-fc19526f8e32ad2de2df5ea60263f8d1c2355b88.zip
Merge branch 'eSense_eIDAS_development' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into eSense_eIDAS_development
Diffstat (limited to 'id/server/modules/module-stork/src/main/java')
-rw-r--r--id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
index 901762f17..7c178d97e 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
@@ -41,9 +41,10 @@ import eu.stork.peps.auth.commons.PersonalAttribute;
import eu.stork.peps.auth.commons.PersonalAttributeList;
import eu.stork.peps.auth.commons.STORKAuthnRequest;
import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.auth.engine.core.CitizenCountryCode;
import eu.stork.peps.exceptions.STORKSAMLEngineException;
-
import at.gv.egovernment.moa.id.auth.BaseAuthenticationServer;
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
import at.gv.egovernment.moa.id.auth.builder.CreateXMLSignatureRequestBuilder;
import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
import at.gv.egovernment.moa.id.auth.data.AuthenticationSessionStorageConstants;
@@ -127,6 +128,9 @@ public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask {
AuthenticationSession moasession = BaseAuthenticationServer.getSession(sessionID);
IRequest pendingReq = RequestStorage.getPendingRequest(pendingRequestID);
+ // bugfix: the new task system fails to initialize the CCC - set it here
+ moasession.setCcc((String) executionContext.get(MOAIDAuthConstants.PARAM_CCC));
+
if (StringUtils.isEmpty(moasession.getCcc())) {
// illegal state; task should not have been executed without a selected country
throw new AuthenticationException("stork.22", new Object[] { sessionID });