Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6373 testing modules, starting with session storage (#6529) 

* Issue #6373 testing modules, starting with session storage

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2021-08-06 12:07:09 +10:00 committed by GitHub
parent 49a08450c2
commit c7f0c5a4ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 1064 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
View File

@ -15,6 +15,8 @@
<Set name="maxRetries" property="jetty.session.gcloud.maxRetries"/>
<Set name="backoffMs" property="jetty.session.gcloud.backoffMs"/>
<Set name="namespace" property="jetty.session.gcloud.namespace"/>
<Set name="host" property="jetty.session.gcloud.host"/>
<Set name="projectId" property="jetty.session.gcloud.projectId"/>
<Set name="entityDataModel">
<New class="org.eclipse.jetty.gcloud.session.GCloudSessionDataStore$EntityDataModel">
<Set name="kind" property="jetty.session.gcloud.model.kind"/>

2
jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
View File

@ -33,6 +33,8 @@ etc/sessions/gcloud/session-store.xml
#jetty.session.gcloud.maxRetries=5
#jetty.session.gcloud.backoffMs=1000
#jetty.session.gcloud.namespace=
#jetty.session.gcloud.host=
#jetty.session.gcloud.projectId=
#jetty.session.gcloud.model.kind=GCloudSession
#jetty.session.gcloud.model.id=id
#jetty.session.gcloud.model.contextPath=contextPath

42
jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
View File

@ -67,6 +67,8 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore
protected EntityDataModel _model;
protected boolean _modelProvided;
private String _namespace = DEFAULT_NAMESPACE;
private String _host;
private String _projectId;
/**
* EntityDataModel
@ -455,15 +457,49 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore
return _maxRetries;
}
public void setHost(String host)
{
_host = host;
}
@ManagedAttribute(value = "gcloud host", readonly = true)
public String getHost()
{
return _host;
}
public void setProjectId(String projectId)
{
_projectId = projectId;
}
@ManagedAttribute(value = "gcloud project Id", readonly = true)
public String getProjectId()
{
return _projectId;
}
@Override
protected void doStart() throws Exception
{
if (!_dsProvided)
{
if (!StringUtil.isBlank(getNamespace()))
_datastore = DatastoreOptions.newBuilder().setNamespace(getNamespace()).build().getService();
else
boolean blankCustomnamespace = StringUtil.isBlank(getNamespace());
boolean blankCustomHost = StringUtil.isBlank(getHost());
boolean blankCustomProjectId = StringUtil.isBlank(getProjectId());
if (blankCustomnamespace && blankCustomHost && blankCustomProjectId)
_datastore = DatastoreOptions.getDefaultInstance().getService();
else
{
DatastoreOptions.Builder builder = DatastoreOptions.newBuilder();
if (!blankCustomnamespace)
builder.setNamespace(getNamespace());
if (!blankCustomHost)
builder.setHost(getHost());
if (!blankCustomProjectId)
builder.setProjectId(getProjectId());
_datastore = builder.build().getService();
}
}
if (_model == null)

24
jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreFactory.java
View File

@ -26,6 +26,8 @@ public class GCloudSessionDataStoreFactory extends AbstractSessionDataStoreFacto
private int _maxRetries = GCloudSessionDataStore.DEFAULT_MAX_RETRIES;
private int _backoffMs = GCloudSessionDataStore.DEFAULT_BACKOFF_MS;
private GCloudSessionDataStore.EntityDataModel _model;
private String _host;
private String _projectId;
public GCloudSessionDataStore.EntityDataModel getEntityDataModel()
{
@ -73,6 +75,26 @@ public class GCloudSessionDataStoreFactory extends AbstractSessionDataStoreFacto
_namespace = namespace;
}
public void setHost(String host)
{
_host = host;
}
public String getHost()
{
return _host;
}
public void setProjectId(String projectId)
{
_projectId = projectId;
}
public String getProjectId()
{
return _projectId;
}
@Override
public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception
{
@ -83,6 +105,8 @@ public class GCloudSessionDataStoreFactory extends AbstractSessionDataStoreFacto
ds.setNamespace(getNamespace());
ds.setSavePeriodSec(getSavePeriodSec());
ds.setEntityDataModel(getEntityDataModel());
ds.setHost(getHost());
ds.setProjectId(getProjectId());
return ds;
}
}

5
jetty-home/src/main/resources/modules/hawtio.mod
View File

@ -17,7 +17,7 @@ etc/hawtio.xml
[files]
etc/hawtio/
lib/hawtio/
maven://io.hawt/hawtio-default/1.4.16|lib/hawtio/hawtio.war
maven://io.hawt/hawtio-default/${hawtio.version}/war|lib/hawtio/hawtio.war
basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml
[license]
@ -26,6 +26,9 @@ http://hawt.io/
http://github.com/hawtio/hawtio
http://www.apache.org/licenses/LICENSE-2.0.html
[ini]
hawtio.version?=2.13.5
[ini-template]
## Hawt.io configuration
-Dhawtio.authenticationEnabled?=false

3
jetty-home/src/main/resources/modules/jminix.mod
View File

@ -9,8 +9,7 @@ Deploys the Jminix JMX Console within the server.
[depend]
stats
jmx
jcl-api
jcl-impl
commons-logging
[xml]
etc/jminix.xml

1
jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
View File

@ -29,4 +29,3 @@ http://www.apache.org/licenses/LICENSE-2.0.html
#jetty.session.infinispan.idleTimeout.seconds=0
#jetty.session.gracePeriod.seconds=3600
#jetty.session.savePeriod.seconds=0

8
pom.xml
View File

@ -68,6 +68,7 @@
<it.debug>false</it.debug>
<jetty.test.version>5.5</jetty.test.version>
<hamcrest.version>2.2</hamcrest.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<!-- springboot is only used for jetty-maven-plugin it test
otherwise depending on Spring Boot might be chicken and egg issue :) -->
@ -79,7 +80,7 @@
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.15.1</testcontainers.version>
<maria.version>2.7.0</maria.version>
<mariadb.version>2.7.0</mariadb.version>
</properties>
<licenses>
@ -1137,6 +1138,11 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>

19
tests/test-distribution/pom.xml
View File

@ -12,6 +12,7 @@
<properties>
<bundle-symbolic-name>${project.groupId}.tests.distribution</bundle-symbolic-name>
<distribution.debug.port>-1</distribution.debug.port>
<home.start.timeout>10</home.start.timeout>
</properties>
<dependencies>
@ -180,6 +181,21 @@
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>gcloud</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@ -192,7 +208,10 @@
<mavenRepoPath>${settings.localRepository}</mavenRepoPath>
<jettyVersion>${project.version}</jettyVersion>
<hazelcast.version>${hazelcast.version}</hazelcast.version>
<mariadb.docker.version>${mariadb.docker.version}</mariadb.docker.version>
<distribution.debug.port>$(distribution.debug.port}</distribution.debug.port>
<home.start.timeout>${home.start.timeout}</home.start.timeout>
<mariadb.version>${mariadb.version}</mariadb.version>
</systemPropertyVariables>
</configuration>
</plugin>

17
tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java
View File

@ -180,6 +180,7 @@ public class JettyHomeTester
ProcessBuilder pbCmd = new ProcessBuilder(commands);
pbCmd.directory(jettyBaseDir);
pbCmd.environment().putAll(config.env);
Process process = pbCmd.start();
return new Run(config, process);
@ -393,6 +394,7 @@ public class JettyHomeTester
private String jettyVersion;
private String mavenLocalRepository = System.getProperty("mavenRepoPath", System.getProperty("user.home") + "/.m2/repository");
private List<String> jvmArgs = new ArrayList<>();
private Map<String, String> env = new HashMap<>();
public Path getJettyBase()
{
@ -419,6 +421,11 @@ public class JettyHomeTester
return Collections.unmodifiableList(jvmArgs);
}
public Map<String, String> getEnv()
{
return Collections.unmodifiableMap(env);
}
@Override
public String toString()
{
@ -765,6 +772,16 @@ public class JettyHomeTester
return this;
}
/**
* @param env the env to add
* @return this Builder
*/
public Builder env(Map<String, String> env)
{
config.env = env;
return this;
}
/**
* @return an empty instance of Builder
*/

21
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/AbstractJettyHomeTest.java
View File

@ -19,6 +19,7 @@ import java.nio.file.Path;
import java.util.function.Supplier;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.toolchain.test.FS;
@ -68,4 +69,24 @@ public class AbstractJettyHomeTest
if (client != null)
client.stop();
}
protected class ResponseDetails implements Supplier<String>
{
private final ContentResponse response;
public ResponseDetails(ContentResponse response)
{
this.response = response;
}
@Override
public String get()
{
StringBuilder ret = new StringBuilder();
ret.append(response.toString()).append(System.lineSeparator());
ret.append(response.getHeaders().toString()).append(System.lineSeparator());
ret.append(response.getContentAsString()).append(System.lineSeparator());
return ret.toString();
}
}
}

