Expose remote address

2 files changed, 5 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApi.java b/container-core/src/main/java/com/yahoo/restapi/RestApi.java
index 18d8d8c49b4..36daa618e3f 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApi.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApi.java
@@ -15,6 +15,8 @@ import com.yahoo.security.tls.ConnectionAuthContext;
 
 import javax.net.ssl.SSLSession;
 import java.io.InputStream;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
@@ -153,6 +155,7 @@ public interface RestApi {
         Principal userPrincipalOrThrow();
         Optional<SSLSession> sslSession();
         Optional<ConnectionAuthContext> connectionAuthContext();
+        InetSocketAddress remoteAddress();
 
         interface Parameters {
             Optional<String> getString(String name);
diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
index 196a57d23bf..7282d976675 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
@@ -21,6 +21,7 @@ import com.yahoo.security.tls.TransportSecurityUtils;
 
 import javax.net.ssl.SSLSession;
 import java.io.InputStream;
+import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -491,7 +492,7 @@ class RestApiImpl implements RestApi {
         @Override public Optional<ConnectionAuthContext> connectionAuthContext() {
             return sslSession().flatMap(TransportSecurityUtils::getConnectionAuthContext);
         }
-
+        @Override public InetSocketAddress remoteAddress() { return (InetSocketAddress) request.getJDiscRequest().getRemoteAddress(); }
 
         private class PathParametersImpl implements RestApi.RequestContext.PathParameters {
             @Override