From 6ed496c714712b979d12f1eeba7da946e086c925 Mon Sep 17 00:00:00 2001 From: Bryan Bende Date: Fri, 19 Feb 2021 14:53:13 -0500 Subject: [PATCH] NIFI-8242 Ensure NiFi URL for redirects has a trailing slash in AccessResource Signed-off-by: Pierre Villard This closes #4834. --- .../main/java/org/apache/nifi/web/api/AccessResource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java index 73d2141e88..bf4a792357 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java @@ -1611,11 +1611,13 @@ public class AccessResource extends ApplicationResource { private String getNiFiUri() { final String nifiApiUrl = generateResourceUri(); final String baseUrl = StringUtils.substringBeforeLast(nifiApiUrl, "/nifi-api"); - return baseUrl + "/nifi"; + // Note: if the URL does not end with a / then Jetty will end up doing a redirect which can cause + // a problem when being behind a proxy b/c Jetty's redirect doesn't consider proxy headers + return baseUrl + "/nifi/"; } private String getNiFiLogoutCompleteUri() { - return getNiFiUri() + "/logout-complete"; + return getNiFiUri() + "logout-complete"; } private void removeOidcRequestCookie(final HttpServletResponse httpServletResponse) {