SRA: avoid relying on Spring Web's ForwardedHeaderUtils

Author: ilgrosso

client/idrepo/console/pom.xml

@@ -93,11 +93,6 @@ under the License.
       <artifactId>bcprov-jdk18on</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.nimbusds</groupId>
-      <artifactId>nimbus-jose-jwt</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>font-awesome</artifactId>

sra/src/main/java/org/apache/syncope/sra/security/cas/CASUtils.java

@@ -24,7 +24,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.util.ForwardedHeaderUtils;
+import org.springframework.web.util.UriComponentsBuilder;
 import reactor.core.publisher.Mono;
 
 public final class CASUtils {
@@ -54,8 +54,7 @@ public static ServerWebExchangeMatcher ticketAvailable(final Protocol protocol)
     }
 
     public static String constructServiceUrl(final ServerWebExchange exchange, final Protocol protocol) {
-        return ForwardedHeaderUtils.
-                adaptFromForwardedHeaders(exchange.getRequest().getURI(), exchange.getRequest().getHeaders()).
+        return UriComponentsBuilder.fromUri(exchange.getRequest().getURI()).
                 replaceQueryParam(protocol.getArtifactParameterName()).
                 build().
                 toUriString();

sra/src/main/java/org/apache/syncope/sra/security/pac4j/ServerWebExchangeContext.java

@@ -32,7 +32,6 @@
 import org.springframework.http.ResponseCookie;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.util.ForwardedHeaderUtils;
 
 public class ServerWebExchangeContext implements WebContext {
 
@@ -144,20 +143,17 @@ public String getProtocol() {
 
     @Override
     public String getServerName() {
-        return ForwardedHeaderUtils.adaptFromForwardedHeaders(
-                exchange.getRequest().getURI(), exchange.getRequest().getHeaders()).build().getHost();
+        return exchange.getRequest().getURI().getHost();
     }
 
     @Override
     public int getServerPort() {
-        return ForwardedHeaderUtils.adaptFromForwardedHeaders(
-                exchange.getRequest().getURI(), exchange.getRequest().getHeaders()).build().getPort();
+        return exchange.getRequest().getURI().getPort();
     }
 
     @Override
     public String getScheme() {
-        return ForwardedHeaderUtils.adaptFromForwardedHeaders(
-                exchange.getRequest().getURI(), exchange.getRequest().getHeaders()).build().getScheme();
+        return exchange.getRequest().getURI().getScheme();
     }
 
     @Override
@@ -167,8 +163,7 @@ public boolean isSecure() {
 
     @Override
     public String getFullRequestURL() {
-        return ForwardedHeaderUtils.adaptFromForwardedHeaders(
-                exchange.getRequest().getURI(), exchange.getRequest().getHeaders()).build().toUriString();
+        return exchange.getRequest().getURI().toString();
     }
 
     @Override

sra/src/main/resources/sra.properties

@@ -19,6 +19,7 @@ spring.groovy.template.check-template-location=false
 spring.main.banner-mode=log
 
 server.port=8080
+server.forward-headers-strategy=NATIVE
 
 management.endpoint.gateway.access=UNRESTRICTED
 management.endpoints.web.exposure.include=info,health,loggers,metrics,gateway,sraSessions