From cb57226d20f61b33e485144f2814edcd36589d5e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 10 Feb 2017 08:30:01 +0100
Subject: update eIDAS specific revisionslog entries

---
 id/server/doc/handbook/additional/additional.html         | 15 +++++++++++++++
 .../egovernment/moa/id/auth/modules/eidas/Constants.java  |  2 --
 .../egovernment/moa/id/protocols/eidas/EIDASProtocol.java |  3 ++-
 .../id/protocols/eidas/eIDASAuthenticationRequest.java    |  3 ++-
 4 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'id')

diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html
index ec57a74c6..9e3cdf11e 100644
--- a/id/server/doc/handbook/additional/additional.html
+++ b/id/server/doc/handbook/additional/additional.html
@@ -360,6 +360,21 @@
       <td width="312" valign="top"><p align="left">&nbsp;</p></td>
       <td width="1127" valign="top"><p>SAML1 StartAuthentication Request</p></td>
     </tr>
+    <tr>
+      <td valign="top">3400</td>
+      <td valign="top">&nbsp;</td>
+      <td valign="top">eIDAS Metadata Request</td>
+    </tr>
+    <tr>
+      <td valign="top">3401</td>
+      <td valign="top">Request ID</td>
+      <td valign="top">Eingehender eIDAS Authentication Request</td>
+    </tr>
+    <tr>
+      <td valign="top">3402</td>
+      <td valign="top">Response ID</td>
+      <td valign="top">eIDAS Authentication Response erstellt</td>
+    </tr>
     <tr>
       <td width="165" valign="top"><p align="center">4000</p></td>
       <td width="312" valign="top"><p align="left">&nbsp;</p></td>
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
index 6cb4d6add..369d77863 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/Constants.java
@@ -98,8 +98,6 @@ public class Constants {
 	public static final int eIDAS_REVERSIONSLOG_METADATA = 3400;
 	public static final int eIDAS_REVERSIONSLOG_IDP_AUTHREQUEST = 3401;
 	public static final int eIDAS_REVERSIONSLOG_IDP_AUTHRESPONSE = 3402;
-	public static final int eIDAS_REVERSIONSLOG_SP_AUTHREQUEST= 3403;
-	public static final int eIDAS_REVERSIONSLOG_SP_AUTHRESPONSE= 3404;
 		
 	//metadata constants
 //    public final static Map<String, EidasAttributesTypes> METADATA_POSSIBLE_ATTRIBUTES = Collections.unmodifiableMap(
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASProtocol.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASProtocol.java
index 589cd9654..388d65963 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASProtocol.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASProtocol.java
@@ -151,7 +151,8 @@ public class EIDASProtocol extends AbstractAuthProtocolModulController {
 		//preProcess eIDAS request
 		preProcess(req, resp, pendingReq);
 		
-		revisionsLogger.logEvent(pendingReq, Constants.eIDAS_REVERSIONSLOG_IDP_AUTHREQUEST);
+		revisionsLogger.logEvent(pendingReq, Constants.eIDAS_REVERSIONSLOG_IDP_AUTHREQUEST,
+				pendingReq.getEidasRequest().getId());
 		
 		//AuthnRequest needs authentication
 		pendingReq.setNeedAuthentication(true);
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
index 26a171ba8..2fe52bb4f 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/eIDASAuthenticationRequest.java
@@ -252,7 +252,8 @@ public class eIDASAuthenticationRequest implements IAction {
 			
 		}
 		
-		revisionsLogger.logEvent(req, Constants.eIDAS_REVERSIONSLOG_IDP_AUTHREQUEST);
+		revisionsLogger.logEvent(req, Constants.eIDAS_REVERSIONSLOG_IDP_AUTHRESPONSE,
+				eIDASRespMsg.getResponse().getId());
 		
 		// send the response
         try {
-- 
cgit v1.2.3