diff --git a/src/main/java/dev/dinauer/oidcproxy/Resource.java b/src/main/java/dev/dinauer/oidcproxy/Resource.java index 84bf448..e15dc28 100644 --- a/src/main/java/dev/dinauer/oidcproxy/Resource.java +++ b/src/main/java/dev/dinauer/oidcproxy/Resource.java @@ -94,7 +94,7 @@ public class Resource catch (ProxyHttpException e) { accessLog.log(AccessLog.Type.ERROR, context, PathConverter.toPath(requestSegments), route.target(), e.getStatusCode(), e.getTime()); - ResponseHandler.error(context, e.getStatusCode()); + ResponseHandler.error(context, e.getStatusCode(), e.getHeaders(), e.getBody()); } catch (ProxyAuthenticationFailedException e) { @@ -119,8 +119,8 @@ public class Resource } catch (IOException e) { - LOG.error("IO error during proxy request, returning 502.", e); - ResponseHandler.error(context, 502); + LOG.error("IO error during proxy request, returning 500.", e); + ResponseHandler.error(context, 500); } } } diff --git a/src/main/java/dev/dinauer/oidcproxy/proxy/ForwardService.java b/src/main/java/dev/dinauer/oidcproxy/proxy/ForwardService.java index 842e638..592c426 100644 --- a/src/main/java/dev/dinauer/oidcproxy/proxy/ForwardService.java +++ b/src/main/java/dev/dinauer/oidcproxy/proxy/ForwardService.java @@ -43,7 +43,7 @@ public class ForwardService } else { - throw new ProxyHttpException(time, response.statusCode()); + throw new ProxyHttpException(time, response.statusCode(), response.headers().map(), response.body()); } } diff --git a/src/main/java/dev/dinauer/oidcproxy/proxy/ResponseHandler.java b/src/main/java/dev/dinauer/oidcproxy/proxy/ResponseHandler.java index 710e7ae..cb6dee7 100644 --- a/src/main/java/dev/dinauer/oidcproxy/proxy/ResponseHandler.java +++ b/src/main/java/dev/dinauer/oidcproxy/proxy/ResponseHandler.java @@ -27,10 +27,23 @@ public class ResponseHandler context.response().send(Buffer.buffer(response.body())); } - public static void error(RoutingContext context, int statusCode) + public static void error(RoutingContext context, int statusCode, Map> headers, byte[] body) { context.response().setStatusCode(statusCode); - context.response().send(); + for (Map.Entry> header : headers.entrySet()) + { + String headerName = header.getKey(); + for (String value : header.getValue()) + { + context.response().putHeader(headerName, value); + } + } + context.response().send(Buffer.buffer(body)); + } + + public static void error(RoutingContext context, int statusCode) + { + error(context, statusCode, Map.of(), new byte[0]); } public static void notFound(RoutingContext context) diff --git a/src/main/java/dev/dinauer/oidcproxy/proxy/exception/ProxyHttpException.java b/src/main/java/dev/dinauer/oidcproxy/proxy/exception/ProxyHttpException.java index b9eefd4..a13b652 100644 --- a/src/main/java/dev/dinauer/oidcproxy/proxy/exception/ProxyHttpException.java +++ b/src/main/java/dev/dinauer/oidcproxy/proxy/exception/ProxyHttpException.java @@ -1,14 +1,21 @@ package dev.dinauer.oidcproxy.proxy.exception; +import java.util.List; +import java.util.Map; + public class ProxyHttpException extends Exception { private final long time; private final int statusCode; + private final Map> headers; + private final byte[] body; - public ProxyHttpException(long time, int statusCode) + public ProxyHttpException(long time, int statusCode, Map> headers, byte[] body) { this.time = time; this.statusCode = statusCode; + this.headers = headers; + this.body = body; } public long getTime() @@ -20,4 +27,14 @@ public class ProxyHttpException extends Exception { return statusCode; } + + public Map> getHeaders() + { + return headers; + } + + public byte[] getBody() + { + return body; + } }