diff options
| author | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-23 11:22:07 +0100 |
|---|---|---|
| committer | Thomas Knall <t.knall@datentechnik-innovation.com> | 2015-01-23 11:34:52 +0100 |
| commit | 745272fe66f04fee6976e6a187e308bb7a5987a1 (patch) | |
| tree | 21d187fcefe3641d287b0d98b7771f6c55231eff /id/server/idserverlib/src/main/resources | |
| parent | 3a00ce9f1f9589f1e97ecd78154f024146ef83d0 (diff) | |
| download | moa-id-spss-745272fe66f04fee6976e6a187e308bb7a5987a1.tar.gz moa-id-spss-745272fe66f04fee6976e6a187e308bb7a5987a1.tar.bz2 moa-id-spss-745272fe66f04fee6976e6a187e308bb7a5987a1.zip | |
Add foreign identity process support (MOAID-61).
- moa-id auth web.xml: Replace servlet mapping "/GetForeignID".
- Fix some javadoc of AuthenticationServer.
- Set GetForeignIDServlet deprecated.
- Remove redundant code across several classes.
- VerifyIdentityLinkTask: Separate identity link verification from subsequent (a) creation of CreateXMLSignatureRequest (ProcessIdentityLinkTask) and (b) creation of InfoBoxReadRequest (CertificateReadRequestTask).
Diffstat (limited to 'id/server/idserverlib/src/main/resources')
| -rw-r--r-- | id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 8ac58bd4b..f3555df2a 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -10,6 +10,9 @@ <pd:Task id="verifyAuthBlock" class="at.gv.egovernment.moa.id.auth.tasks.VerifyAuthenticationBlockTask" async="true" />
<pd:Task id="verifyCertificate" class="at.gv.egovernment.moa.id.auth.tasks.VerifyCertificateTask" async="true" />
<pd:Task id="getMISSessionID" class="at.gv.egovernment.moa.id.auth.tasks.GetMISSessionIDTask" async="true" />
+ <pd:Task id="certificateReadRequest" class="at.gv.egovernment.moa.id.auth.tasks.CertificateReadRequestTask" />
+ <pd:Task id="processIdentityLink" class="at.gv.egovernment.moa.id.auth.tasks.ProcessIdentityLinkTask" />
+ <pd:Task id="getForeignID" class="at.gv.egovernment.moa.id.auth.tasks.GetForeignIDTask" async="true" />
<pd:StartEvent id="start" />
@@ -17,15 +20,21 @@ <pd:Transition from="createIdentityLinkForm" to="verifyIdentityLink" />
- <pd:Transition from="verifyIdentityLink" to="verifyCertificate" conditionExpression="ctx['useMandate']" />
- <pd:Transition from="verifyIdentityLink" to="verifyAuthBlock" />
+ <pd:Transition from="verifyIdentityLink" to="certificateReadRequest" conditionExpression="!ctx['identityLinkFound'] || ctx['useMandate']" />
+ <pd:Transition from="verifyIdentityLink" to="processIdentityLink" />
- <pd:Transition from="verifyCertificate" to="verifyAuthBlock" />
+ <pd:Transition from="processIdentityLink" to="verifyAuthBlock" />
+
+ <pd:Transition from="certificateReadRequest" to="verifyCertificate" />
+
+ <pd:Transition from="verifyCertificate" to="verifyAuthBlock" conditionExpression="ctx['useMandate']" />
+ <pd:Transition from="verifyCertificate" to="getForeignIDTask" />
<pd:Transition from="verifyAuthBlock" to="getMISSessionID" conditionExpression="ctx['useMandate']" />
<pd:Transition from="verifyAuthBlock" to="end" />
<pd:Transition from="getMISSessionID" to="end" />
+ <pd:Transition from="getForeignID" to="end" />
<pd:EndEvent id="end" />
|