[sling-whiteboard] branch master updated: oidc-rp: try to detect https requests when behind a TLS terminating proxy

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 25e1b971 oidc-rp: try to detect https requests when behind a TLS 
terminating proxy
25e1b971 is described below

commit 25e1b97138292239cb635c965308c334ecc580bf
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Tue Jul 4 16:57:06 2023 +0300

    oidc-rp: try to detect https requests when behind a TLS terminating proxy
---
 .../apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImpl.java
 
b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImpl.java
index 8e429815..c54d986b 100644
--- 
a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImpl.java
+++ 
b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImpl.java
@@ -166,7 +166,10 @@ public class OidcConnectionFinderImpl implements 
OidcConnectionFinder, OidcConne
     @Override
     public URI getOidcEntryPointUri(OidcConnection connection, 
SlingHttpServletRequest request, String redirectPath) {
         StringBuilder uri = new StringBuilder();
-        
uri.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(request.getServerPort())
+        String scheme = request.getScheme();
+        if ( "http".equals(scheme) && request.isSecure() )
+            scheme = "https";
+        
uri.append(scheme).append("://").append(request.getServerName()).append(":").append(request.getServerPort())
             
.append(OidcEntryPointServlet.PATH).append("?c=").append(connection.name());
         if ( redirectPath != null )
             uri.append("?redirect=").append(URLEncoder.encode(redirectPath, 
StandardCharsets.UTF_8));