aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2018-07-25 13:01:52 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2018-07-25 13:01:52 +0200
commitbdb66f176ee20388f689e994befa10b32b4ddfa3 (patch)
tree4e66088e009067ca7846463854b08e01210ac7f4 /id/server
parent5747beed1a0bdaca413df12ac7d868d6fd9b3188 (diff)
downloadmoa-id-spss-bdb66f176ee20388f689e994befa10b32b4ddfa3.tar.gz
moa-id-spss-bdb66f176ee20388f689e994befa10b32b4ddfa3.tar.bz2
moa-id-spss-bdb66f176ee20388f689e994befa10b32b4ddfa3.zip
some small modifications regarding EAAFCore 1.0.1
Diffstat (limited to 'id/server')
-rw-r--r--id/server/doc/handbook/additional/additional.html20
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java30
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java2
3 files changed, 29 insertions, 23 deletions
diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html
index 557f3d528..98656e962 100644
--- a/id/server/doc/handbook/additional/additional.html
+++ b/id/server/doc/handbook/additional/additional.html
@@ -386,52 +386,52 @@
<td width="1127" valign="top"><p>Identifizierungs- und Authentifizierungsprozess wurde beendet</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4002</p></td>
+ <td width="165" valign="top"><p align="center">4004</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Anmeldeprozess mit Online Vollmachten</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4003</p></td>
+ <td width="165" valign="top"><p align="center">4005</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Anmeldeprozess mit STORK</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4004</p></td>
+ <td width="165" valign="top"><p align="center">4006</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Anmeldeprozess mit Single Sign-On</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4005</p></td>
+ <td width="165" valign="top"><p align="center">4007</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Ung&uuml;ltige Single Sign-On Session</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4006</p></td>
+ <td width="165" valign="top"><p align="center">4008</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Benutzeranfrage f&uuml;r Single Sign-On Verwendung gestellt</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4007</p></td>
+ <td width="165" valign="top"><p align="center">4009</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Benutzerantwort f&uuml;r Single Sign-On Verwendung empfangen</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4008</p></td>
+ <td width="165" valign="top"><p align="center">4010</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>Anmeldeprozess &uuml;ber IDP F&ouml;deration</p></td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4009</p></td>
+ <td width="165" valign="top"><p align="center">4011</p></td>
<td width="312" valign="top"><p align="left">&nbsp;</p></td>
<td width="1127" valign="top"><p>G&uuml;ltige Response von f&ouml;deriertem IDP erhalten</p></td>
</tr>
<tr>
- <td height="30" valign="top">4010</td>
+ <td height="30" valign="top">4012</td>
<td valign="top">EntityID des IDP</td>
<td valign="top">Verwendeter IDP f&uuml;r f&ouml;derierte Anmeldung</td>
</tr>
<tr>
- <td width="165" valign="top"><p align="center">4011</p></td>
+ <td width="165" valign="top"><p align="center">4013</p></td>
<td width="312" valign="top"><p align="left">Service Identifikator</p></td>
<td width="1127" valign="top"><p>Eindeutiger Identifikator der/des Online-Applikation/Service an der/dem die Anmeldung erfolgt</p></td>
</tr>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
index 05d344fb6..d654eb359 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
@@ -23,6 +23,7 @@
package at.gv.egovernment.moa.id.advancedlogging;
import at.gv.egiz.components.eventlog.api.EventConstants;
+import at.gv.egiz.eaaf.core.api.idp.auth.IAuthenticationManager;
/**
* @author tlenz
@@ -51,18 +52,23 @@ public interface MOAIDEventConstants extends EventConstants {
public static final int AUTHPROCESS_SLO_NOT_ALL_VALID = 4403;
//authentication process information
- public static final int AUTHPROCESS_START = 4000;
- public static final int AUTHPROCESS_FINISHED = 4001;
- public static final int AUTHPROCESS_MANDATES_REQUESTED = 4002;
- public static final int AUTHPROCESS_STORK_REQUESTED = 4003;
- public static final int AUTHPROCESS_SSO = 4004;
- public static final int AUTHPROCESS_SSO_INVALID = 4005;
- public static final int AUTHPROCESS_SSO_ASK_USER_START = 4006;
- public static final int AUTHPROCESS_SSO_ASK_USER_FINISHED = 4007;
- public static final int AUTHPROCESS_INTERFEDERATION = 4008;
- public static final int AUTHPROCESS_INTERFEDERATION_REVEIVED = 4009;
- public static final int AUTHPROCESS_INTERFEDERATION_IDP = 4010;
- public static final int AUTHPROCESS_SERVICEPROVIDER = 4011;
+ public static final int AUTHPROCESS_START = IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_STARTED;
+ public static final int AUTHPROCESS_FINISHED = IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_STARTED;
+
+ //reservated
+ //IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_ERROR;
+ //IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_FOR_SP;
+
+ public static final int AUTHPROCESS_MANDATES_REQUESTED = 4004;
+ public static final int AUTHPROCESS_STORK_REQUESTED = 4005;
+ public static final int AUTHPROCESS_SSO = 4006;
+ public static final int AUTHPROCESS_SSO_INVALID = 4007;
+ public static final int AUTHPROCESS_SSO_ASK_USER_START = 4008;
+ public static final int AUTHPROCESS_SSO_ASK_USER_FINISHED = 4009;
+ public static final int AUTHPROCESS_INTERFEDERATION = 4010;
+ public static final int AUTHPROCESS_INTERFEDERATION_REVEIVED = 4011;
+ public static final int AUTHPROCESS_INTERFEDERATION_IDP = 4012;
+ public static final int AUTHPROCESS_SERVICEPROVIDER = 4013;
public static final int AUTHPROCESS_BKUSELECTION_INIT = 4110;
public static final int AUTHPROCESS_BKUTYPE_SELECTED = 4111;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java
index b42a1de28..19f865325 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java
@@ -67,7 +67,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
if(useMandate.equals("true") && attributeConsumer != null) {
if(!CheckMandateAttributes.canHandleMandate(attributeConsumer)) {
MandateAttributesNotHandleAbleException e = new MandateAttributesNotHandleAbleException();
- throw new AuthnRequestValidatorException(e.getErrorId(), e.getParams(), e.getMessage(), pendingReq, e);
+ throw new AuthnRequestValidatorException(e.getErrorId(), e.getParams(), pendingReq, e);
}
}
}