support Principal auth on http2 streams

robaho · robaho · commit e8f6e541a90c · 2025-01-11T10:06:51.000-06:00
diff --git a/src/main/java/robaho/net/httpserver/AuthFilter.java b/src/main/java/robaho/net/httpserver/AuthFilter.java
@@ -28,6 +28,7 @@
 import com.sun.net.httpserver.*;
 
 import java.io.*;
+import java.security.Principal;
 
 public class AuthFilter extends Filter {
 
@@ -61,7 +62,7 @@ public void doFilter(HttpExchange t, Filter.Chain chain) throws IOException {
             Authenticator.Result r = authenticator.authenticate(t);
             if (r instanceof Authenticator.Success) {
                 Authenticator.Success s = (Authenticator.Success) r;
-                ExchangeImpl e = ExchangeImpl.get(t);
+                PrincipalExchange e = (PrincipalExchange)t;
                 e.setPrincipal(s.getPrincipal());
                 chain.doFilter(t);
             } else if (r instanceof Authenticator.Retry) {
@@ -77,4 +78,9 @@ public void doFilter(HttpExchange t, Filter.Chain chain) throws IOException {
             chain.doFilter(t);
         }
     }
+
+    static interface PrincipalExchange {
+        public void setPrincipal(HttpPrincipal p);
+        public Principal getPrincipal();
+    }
 }
diff --git a/src/main/java/robaho/net/httpserver/ExchangeImpl.java b/src/main/java/robaho/net/httpserver/ExchangeImpl.java
@@ -433,15 +433,6 @@ public HttpPrincipal getPrincipal() {
     void setPrincipal(HttpPrincipal principal) {
         this.principal = principal;
     }
-
-    static ExchangeImpl get(HttpExchange t) {
-        if (t instanceof HttpExchangeImpl) {
-            return ((HttpExchangeImpl) t).getExchangeImpl();
-        } else {
-            assert t instanceof HttpsExchangeImpl;
-            return ((HttpsExchangeImpl) t).getExchangeImpl();
-        }
-    }
 }
 
 /**
diff --git a/src/main/java/robaho/net/httpserver/Http2ExchangeImpl.java b/src/main/java/robaho/net/httpserver/Http2ExchangeImpl.java
@@ -6,22 +6,24 @@
 import java.net.InetSocketAddress;
 import java.net.URI;
 
+import javax.net.ssl.SSLSession;
+
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
-import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpPrincipal;
+import com.sun.net.httpserver.HttpsExchange;
 
 import robaho.net.httpserver.http2.HTTP2Stream;
 
-public class Http2ExchangeImpl extends HttpExchange {
+public class Http2ExchangeImpl extends HttpsExchange implements AuthFilter.PrincipalExchange {
     private final Headers request;
     private final Headers response;
     private final InputStream in;
     private final OutputStream out;
     private final URI uri;
     private final String method;
     private final HttpContext ctx;
-    private final HTTP2Stream stream;
+    protected final HTTP2Stream stream;
     private HttpPrincipal principal;
     private int responseCode;
 
@@ -130,4 +132,14 @@ public void setStreams(InputStream i, OutputStream o) {
     public HttpPrincipal getPrincipal() {
         return principal;
     }
+
+    @Override
+    public SSLSession getSSLSession() {
+        return stream.getSSLSession();
+    }
+
+    @Override
+    public void setPrincipal(HttpPrincipal p) {
+        principal = p;
+    }
 }
diff --git a/src/main/java/robaho/net/httpserver/HttpConnection.java b/src/main/java/robaho/net/httpserver/HttpConnection.java
@@ -78,7 +78,7 @@ public void debug() {
         logger.log(Level.INFO,toString()+", inRequest "+inRequest+", request count "+requestCount.get());
     }
 
-    SSLSession getSSLSession() {
+    public SSLSession getSSLSession() {
         return (socket instanceof SSLSocket ssl) ? ssl.getHandshakeSession() : null;
     }
 
diff --git a/src/main/java/robaho/net/httpserver/HttpExchangeImpl.java b/src/main/java/robaho/net/httpserver/HttpExchangeImpl.java
@@ -27,9 +27,10 @@
 
 import java.io.*;
 import java.net.*;
+
 import com.sun.net.httpserver.*;
 
-class HttpExchangeImpl extends HttpExchange {
+class HttpExchangeImpl extends HttpExchange implements AuthFilter.PrincipalExchange {
 
     ExchangeImpl impl;
 
@@ -105,8 +106,8 @@ public void setStreams(InputStream i, OutputStream o) {
     public HttpPrincipal getPrincipal() {
         return impl.getPrincipal();
     }
-
-    ExchangeImpl getExchangeImpl() {
-        return impl;
+    @Override
+    public void setPrincipal(HttpPrincipal p) {
+        impl.setPrincipal(p);
     }
 }
diff --git a/src/main/java/robaho/net/httpserver/HttpsExchangeImpl.java b/src/main/java/robaho/net/httpserver/HttpsExchangeImpl.java
@@ -37,7 +37,7 @@
 import com.sun.net.httpserver.HttpPrincipal;
 import com.sun.net.httpserver.HttpsExchange;
 
-class HttpsExchangeImpl extends HttpsExchange {
+class HttpsExchangeImpl extends HttpsExchange implements AuthFilter.PrincipalExchange {
 
     ExchangeImpl impl;
 
@@ -118,7 +118,8 @@ public HttpPrincipal getPrincipal() {
         return impl.getPrincipal();
     }
 
-    ExchangeImpl getExchangeImpl() {
-        return impl;
+    @Override
+    public void setPrincipal(HttpPrincipal p) {
+        impl.setPrincipal(p);
     }
 }
diff --git a/src/main/java/robaho/net/httpserver/http2/HTTP2Stream.java b/src/main/java/robaho/net/httpserver/http2/HTTP2Stream.java
@@ -13,6 +13,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.LockSupport;
 
+import javax.net.ssl.SSLSession;
+
 import com.sun.net.httpserver.Headers;
 
 import robaho.net.httpserver.NoSyncBufferedOutputStream;
@@ -106,10 +108,15 @@ public void debug() {
     public boolean isOpen() {
         return streamOpen;
     }
+
     public boolean isHalfClosed() {
         return halfClosed;
     }
 
+    public SSLSession getSSLSession() {
+        return connection.httpConnection.getSSLSession();
+    }
+
     private long expectedSize() {
         if(requestHeaders.containsKey("Content-length")) {
             return Long.parseLong(requestHeaders.getFirst("Content-length"));
diff --git a/src/test/java_default/HttpExchange/AutoCloseableHttpExchange.java b/src/test/java_default/HttpExchange/AutoCloseableHttpExchange.java
@@ -32,7 +32,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import jdk.test.lib.net.URIBuilder;
-import robaho.net.httpserver.HttpExchangeAccess;
 
 /**
  * @test
@@ -67,8 +66,10 @@ public void handle(HttpExchange t) throws IOException {
                     ;
                 t.sendResponseHeaders(200, -1);
             }
-            if (!HttpExchangeAccess.isClosed(t)) {
+            try {
+                t.getResponseBody().write("somedata".getBytes());
                 exchangeCloseFail.set(true);
+            } catch (IOException expected) {
             }
             latch.countDown();
         }
diff --git a/src/test/java_default/HttpExchange/robaho/net/httpserver/HttpExchangeAccess.java b/src/test/java_default/HttpExchange/robaho/net/httpserver/HttpExchangeAccess.java

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void debug() {`
`78`	`78`	`logger.log(Level.INFO,toString()+", inRequest "+inRequest+", request count "+requestCount.get());`
`79`	`79`	`}`
`80`	`80`
`81`		`- SSLSession getSSLSession() {`
	`81`	`+ public SSLSession getSSLSession() {`
`82`	`82`	`return (socket instanceof SSLSocket ssl) ? ssl.getHandshakeSession() : null;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,10 @@`
`27`	`27`
`28`	`28`	`import java.io.*;`
`29`	`29`	`import java.net.*;`
	`30`	`+`
`30`	`31`	`import com.sun.net.httpserver.*;`
`31`	`32`
`32`		`-class HttpExchangeImpl extends HttpExchange {`
	`33`	`+class HttpExchangeImpl extends HttpExchange implements AuthFilter.PrincipalExchange {`
`33`	`34`
`34`	`35`	`ExchangeImpl impl;`
`35`	`36`
`@@ -105,8 +106,8 @@ public void setStreams(InputStream i, OutputStream o) {`
`105`	`106`	`public HttpPrincipal getPrincipal() {`
`106`	`107`	`return impl.getPrincipal();`
`107`	`108`	`}`
`108`		`-`
`109`		`- ExchangeImpl getExchangeImpl() {`
`110`		`- return impl;`
	`109`	`+ @Override`
	`110`	`+ public void setPrincipal(HttpPrincipal p) {`
	`111`	`+ impl.setPrincipal(p);`
`111`	`112`	`}`
`112`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`import com.sun.net.httpserver.HttpPrincipal;`
`38`	`38`	`import com.sun.net.httpserver.HttpsExchange;`
`39`	`39`
`40`		`-class HttpsExchangeImpl extends HttpsExchange {`
	`40`	`+class HttpsExchangeImpl extends HttpsExchange implements AuthFilter.PrincipalExchange {`
`41`	`41`
`42`	`42`	`ExchangeImpl impl;`
`43`	`43`
`@@ -118,7 +118,8 @@ public HttpPrincipal getPrincipal() {`
`118`	`118`	`return impl.getPrincipal();`
`119`	`119`	`}`
`120`	`120`
`121`		`- ExchangeImpl getExchangeImpl() {`
`122`		`- return impl;`
	`121`	`+ @Override`
	`122`	`+ public void setPrincipal(HttpPrincipal p) {`
	`123`	`+ impl.setPrincipal(p);`
`123`	`124`	`}`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`import java.util.concurrent.atomic.AtomicBoolean;`
`33`	`33`
`34`	`34`	`import jdk.test.lib.net.URIBuilder;`
`35`		`-import robaho.net.httpserver.HttpExchangeAccess;`
`36`	`35`
`37`	`36`	`/**`
`38`	`37`	`* @test`
`@@ -67,8 +66,10 @@ public void handle(HttpExchange t) throws IOException {`
`67`	`66`	`;`
`68`	`67`	`t.sendResponseHeaders(200, -1);`
`69`	`68`	`}`
`70`		`- if (!HttpExchangeAccess.isClosed(t)) {`
	`69`	`+ try {`
	`70`	`+ t.getResponseBody().write("somedata".getBytes());`
`71`	`71`	`exchangeCloseFail.set(true);`
	`72`	`+ } catch (IOException expected) {`
`72`	`73`	`}`
`73`	`74`	`latch.countDown();`
`74`	`75`	`}`