20
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java
View File

@ -296,24 +296,4 @@ public class DemoModulesTests extends AbstractJettyHomeTest
}
}
}
private class ResponseDetails implements Supplier<String>
{
private final ContentResponse response;
public ResponseDetails(ContentResponse response)
{
this.response = response;
}
@Override
public String get()
{
StringBuilder ret = new StringBuilder();
ret.append(response.toString()).append(System.lineSeparator());
ret.append(response.getHeaders().toString()).append(System.lineSeparator());
ret.append(response.getContentAsString()).append(System.lineSeparator());
return ret.toString();
}
}
}

181
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java Normal file
View File

@ -0,0 +1,181 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThirdPartyModulesTests extends AbstractJettyHomeTest
{
@Test
public void testHawtio() throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.jettyBase(jettyBase)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
int httpPort = distribution.freePort();
String[] argsConfig = {
"--approve-all-licenses",
"--add-modules=hawtio,http"
};
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES));
assertEquals(0, runConfig.getExitValue());
String[] argsStart = {
"jetty.http.port=" + httpPort
};
try (JettyHomeTester.Run runStart = distribution.start(argsStart))
{
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + httpPort + "/hawtio");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("<title>Hawtio</title>"));
}
}
}
@Test
public void testJAMon() throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.jettyBase(jettyBase)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
int httpPort = distribution.freePort();
String[] argsConfig = {
"--approve-all-licenses",
"--add-modules=jamon,http"
};
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES));
assertEquals(0, runConfig.getExitValue());
String[] argsStart = {
"jetty.http.port=" + httpPort
};
try (JettyHomeTester.Run runStart = distribution.start(argsStart))
{
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + httpPort + "/jamon");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("<title>JAMon"));
}
}
}
@Test
public void testjminix() throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.jettyBase(jettyBase)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
int httpPort = distribution.freePort();
String[] argsConfig = {
"--approve-all-licenses",
"--add-modules=jminix,http,logging-jcl-capture"
};
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES));
assertEquals(0, runConfig.getExitValue());
String[] argsStart = {
"jetty.http.port=" + httpPort
};
try (JettyHomeTester.Run runStart = distribution.start(argsStart))
{
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
}
}
}
@Test
public void testjolokia() throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.jettyBase(jettyBase)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
int httpPort = distribution.freePort();
String[] argsConfig = {
"--approve-all-licenses",
"--add-modules=jolokia,http"
};
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(2, TimeUnit.MINUTES));
assertEquals(0, runConfig.getExitValue());
String[] argsStart = {
"jetty.http.port=" + httpPort
};
try (JettyHomeTester.Run runStart = distribution.start(argsStart))
{
assertTrue(runStart.awaitConsoleLogsFor("Started Server@", 20, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + httpPort + "/jolokia");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("\"agentType\":\"servlet\""));
}
}
}
}

