From 60e1e9ce8adbeaa76af8a9931e9656ad86cb8769 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 6 Oct 2021 11:34:45 +0200
Subject: fix wrong or messing log messages

---
 .../src/main/resources/messages/pvp_messages.properties               | 2 ++
 .../at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/resources/messages/pvp_messages.properties b/eaaf_modules/eaaf_module_pvp2_core/src/main/resources/messages/pvp_messages.properties
index 824f17d4..b76b2d52 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/resources/messages/pvp_messages.properties
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/resources/messages/pvp_messages.properties
@@ -17,6 +17,8 @@ internal.pvp.15=SAML2 assertion validator: {0} find NO valid assertion in SAML2
 internal.pvp.16=Decryption of SAML2 assertion FAILED with reason: {0}
 internal.pvp.17=SAML2 assertion validator:{0} find invalid PVP Response from Issuer:{1}. StatusCodes:{2} Msg:{3}
 
+pvp2.09=SAML2 request contains an unsupported operation. (OperationId: {0})
+pvp2.20=SAML2 Authn. request contains an unknown or empty EntityID.
 pvp2.21=Signature validation of SAML2 Authn. request failed. Reason: {0}
 pvp2.22=Validation of SAML2 Authn. request failed. Reason: {0}
 pvp2.24=General error during SAML2 Auth. request pre-processing. Reason: {0}
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
index afef878b..85977193 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
@@ -274,7 +274,7 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
             pendingReq.getUniqueTransactionIdentifier());
       }
 
-      throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
+      throw new InvalidProtocolRequestException("pvp2.21", new Object[] {e.getMessage()});
 
     } catch (final Pvp2Exception e) {
       final String samlRequest = req.getParameter(HTTP_PARAM_SAMLREQ);
@@ -348,7 +348,7 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
             pendingReq.getUniqueTransactionIdentifier());
       }
 
-      throw new InvalidProtocolRequestException("pvp2.21", new Object[] {});
+      throw new InvalidProtocolRequestException("pvp2.21", new Object[] {e.getMessage()});
 
     } catch (final Pvp2Exception e) {
       final String samlRequest = req.getParameter(HTTP_PARAM_SAMLREQ);
-- 
cgit v1.2.3