Receive session change notification test (#50)

Author: maximthomas

jee-agents-distribution/jee-agents-destribution-integration-tests/pom.xml

@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.21.3</version>
+            <version>2.0.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -96,6 +96,10 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/AbstractIntegrationTest.java

@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
@@ -21,6 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
+import org.testcontainers.Testcontainers;
 import org.testng.SkipException;
 import org.testng.annotations.BeforeClass;
 
@@ -42,6 +43,8 @@ public abstract class AbstractIntegrationTest {
         } else {
             openamContainer = new OpenAmContainer();
             openamContainer.start();
+
+            Testcontainers.exposeHostPorts(8081);
         }
     }
 

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/EmbeddedContainer_IT.java

@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
@@ -25,13 +25,13 @@
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.testcontainers.utility.MountableFile;
-import org.testng.annotations.BeforeClass;
+import org.openidentityplatform.identity.agents.filters.NotificationTestFilter;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.URI;
+import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.EnumSet;
 
@@ -47,15 +47,18 @@ public void testJetty() throws Exception {
 
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/");
+        context.addFilter(new FilterHolder(NotificationTestFilter.class), "/UpdateAgentCacheServlet", EnumSet.of(DispatcherType.REQUEST));
 
         FilterHolder amFilterHolder = new FilterHolder(AmAgentFilter.class);
         amFilterHolder.setInitParameter("com.iplanet.am.naming.url", "http://openam.example.org:8080/openam/namingservice");
         amFilterHolder.setInitParameter("com.sun.identity.agents.app.username", "amadmin");
         amFilterHolder.setInitParameter("com.iplanet.am.service.secret", "passw0rd");
         amFilterHolder.setInitParameter("com.sun.identity.agents.config.profilename", "myAgent");
+        amFilterHolder.setInitParameter("com.iplanet.am.cookie.name", "iPlanetDirectoryPro");
 
         context.addFilter(amFilterHolder, "/*", EnumSet.of(DispatcherType.REQUEST));
 
+
         jetty.setHandler(context);
 
         // Add your custom servlet
@@ -69,9 +72,27 @@ public void testJetty() throws Exception {
 
         String token = getAuthenticationToken();
 
+
         HttpResponse<String> authResponse = callDemoServlet(token);
         assertThat(authResponse.statusCode()).isEqualTo(HttpURLConnection.HTTP_OK);
 
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create("http://localhost:8080/openam/json/sessions/?_action=logout"))
+                .header("Host", "openam.example.org:8080")
+                .header("iPlanetDirectoryPro", token)
+                .POST(HttpRequest.BodyPublishers.noBody())
+                .build();
+
+        //logout
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        assertThat(response.statusCode()).isEqualTo(HttpURLConnection.HTTP_OK);
+
+        HttpResponse<String> loggedOutTokenResponse = callDemoServlet(token);
+        assertThat(loggedOutTokenResponse.statusCode()).isEqualTo(HttpURLConnection.HTTP_MOVED_TEMP);
+
+        //test received notifications
+        assertThat(NotificationTestFilter.getReceivedRequests().size()).isNotZero();
+
         jetty.stop();
 
     }

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/Jetty11Container.java

@@ -11,13 +11,12 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
 
 import org.testcontainers.containers.FixedHostPortGenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/Jetty12Container.java

@@ -11,13 +11,12 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
 
 import org.testcontainers.containers.FixedHostPortGenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/OpenAmContainer.java

@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
@@ -96,6 +96,7 @@ public OpenAmContainer() {
         container = new FixedHostPortGenericContainer<>(TEST_IMAGE_NAME_WITH_TAG)
                 .withFixedExposedPort(8080, 8080)
                 .withExposedPorts(8080)
+                .withAccessToHost(true)
                 .withNetwork(Network.SHARED)
                 .withImagePullPolicy(new NeverPullPolicy())
                 .withLogConsumer(new Slf4jLogConsumer(logger))

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/Tomcat10Container.java

@@ -11,13 +11,12 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
 
 import org.testcontainers.containers.FixedHostPortGenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;
@@ -42,7 +41,7 @@ public Tomcat10Container() {
                 .withCopyToContainer(
                         MountableFile.forClasspathResource("docker/tomcat/10/web.xml"),
                         "/usr/local/tomcat/conf/web.xml")
-                .waitingFor(Wait.forHttp("/demo/").forPort(8080));;
+                .waitingFor(Wait.forHttp("/demo/").forPort(8080));
     }
 
     @Override

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/Tomcat11Container.java

@@ -11,13 +11,12 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
 
 import org.testcontainers.containers.FixedHostPortGenericContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.Transferable;

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/WebContainer.java

@@ -11,13 +11,11 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.openidentityplatform.identity.agents;
 
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;

jee-agents-distribution/jee-agents-destribution-integration-tests/src/test/java/org/openidentityplatform/identity/agents/filters/NotificationTestFilter.java

@@ -0,0 +1,113 @@
+/**
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2026 3A Systems LLC.
+ */
+
+package org.openidentityplatform.identity.agents.filters;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class NotificationTestFilter implements Filter {
+    private static final Logger log = LoggerFactory.getLogger(NotificationTestFilter.class);
+
+    private static final List<String> receivedRequests = Collections.synchronizedList(new ArrayList<>());
+
+    public static List<String> getReceivedRequests() {
+        return new ArrayList<>(receivedRequests);
+    }
+    @Override
+    public void init(FilterConfig filterConfig) {}
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+
+        if (request instanceof HttpServletRequest) {
+            CachedBodyHttpServletRequest wrappedRequest =
+                    new CachedBodyHttpServletRequest((HttpServletRequest) request);
+
+            String body = new String(wrappedRequest.getCachedBody(), StandardCharsets.UTF_8);
+            log.info("Incoming request: method={}, uri={}, body={}",
+                    wrappedRequest.getMethod(),
+                    wrappedRequest.getRequestURI(),
+                    body.isEmpty() ? "<empty>" : body);
+            if(StringUtils.isNotBlank(body)) {
+                receivedRequests.add(body);
+            }
+            chain.doFilter(wrappedRequest, response);
+        } else {
+            chain.doFilter(request, response);
+        }
+    }
+
+    @Override
+    public void destroy() {}
+
+    /**
+     * Wraps the request so the body can be read multiple times.
+     */
+    static class CachedBodyHttpServletRequest extends HttpServletRequestWrapper {
+
+        private final byte[] cachedBody;
+
+        CachedBodyHttpServletRequest(HttpServletRequest request) throws IOException {
+            super(request);
+            this.cachedBody = request.getInputStream().readAllBytes();
+        }
+
+        byte[] getCachedBody() {
+            return cachedBody;
+        }
+
+        @Override
+        public ServletInputStream getInputStream() {
+            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(cachedBody);
+            return new ServletInputStream() {
+                @Override public int read() { return byteArrayInputStream.read(); }
+                @Override public boolean isFinished() { return byteArrayInputStream.available() == 0; }
+                @Override public boolean isReady() { return true; }
+                @Override public void setReadListener(ReadListener listener) {}
+            };
+        }
+
+        @Override
+        public BufferedReader getReader() {
+            return new BufferedReader(new InputStreamReader(getInputStream(), StandardCharsets.UTF_8));
+        }
+    }
+
+
+}
+