136
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java Normal file
View File

@ -0,0 +1,136 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.io.BufferedWriter;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.tests.distribution.AbstractJettyHomeTest;
import org.eclipse.jetty.tests.distribution.JettyHomeTester;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class AbstractSessionDistributionTests extends AbstractJettyHomeTest
{
private String jettyVersion = System.getProperty("jettyVersion");
protected JettyHomeTester jettyHomeTester;
private static final int START_TIMEOUT = Integer.getInteger("home.start.timeout", 10);
@BeforeEach
public void prepareJettyHomeTester() throws Exception
{
jettyHomeTester = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.env(env())
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
}
@Test
public void stopRestartWebappTestSessionContentSaved() throws Exception
{
startExternalSessionStorage();
List<String> args = new ArrayList<>(Arrays.asList(
"--create-startd",
"--approve-all-licenses",
"--add-module=resources,server,http,webapp,deploy,jmx,servlet,servlets," + getFirstStartExtraModules()
));
args.addAll(getFirstStartExtraArgs());
String[] argsStart = args.toArray(new String[0]);
try (JettyHomeTester.Run run1 = jettyHomeTester.start(argsStart))
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());
File war = jettyHomeTester.resolveArtifact("org.eclipse.jetty.tests:test-simple-session-webapp:war:" + jettyVersion);
jettyHomeTester.installWarFile(war, "test");
int port = jettyHomeTester.freePort();
args = new ArrayList<>(Collections.singletonList("jetty.http.port=" + port));
args.addAll(getSecondStartExtraArgs());
argsStart = args.toArray(new String[0]);
try (JettyHomeTester.Run run2 = jettyHomeTester.start(argsStart))
{
assertTrue(run2.awaitConsoleLogsFor("Started Server@", START_TIMEOUT, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + port + "/test/session?action=CREATE");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION CREATED"));
response = client.GET("http://localhost:" + port + "/test/session?action=READ");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION READ CHOCOLATE THE BEST:FRENCH"));
}
Path logFile = jettyHomeTester.getJettyBase().resolve("resources").resolve("jetty-logging.properties");
Files.deleteIfExists(logFile);
try (BufferedWriter writer = Files.newBufferedWriter(logFile, StandardCharsets.UTF_8, StandardOpenOption.CREATE))
{
writer.write("org.eclipse.jetty.server.session.LEVEL=DEBUG");
}
try (JettyHomeTester.Run run2 = jettyHomeTester.start(argsStart))
{
assertTrue(run2.awaitConsoleLogsFor("Started Server@", START_TIMEOUT, TimeUnit.SECONDS));
ContentResponse response = client.GET("http://localhost:" + port + "/test/session?action=READ");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION READ CHOCOLATE THE BEST:FRENCH"));
}
}
stopExternalSessionStorage();
}
public Map<String, String> env()
{
return Collections.emptyMap();
}
public abstract List<String> getFirstStartExtraArgs();
public abstract String getFirstStartExtraModules();
public abstract List<String> getSecondStartExtraArgs();
public abstract void startExternalSessionStorage() throws Exception;
public abstract void stopExternalSessionStorage() throws Exception;
}

