feat(oxtrust): added support for sp logout return url

Signed-off-by: Rolain Djeumen <[email protected]>
GluuFederation · Apr 15, 2024 · ad2068f · ad2068f
1 parent 7408670
commit ad2068f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java b/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java
@@ -127,6 +127,10 @@ public class GluuSAMLTrustRelationship extends InumEntry implements Serializable
 	@AttributeName(name = "oxAuthPostLogoutRedirectURI")
 	private String spLogoutURL;
 
+	@Pattern(regexp = "^$|(^(https?|http)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|])", message = "Please enter a valid url, including protocol (http/https)")
+	@AttributeName(name="spLogoutRedirectUrl")
+	private String spLogoutRedirectUrl;
+
 	@AttributeName(name = "gluuValidationLog")
 	private List<String> validationLog;
 
@@ -367,6 +371,17 @@ public void setSpLogoutURL(String spLogoutURL) {
 		this.spLogoutURL = spLogoutURL;
 	}
 
+	public String getSpLogoutRedirectUrl() {
+
+
+		return spLogoutRedirectUrl;
+	}
+
+	public void setSpLogoutRedirectUrl(String spLogoutRedirectUrl) {
+
+		this.spLogoutRedirectUrl = spLogoutRedirectUrl;
+	}
+
 	public String getSpMetaDataFN() {
 		return spMetaDataFN;
 	}

diff --git a/server/src/main/resources/oxtrust.properties b/server/src/main/resources/oxtrust.properties
@@ -713,6 +713,7 @@ trustmanager.entityID = Entity ID
 trustmanager.spMetadataFile = Sp Metadata File
 trustmanager.spMetadataURL = Sp Metadata URL
 trustmanager.spLogoutURL = SP Logout URL (optional)
+trustmanager.spLogoutRedirectUrl= SP Logout Redirect URL (optional)
 trustmanager.configureRelyingParty = Configure Relying Party
 trustmanager.enableInCommon = Enable InCommon R&amp;S
 trustmanager.released = Released

diff --git a/server/src/main/resources/oxtrust_en.properties b/server/src/main/resources/oxtrust_en.properties
@@ -724,6 +724,7 @@ trustmanager.entityID = Entity ID
 trustmanager.spMetadataFile = Sp Metadata File
 trustmanager.spMetadataURL = Sp Metadata URL
 trustmanager.spLogoutURL = SP Logout URL (optional)
+trustmanager.spLogoutRedirectUrl= SP Logout Redirect URL (optional)
 trustmanager.configureRelyingParty = Configure Relying Party
 trustmanager.enableInCommon = Enable InCommon R&amp;S
 trustmanager.released = Released

diff --git a/server/src/main/resources/oxtrust_fr.properties b/server/src/main/resources/oxtrust_fr.properties
@@ -705,6 +705,7 @@ trustmanager.entityID = Entity ID
 trustmanager.spMetadataFile = Sp Metadata File
 trustmanager.spMetadataURL = Sp Metadata URL
 trustmanager.spLogoutURL = SP Logout URL (optional)
+trustmanager.spLogoutRedirectUrl= SP Logout Redirect URL (optional)
 trustmanager.configureRelyingParty = Configurer un Relying Party
 trustmanager.enableInCommon = Activé InCommon R&amp;S
 trustmanager.released = Libéré

diff --git a/server/src/main/resources/oxtrust_ru.properties b/server/src/main/resources/oxtrust_ru.properties
@@ -675,6 +675,7 @@ trustmanager.entityID = Entity ID
 trustmanager.spMetadataFile = Sp Metadata File
 trustmanager.spMetadataURL = Sp Metadata URL
 trustmanager.spLogoutURL = SP Logout URL (optional)
+trustmanager.spLogoutRedirectUrl= SP Logout Redirect URL (optional)
 trustmanager.configureRelyingParty = Configure Relying Party
 trustmanager.enableInCommon = Enable InCommon R&amp;S
 trustmanager.released = Released

diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml
@@ -310,6 +310,14 @@ input[submit] {
 														id="spLogoutURLId" />
 												</ox:decorate>
 											</h:panelGroup>
+											<h:panelGroup id="spSingleLogoutRedirectUrl">
+												<ox:decorate id="LogoutRedirectUrl"
+												    label="#{msgs['trustmanager.spLogoutRedirectUrl']}">
+													<h:inputText styleClass="form-control"
+													    value="#{_trustRelationship.spLogoutRedirectUrl}" size="40"
+														id="spLogoutRedirectUrlId" />
+												</ox:decorate>
+											</h:panelGroup>
 											<ox:decorate id="configureSpecific"
 												label="#{msgs['trustmanager.configureRelyingParty']}">
 												<h:panelGrid columns="2" width="100%">