From 41dfc9938c5e5da2dfeed251c37865a72d115f75 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 1 Mar 2021 19:40:12 +0100
Subject: change endpoints for protocol-finalization controller and add basic
modul for end-points
---
.../idp/auth/services/ProtocolAuthenticationService.java | 4 ++--
.../idp/controller/ProtocolFinalizationController.java | 6 ++++--
.../at/gv/egiz/eaaf/core/api/data/EaafConstants.java | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
index 925d6fe2..abb3d685 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
@@ -560,7 +560,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
private IGuiBuilderConfiguration evaluateRequiredErrorHandlingMethod(IRequest first, String errorId) {
if (first != null && first.isProcessInIframe()) {
return guiConfigFactory.getDefaultIFrameParentHopGui(first,
- "/" + ProtocolFinalizationController.ENDPOINT_ERRORHANDLING,
+ ProtocolFinalizationController.ENDPOINT_ERRORHANDLING,
errorId);
}
@@ -571,7 +571,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
private String generateErrorRedirectUrl(final HttpServletRequest req, String errorKey) {
String redirectUrl = null;
redirectUrl = ServletUtils.getBaseUrl(req);
- redirectUrl += "/" + ProtocolFinalizationController.ENDPOINT_ERRORHANDLING + "?"
+ redirectUrl += ProtocolFinalizationController.ENDPOINT_ERRORHANDLING + "?"
+ EaafConstants.PARAM_HTTP_ERROR_CODE + "=" + errorKey;
return redirectUrl;
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index 4ff41836..6a566f00 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -52,8 +52,10 @@ import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
@Controller
public class ProtocolFinalizationController extends AbstractController {
private static final Logger log = LoggerFactory.getLogger(ProtocolFinalizationController.class);
- public static final String ENDPOINT_FINALIZEPROTOCOL = "finalizeAuthProtocol";
- public static final String ENDPOINT_ERRORHANDLING = "errorHandling";
+ public static final String ENDPOINT_FINALIZEPROTOCOL =
+ EaafConstants.ENDPOINT_PREFIX_SECURED + "/finalizeAuthProtocol";
+ public static final String ENDPOINT_ERRORHANDLING =
+ EaafConstants.ENDPOINT_PREFIX_SECURED + "/errorHandling";
@Autowired(required = true)
IRequestStorage requestStorage;
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
index 1bbfe1b7..82749b81 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/EaafConstants.java
@@ -27,6 +27,22 @@ public class EaafConstants {
public static final String CONTENTTYPE_HTML_UTF8 = "text/html; charset=UTF-8";
+ // common http end-point prefixes
+ /**
+ * Public end-points without any access restriction.
+ */
+ public static final String ENDPOINT_PREFIX_PUBLIC = "/public";
+
+ /**
+ * Public end-points with access restriction, like AccessToken, PendingRequestIds, ...
+ */
+ public static final String ENDPOINT_PREFIX_SECURED = "/public/secure";
+
+ /**
+ * Non public end-points that allow restriction on network level.
+ */
+ public static final String ENDPOINT_PREFIX_RESTRICTED = "/restricted";
+
// http request parameters for process management
public static final String PARAM_HTTP_TARGET_PENDINGREQUESTID = "pendingid";
public static final String PARAM_HTTP_ERROR_CODE = "errorid";
--
cgit v1.2.3
From 4bb06aa415b2c46bcf46c0b8d951145f208a9cb0 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 1 Mar 2021 19:42:59 +0100
Subject: switch to next snapshot version because end-point update maybe brakes
other projects
---
build_reporting/pom.xml | 2 +-
eaaf-springboot-utils/pom.xml | 2 +-
eaaf_core/pom.xml | 2 +-
eaaf_core_api/pom.xml | 2 +-
eaaf_core_utils/pom.xml | 2 +-
eaaf_modules/eaaf_module_auth_sl20/pom.xml | 2 +-
eaaf_modules/eaaf_module_moa-sig/pom.xml | 2 +-
eaaf_modules/eaaf_module_pvp2_core/pom.xml | 2 +-
eaaf_modules/eaaf_module_pvp2_idp/pom.xml | 2 +-
eaaf_modules/eaaf_module_pvp2_sp/pom.xml | 2 +-
eaaf_modules/pom.xml | 2 +-
pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/build_reporting/pom.xml b/build_reporting/pom.xml
index fd0625d0..1f9bb9fc 100644
--- a/build_reporting/pom.xml
+++ b/build_reporting/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>build_reporting</artifactId>
<packaging>pom</packaging>
diff --git a/eaaf-springboot-utils/pom.xml b/eaaf-springboot-utils/pom.xml
index 0200add8..0846b1ca 100644
--- a/eaaf-springboot-utils/pom.xml
+++ b/eaaf-springboot-utils/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf-springboot-utils</artifactId>
diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml
index 81c98398..2e9023a6 100644
--- a/eaaf_core/pom.xml
+++ b/eaaf_core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
diff --git a/eaaf_core_api/pom.xml b/eaaf_core_api/pom.xml
index 8791c5a9..7ee6cac5 100644
--- a/eaaf_core_api/pom.xml
+++ b/eaaf_core_api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_core_api</artifactId>
diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml
index 7e155680..4e3bbeee 100644
--- a/eaaf_core_utils/pom.xml
+++ b/eaaf_core_utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_core_utils</artifactId>
diff --git a/eaaf_modules/eaaf_module_auth_sl20/pom.xml b/eaaf_modules/eaaf_module_auth_sl20/pom.xml
index 89cb3e38..b9c64873 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/pom.xml
+++ b/eaaf_modules/eaaf_module_auth_sl20/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_modules</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>eaaf_module_auth_sl20</artifactId>
<name>Generic SL2.0 authentication</name>
diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml
index 30bb1221..178de6e4 100644
--- a/eaaf_modules/eaaf_module_moa-sig/pom.xml
+++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_modules</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>eaaf_module_moa-sig</artifactId>
<name>MOA-Sig signature verification module</name>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 4a91c871..ee20ef56 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_modules</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>eaaf_module_pvp2_core</artifactId>
<name>eaaf_module_pvp2_core</name>
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
index 53e75e09..47d2d8e4 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_modules</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>eaaf_module_pvp2_idp</artifactId>
<name>eaaf_module_pvp2_idp</name>
diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
index d6bd17dc..d1914ef6 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_modules</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<artifactId>eaaf_module_pvp2_sp</artifactId>
<name>eaaf_module_pvp2_sp</name>
diff --git a/eaaf_modules/pom.xml b/eaaf_modules/pom.xml
index ac48d112..56e865a7 100644
--- a/eaaf_modules/pom.xml
+++ b/eaaf_modules/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
diff --git a/pom.xml b/pom.xml
index 8848df24..c43076fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.12-SNAPSHOT</version>
+ <version>1.1.13-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EGIZ EAAF components</name>
--
cgit v1.2.3