55
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/FileSessionDistributionTests.java Normal file
View File

@ -0,0 +1,55 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.util.Collections;
import java.util.List;
/**
*
*/
public class FileSessionDistributionTests extends AbstractSessionDistributionTests
{
@Override
public void startExternalSessionStorage() throws Exception
{
// no op
}
@Override
public void stopExternalSessionStorage() throws Exception
{
// no op
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Collections.emptyList();
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-file";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Collections.emptyList();
}
}

89
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/FileSessionWithMemcacheDistributionTests.java Normal file
View File

@ -0,0 +1,89 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
/**
*
*/
public class FileSessionWithMemcacheDistributionTests extends AbstractSessionDistributionTests
{
private static final Logger LOGGER = LoggerFactory.getLogger(FileSessionWithMemcacheDistributionTests.class);
private static final Logger MEMCACHED_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.session.memcached");
private GenericContainer memcached;
private String host;
private int port;
@Override
@BeforeEach
public void prepareJettyHomeTester() throws Exception
{
memcached =
new GenericContainer("memcached:" + System.getProperty("memcached.docker.version", "1.6.6"))
.withLogConsumer(new Slf4jLogConsumer(MEMCACHED_LOG));
memcached.start();
this.host = memcached.getContainerIpAddress();
this.port = memcached.getMappedPort(11211);
super.prepareJettyHomeTester();
}
@Override
public void startExternalSessionStorage() throws Exception
{
// no op
}
@Override
public Map<String, String> env()
{
return Map.of("MEMCACHE_PORT_11211_TCP_ADDR", host, "MEMCACHE_PORT_11211_TCP_PORT", Integer.toString(port));
}
@Override
public void stopExternalSessionStorage() throws Exception
{
memcached.stop();
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Collections.singletonList("session-data-cache=xmemcached");
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-file,session-store-cache";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Collections.singletonList("session-data-cache=xmemcached");
}
}

