Merge pull request #1627 from baranowb/UNDERTOW-2033_2.3.x

[UNDERTOW-2033] Derive SecurePredicate from connection encryption, ra…
undertow-io · Jul 16, 2024 · b7a5833 · b7a5833
2 parents 297da38 + 6fbe9c4
commit b7a5833
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/java/io/undertow/predicate/SecurePredicate.java b/core/src/main/java/io/undertow/predicate/SecurePredicate.java
@@ -19,11 +19,14 @@
 package io.undertow.predicate;
 
 import io.undertow.server.HttpServerExchange;
+import io.undertow.server.SSLSessionInfo;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
+import javax.net.ssl.SSLSession;
+
 /**
  * @author Stuart Douglas
  */
@@ -33,7 +36,10 @@ public class SecurePredicate implements Predicate {
 
     @Override
     public boolean resolve(HttpServerExchange value) {
-        return value.getRequestScheme().equals("https");
+        final SSLSession session = value.getConnection().getSslSession();
+        final SSLSessionInfo info = value.getConnection().getSslSessionInfo();
+        return (session != null && session.isValid())
+                || (info != null && info.getSSLSession() != null && info.getSSLSession().isValid());
     }
 
     public String toString() {