Skip to content

ref(deps): Migrate UpdaterTest from Jetty to MockWebServer #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronlew02 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ref(deps): Migrate UpdaterTest from Jetty to MockWebServer #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sigstore-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ dependencies {
testImplementation("no.nav.security:mock-oauth2-server:0.5.10")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
testImplementation("net.sourceforge.htmlunit:htmlunit:2.70.0")
testImplementation("org.eclipse.jetty:jetty-server:11.0.26")

testImplementation("io.github.netmikey.logunit:logunit-core:2.0.0")
testRuntimeOnly("io.github.netmikey.logunit:logunit-jul:2.0.0")
Expand Down
63 changes: 29 additions & 34 deletions sigstore-java/src/test/java/dev/sigstore/tuf/UpdaterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,13 @@
import java.time.ZonedDateTime;
import java.util.List;
import java.util.Map;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import okio.Buffer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.util.resource.Resource;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
import org.jetbrains.annotations.NotNull;
Expand All @@ -80,7 +79,7 @@ class UpdaterTest {

public static final String TEST_STATIC_UPDATE_TIME = "2022-09-09T13:37:00.00Z";

static Server remote;
static MockWebServer remote;
static String remoteUrl;
@TempDir Path localStorePath;
@TempDir static Path localMirrorPath;
Expand All @@ -89,32 +88,28 @@ class UpdaterTest {
LogCapturer logs = LogCapturer.create().captureForType(Updater.class, Level.DEBUG);

@BeforeAll
static void startRemoteResourceServer() throws Exception {
remote = new Server();
ServerConnector connector = new ServerConnector(remote);
connector.setHost("127.0.0.1");
remote.addConnector(connector);

ResourceHandler resourceHandler = new ResourceHandler();
Resource resourceBase = Resource.newResource(localMirrorPath.toAbsolutePath());
resourceHandler.setBaseResource(resourceBase);
resourceHandler.setDirectoriesListed(true);
resourceHandler.setDirAllowed(true);
resourceHandler.setAcceptRanges(true);
ContextHandler symlinkAllowingHandler = new ContextHandler();
symlinkAllowingHandler.setContextPath("/");
symlinkAllowingHandler.setAllowNullPathInfo(true);
symlinkAllowingHandler.setHandler(resourceHandler);
symlinkAllowingHandler.setBaseResource(resourceBase);
// the @TempDir locations on OS X are under /var/.. which is a symlink to /private/var and are
// not followed by default in Jetty for security reasons.
symlinkAllowingHandler.clearAliasChecks();
symlinkAllowingHandler.addAliasCheck(
new SymlinkAllowedResourceAliasChecker(symlinkAllowingHandler));
remote.setHandler(symlinkAllowingHandler);
static void startRemoteResourceServer() throws IOException {
remote = new MockWebServer();
remote.setDispatcher(
new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest request) {
try {
String path = request.getPath().substring(1);
Path file = localMirrorPath.resolve(path);
if (Files.exists(file) && !Files.isDirectory(file)) {
return new MockResponse()
.setResponseCode(200)
.setBody(new Buffer().write(Files.readAllBytes(file)));
}
return new MockResponse().setResponseCode(404);
} catch (IOException e) {
return new MockResponse().setResponseCode(500);
}
}
});
remote.start();
remoteUrl = "http://" + connector.getHost() + ":" + connector.getLocalPort() + "/";
System.out.println("TUF local server listening on: " + remoteUrl);
remoteUrl = remote.url("/").toString();
}

@Test
Expand Down Expand Up @@ -983,8 +978,8 @@ void clearLocalMirror() throws IOException {
}

@AfterAll
static void shutdownRemoteResourceServer() throws Exception {
remote.stop();
static void shutdownRemoteResourceServer() throws IOException {
remote.shutdown();
}

public static final Verifiers.Supplier ALWAYS_VERIFIES =
Expand Down
Loading