111
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/GCloudSessionDistributionTests.java Normal file
View File

@ -0,0 +1,111 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.net.InetAddress;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.DatastoreEmulatorContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.DockerImageName;
/**
*
*/
public class GCloudSessionDistributionTests extends AbstractSessionDistributionTests
{
private static final Logger LOGGER = LoggerFactory.getLogger(GCloudSessionDistributionTests.class);
private static final Logger GCLOUD_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.session.gcloudLogs");
public DatastoreEmulatorContainer emulator =
new CustomDatastoreEmulatorContainer(DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"))
.withLogConsumer(new Slf4jLogConsumer(GCLOUD_LOG));
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk");
private static final String CMD = "gcloud beta emulators datastore start --project test-project --host-port 0.0.0.0:8081 --consistency=1.0";
private static final int HTTP_PORT = 8081;
String host;
public static class CustomDatastoreEmulatorContainer extends DatastoreEmulatorContainer
{
public CustomDatastoreEmulatorContainer(DockerImageName dockerImageName)
{
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
withExposedPorts(HTTP_PORT);
setWaitStrategy(Wait.forHttp("/").forStatusCode(200));
withCommand("/bin/sh", "-c", CMD);
}
}
@Override
public void startExternalSessionStorage() throws Exception
{
emulator.start();
//work out if we're running locally or not: if not local, then the host passed to
//DatastoreOptions must be prefixed with a scheme
String endPoint = emulator.getEmulatorEndpoint();
InetAddress hostAddr = InetAddress.getByName(new URL("http://" + endPoint).getHost());
LOGGER.info("endPoint: {} ,hostAddr.isAnyLocalAddress(): {},hostAddr.isLoopbackAddress(): {}",
endPoint,
hostAddr.isAnyLocalAddress(),
hostAddr.isLoopbackAddress());
if (hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress())
host = endPoint;
else
host = "http://" + endPoint;
}
@Override
public void stopExternalSessionStorage() throws Exception
{
emulator.stop();
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Arrays.asList(
"jetty.session.gcloud.host=" + host,
"jetty.session.gcloud.projectId=foobar"
);
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-gcloud";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Arrays.asList(
"jetty.session.gcloud.host=" + host,
"jetty.session.gcloud.projectId=foobar"
);
}
}

98
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/HazelcastSessionDistributionTests.java → tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/HazelcastSessionDistributionTests.java
View File

@ -11,7 +11,7 @@
// ========================================================================
//
package org.eclipse.jetty.tests.distribution;
package org.eclipse.jetty.tests.distribution.session;
import java.io.File;
import java.io.OutputStream;
@ -21,6 +21,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -28,8 +29,8 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.tests.distribution.JettyHomeTester;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
@ -42,27 +43,28 @@ import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class HazelcastSessionDistributionTests extends AbstractJettyHomeTest
{
private static final Logger HAZELCAST_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.HazelcastLogs");
private static final Logger LOGGER = LoggerFactory.getLogger(HazelcastSessionDistributionTests.class);
/**
* This simulate the onlyClient option which means the JVM running Jetty is only an Hazelcast client and not part
* of the cluster
*/
@Test
public void testHazelcastRemoteOnlyClient() throws Exception
public class HazelcastSessionDistributionTests extends AbstractSessionDistributionTests
{
try (GenericContainer hazelcast =
new GenericContainer("hazelcast/hazelcast:" + System.getProperty("hazelcast.version", "4.1"))
private static final Logger HAZELCAST_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.session.HazelcastLogs");
private static final Logger LOGGER = LoggerFactory.getLogger(HazelcastSessionDistributionTests.class);
private GenericContainer hazelcast = new GenericContainer("hazelcast/hazelcast:" + System.getProperty("hazelcast.version", "4.1"))
.withExposedPorts(5701)
.waitingFor(Wait.forListeningPort())
.withLogConsumer(new Slf4jLogConsumer(HAZELCAST_LOG)))
.withLogConsumer(new Slf4jLogConsumer(HAZELCAST_LOG));
private Path hazelcastJettyPath;
@Override
public void startExternalSessionStorage() throws Exception
{
hazelcast.start();
String hazelcastHost = hazelcast.getContainerIpAddress();
int hazelcastPort = hazelcast.getMappedPort(5701);
@ -71,61 +73,37 @@ public class HazelcastSessionDistributionTests extends AbstractJettyHomeTest
Map<String, String> tokenValues = new HashMap<>();
tokenValues.put("hazelcast_ip", hazelcastHost);
tokenValues.put("hazelcast_port", Integer.toString(hazelcastPort));
Path hazelcastJettyPath = Paths.get("target/hazelcast-client.xml");
this.hazelcastJettyPath = Paths.get("target/hazelcast-client.xml");
transformFileWithHostAndPort(Paths.get("src/test/resources/hazelcast-client.xml"),
hazelcastJettyPath,
tokenValues);
}
String jettyVersion = System.getProperty("jettyVersion");
JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
.jettyVersion(jettyVersion)
.mavenLocalRepository(System.getProperty("mavenRepoPath"))
.build();
String[] args1 = {
"--create-startd",
"--approve-all-licenses",
"--add-to-start=resources,server,http,webapp,deploy,jmx,servlet,servlets,session-store-hazelcast-remote"
};
try (JettyHomeTester.Run run1 = distribution.start(args1))
@Override
public void stopExternalSessionStorage() throws Exception
{
assertTrue(run1.awaitFor(5, TimeUnit.SECONDS));
assertEquals(0, run1.getExitValue());
hazelcast.stop();
}
File war = distribution.resolveArtifact("org.eclipse.jetty.tests:test-simple-session-webapp:war:" + jettyVersion);
distribution.installWarFile(war, "test");
@Override
public List<String> getFirstStartExtraArgs()
{
return Collections.emptyList();
}
int port = distribution.freePort();
String[] argsStart = {
"jetty.http.port=" + port,
@Override
public String getFirstStartExtraModules()
{
return "session-store-hazelcast-remote";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Arrays.asList(
"jetty.session.hazelcast.configurationLocation=" + hazelcastJettyPath.toAbsolutePath(),
"jetty.session.hazelcast.onlyClient=true"
};
try (JettyHomeTester.Run run2 = distribution.start(argsStart))
{
assertTrue(run2.awaitConsoleLogsFor("Started Server@", 10, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + port + "/test/session?action=CREATE");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION CREATED"));
response = client.GET("http://localhost:" + port + "/test/session?action=READ");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION READ CHOCOLATE THE BEST:FRENCH"));
}
try (JettyHomeTester.Run run2 = distribution.start(argsStart))
{
assertTrue(run2.awaitConsoleLogsFor("Started Server@", 10, TimeUnit.SECONDS));
ContentResponse response = client.GET("http://localhost:" + port + "/test/session?action=READ");
assertEquals(HttpStatus.OK_200, response.getStatus());
assertThat(response.getContentAsString(), containsString("SESSION READ CHOCOLATE THE BEST:FRENCH"));
}
}
}
);
}
@Disabled("not working see https://github.com/hazelcast/hazelcast/issues/18508")

116
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java Normal file
View File

@ -0,0 +1,116 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import org.eclipse.jetty.util.IO;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
*
*/
public class InfinispanSessionDistributionTests extends AbstractSessionDistributionTests
{
private static final Logger LOGGER = LoggerFactory.getLogger(InfinispanSessionDistributionTests.class);
private static final Logger INFINISPAN_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.session.infinispan");
private GenericContainer infinispan;
private String host;
@Override
public void startExternalSessionStorage() throws Exception
{
String infinispanVersion = System.getProperty("infinispan.docker.image.version", "9.4.8.Final");
infinispan =
new GenericContainer(System.getProperty("infinispan.docker.image.name", "jboss/infinispan-server") +
":" + infinispanVersion)
//.withEnv("APP_USER", "theuser")
//.withEnv("APP_PASS", "foobar")
.withEnv("MGMT_USER", "admin")
.withEnv("MGMT_PASS", "admin")
.withCommand("standalone")
.waitingFor(new LogMessageWaitStrategy()
.withRegEx(".*Infinispan Server.*started in.*\\s"))
.withExposedPorts(4712, 4713, 8088, 8089, 8443, 9990, 9993, 11211, 11222, 11223, 11224)
.withLogConsumer(new Slf4jLogConsumer(INFINISPAN_LOG));
infinispan.start();
String host = infinispan.getContainerIpAddress();
int port = infinispan.getMappedPort(11222);
Path resourcesDirectory = Path.of(jettyHomeTester.getJettyBase().toString(), "resources/");
if (Files.exists(resourcesDirectory))
{
IO.delete(resourcesDirectory.toFile());
}
Files.createDirectories(resourcesDirectory);
Properties properties = new Properties();
properties.put("infinispan.client.hotrod.server_list", host + ":" + port);
//properties.put("jetty.session.infinispan.clientIntelligence", "BASIC");
Path hotrod = Path.of(resourcesDirectory.toString(), "hotrod-client.properties");
Files.deleteIfExists(hotrod);
Files.createFile(hotrod);
try (Writer writer = Files.newBufferedWriter(hotrod))
{
properties.store(writer, null);
}
Configuration configuration = new ConfigurationBuilder().withProperties(properties)
.addServer().host(host).port(port).build();
RemoteCacheManager remoteCacheManager = new RemoteCacheManager(configuration);
remoteCacheManager.administration().getOrCreateCache("sessions", (String)null);
}
@Override
public void stopExternalSessionStorage() throws Exception
{
infinispan.stop();
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Arrays.asList();
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-infinispan-remote";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Arrays.asList();
}
}

107
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/JDBCSessionDistributionTests.java Normal file
View File

@ -0,0 +1,107 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
/**
*
*/
public class JDBCSessionDistributionTests extends AbstractSessionDistributionTests
{
private static final Logger LOGGER = LoggerFactory.getLogger(JDBCSessionDistributionTests.class);
private static final String MARIA_DB_USER = "beer";
private static final String MARIA_DB_PASSWORD = "pacific_ale";
private String jdbcUrl;
private String driverClassName;
private MariaDBContainer mariaDBContainer = new MariaDBContainer("mariadb:" + System.getProperty("mariadb.docker.version", "10.3.6"))
.withUsername(MARIA_DB_USER)
.withPassword(MARIA_DB_PASSWORD)
.withDatabaseName("sessions");
@Override
public void startExternalSessionStorage() throws Exception
{
mariaDBContainer.start();
jdbcUrl = mariaDBContainer.getJdbcUrl() + "?user=" + MARIA_DB_USER +
"&password=" + MARIA_DB_PASSWORD;
driverClassName = mariaDBContainer.getDriverClassName();
// prepare mariadb driver mod file
String mariaDBVersion = System.getProperty("mariadb.version");
StringBuilder modFileContent = new StringBuilder();
modFileContent.append("[lib]").append(System.lineSeparator());
modFileContent.append("lib/mariadb-java-client-" + mariaDBVersion + ".jar").append(System.lineSeparator());
modFileContent.append("[files]").append(System.lineSeparator());
modFileContent.append("maven://org.mariadb.jdbc/mariadb-java-client/" + mariaDBVersion +
"|lib/mariadb-java-client-" + mariaDBVersion + ".jar")
.append(System.lineSeparator());
Path modulesDirectory = Path.of(jettyHomeTester.getJettyBase().toString(), "modules");
if (Files.notExists(modulesDirectory))
{
Files.createDirectories(modulesDirectory);
}
Path mariaDbModPath = Path.of(modulesDirectory.toString(), "mariadb-driver.mod");
Files.deleteIfExists(mariaDbModPath);
Files.createFile(mariaDbModPath);
LOGGER.info("create file modfile: {} with content {} ", mariaDbModPath, modFileContent);
Files.writeString(mariaDbModPath, modFileContent);
}
@Override
public void stopExternalSessionStorage() throws Exception
{
mariaDBContainer.stop();
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Arrays.asList(
"jetty.session.jdbc.driverUrl=" + jdbcUrl,
"db-connection-type=driver",
"jetty.session.jdbc.driverClass=" + driverClassName
);
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-jdbc,mariadb-driver";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Arrays.asList(
"jetty.session.jdbc.driverUrl=" + jdbcUrl,
"db-connection-type=driver",
"jetty.session.jdbc.driverClass=" + driverClassName
);
}
}

79
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/MongodbSessionDistributionTests.java Normal file
View File

@ -0,0 +1,79 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.tests.distribution.session;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
*
*/
public class MongodbSessionDistributionTests extends AbstractSessionDistributionTests
{
private static final Logger LOGGER = LoggerFactory.getLogger(MongodbSessionDistributionTests.class);
private static final Logger MONGO_LOG = LoggerFactory.getLogger("org.eclipse.jetty.tests.distribution.session.mongo");
final String imageName = "mongo:" + System.getProperty("mongo.docker.version", "2.2.7");
final GenericContainer mongoDBContainer =
new GenericContainer(imageName)
.withLogConsumer(new Slf4jLogConsumer(MONGO_LOG))
.waitingFor(new LogMessageWaitStrategy()
.withRegEx(".*waiting for connections.*"));
private String host;
private int port;
@Override
public void startExternalSessionStorage() throws Exception
{
mongoDBContainer.start();
host = mongoDBContainer.getHost();
port = mongoDBContainer.getMappedPort(27017);
}
@Override
public void stopExternalSessionStorage() throws Exception
{
mongoDBContainer.stop();
}
@Override
public List<String> getFirstStartExtraArgs()
{
return Collections.emptyList();
}
@Override
public String getFirstStartExtraModules()
{
return "session-store-mongo";
}
@Override
public List<String> getSecondStartExtraArgs()
{
return Arrays.asList(
"jetty.session.mongo.host=" + host,
"jetty.session.mongo.port=" + port
);
}
}

2
tests/test-loginservice/pom.xml
View File

@ -65,7 +65,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${maria.version}</version>
<version>${mariadb.version}</version>
<scope>test</scope>
</dependency>
<dependency>

2
tests/test-sessions/test-jdbc-sessions/pom.xml
View File

@ -10,7 +10,6 @@
<name>Jetty Tests :: Sessions :: JDBC</name>
<properties>
<bundle-symbolic-name>${project.groupId}.sessions.jdbc</bundle-symbolic-name>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
</properties>
<build>
<plugins>
@ -91,7 +90,6 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${maria.version}</version>
<scope>test</scope>
</dependency>
</dependencies>