diff options
Diffstat (limited to 'server')
10 files changed, 319 insertions, 48 deletions
diff --git a/server/src/main/java/market/guess/server/EngineBootstrap.java b/server/src/main/java/market/guess/server/EngineBootstrap.java index 5a06a31..9746cef 100644 --- a/server/src/main/java/market/guess/server/EngineBootstrap.java +++ b/server/src/main/java/market/guess/server/EngineBootstrap.java | |||
| @@ -3,12 +3,22 @@ package market.guess.server; | |||
| 3 | import jakarta.servlet.ServletContextEvent; | 3 | import jakarta.servlet.ServletContextEvent; |
| 4 | import jakarta.servlet.ServletContextListener; | 4 | import jakarta.servlet.ServletContextListener; |
| 5 | import jakarta.servlet.annotation.WebListener; | 5 | import jakarta.servlet.annotation.WebListener; |
| 6 | import jakarta.servlet.http.HttpSessionEvent; | ||
| 7 | import jakarta.servlet.http.HttpSessionListener; | ||
| 6 | import java.time.Clock; | 8 | import java.time.Clock; |
| 7 | 9 | ||
| 8 | @WebListener | 10 | @WebListener |
| 9 | public final class EngineBootstrap implements ServletContextListener { | 11 | public final class EngineBootstrap implements ServletContextListener, HttpSessionListener { |
| 10 | @Override | 12 | @Override |
| 11 | public void contextInitialized(ServletContextEvent sce) { | 13 | public void contextInitialized(ServletContextEvent sce) { |
| 12 | ServerEngine.install(sce.getServletContext(), new ServerEngine(Clock.systemUTC())); | 14 | ServerEngine.install(sce.getServletContext(), new ServerEngine(Clock.systemUTC())); |
| 13 | } | 15 | } |
| 16 | |||
| 17 | @Override | ||
| 18 | public void sessionDestroyed(HttpSessionEvent se) { | ||
| 19 | var engine = ServerEngine.from(se.getSession().getServletContext()); | ||
| 20 | if (engine != null) { | ||
| 21 | engine.sessions().release(se.getSession()); | ||
| 22 | } | ||
| 23 | } | ||
| 14 | } | 24 | } |
diff --git a/server/src/main/java/market/guess/server/HealthServlet.java b/server/src/main/java/market/guess/server/HealthServlet.java index 124bf8d..9690916 100644 --- a/server/src/main/java/market/guess/server/HealthServlet.java +++ b/server/src/main/java/market/guess/server/HealthServlet.java | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | package market.guess.server; | 1 | package market.guess.server; |
| 2 | 2 | ||
| 3 | import com.google.gson.Gson; | ||
| 4 | import jakarta.servlet.annotation.WebServlet; | 3 | import jakarta.servlet.annotation.WebServlet; |
| 5 | import jakarta.servlet.http.HttpServlet; | 4 | import jakarta.servlet.http.HttpServlet; |
| 6 | import jakarta.servlet.http.HttpServletRequest; | 5 | import jakarta.servlet.http.HttpServletRequest; |
| @@ -10,23 +9,19 @@ import java.util.Map; | |||
| 10 | 9 | ||
| 11 | @WebServlet("/api/health") | 10 | @WebServlet("/api/health") |
| 12 | public final class HealthServlet extends HttpServlet { | 11 | public final class HealthServlet extends HttpServlet { |
| 13 | private static final Gson GSON = new Gson(); | ||
| 14 | |||
| 15 | @Override | 12 | @Override |
| 16 | protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { | 13 | protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { |
| 17 | var engine = ServerEngine.from(getServletContext()); | 14 | var engine = ServerEngine.from(getServletContext()); |
| 18 | res.setContentType("application/json"); | ||
| 19 | res.setCharacterEncoding("UTF-8"); | ||
| 20 | if (engine == null) { | 15 | if (engine == null) { |
| 21 | res.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); | 16 | Json.send(res, HttpServletResponse.SC_SERVICE_UNAVAILABLE, Map.of("status", "starting")); |
| 22 | GSON.toJson(Map.of("status", "starting"), res.getWriter()); | ||
| 23 | return; | 17 | return; |
| 24 | } | 18 | } |
| 25 | GSON.toJson( | 19 | Json.send( |
| 20 | res, | ||
| 21 | HttpServletResponse.SC_OK, | ||
| 26 | Map.of( | 22 | Map.of( |
| 27 | "status", "ok", | 23 | "status", "ok", |
| 28 | "events", engine.events().getAll().size(), | 24 | "events", engine.events().getAll().size(), |
| 29 | "users", engine.users().getAll().size()), | 25 | "users", engine.users().getAll().size())); |
| 30 | res.getWriter()); | ||
| 31 | } | 26 | } |
| 32 | } | 27 | } |
diff --git a/server/src/main/java/market/guess/server/Json.java b/server/src/main/java/market/guess/server/Json.java new file mode 100644 index 0000000..cfaa582 --- /dev/null +++ b/server/src/main/java/market/guess/server/Json.java | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import com.google.gson.Gson; | ||
| 4 | import jakarta.servlet.http.HttpServletResponse; | ||
| 5 | import java.io.IOException; | ||
| 6 | import java.util.Map; | ||
| 7 | import market.guess.api.Result; | ||
| 8 | |||
| 9 | final class Json { | ||
| 10 | static final Gson GSON = new Gson(); | ||
| 11 | |||
| 12 | private Json() {} | ||
| 13 | |||
| 14 | static void send(HttpServletResponse res, int status, Object body) throws IOException { | ||
| 15 | res.setStatus(status); | ||
| 16 | res.setContentType("application/json"); | ||
| 17 | res.setCharacterEncoding("UTF-8"); | ||
| 18 | GSON.toJson(body, res.getWriter()); | ||
| 19 | } | ||
| 20 | |||
| 21 | static void error(HttpServletResponse res, int status, String code, String message) | ||
| 22 | throws IOException { | ||
| 23 | send(res, status, Map.of("error", code, "message", message)); | ||
| 24 | } | ||
| 25 | |||
| 26 | static void error(HttpServletResponse res, int status, Result<?> failed) throws IOException { | ||
| 27 | var code = failed.getMessage() != null ? failed.getMessage() : "ERROR"; | ||
| 28 | error(res, status, code, failed.getDetails() != null ? failed.getDetails() : code); | ||
| 29 | } | ||
| 30 | } | ||
diff --git a/server/src/main/java/market/guess/server/LoginServlet.java b/server/src/main/java/market/guess/server/LoginServlet.java new file mode 100644 index 0000000..2a11e8a --- /dev/null +++ b/server/src/main/java/market/guess/server/LoginServlet.java | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | import java.util.Map; | ||
| 9 | |||
| 10 | /** POST /api/login with form field {@code username}. No passwords, by the spec. */ | ||
| 11 | @WebServlet("/api/login") | ||
| 12 | public final class LoginServlet extends HttpServlet { | ||
| 13 | @Override | ||
| 14 | protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { | ||
| 15 | var sessions = ServerEngine.from(getServletContext()).sessions(); | ||
| 16 | var result = sessions.login(req.getSession(), req.getParameter("username")); | ||
| 17 | if (!result.isSuccess()) { | ||
| 18 | var status = | ||
| 19 | "NAME_TAKEN".equals(result.getMessage()) | ||
| 20 | ? HttpServletResponse.SC_CONFLICT | ||
| 21 | : HttpServletResponse.SC_BAD_REQUEST; | ||
| 22 | Json.error(res, status, result); | ||
| 23 | return; | ||
| 24 | } | ||
| 25 | Json.send(res, HttpServletResponse.SC_OK, Map.of("username", result.getData())); | ||
| 26 | } | ||
| 27 | } | ||
diff --git a/server/src/main/java/market/guess/server/LogoutServlet.java b/server/src/main/java/market/guess/server/LogoutServlet.java new file mode 100644 index 0000000..b229bb3 --- /dev/null +++ b/server/src/main/java/market/guess/server/LogoutServlet.java | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | import java.util.Map; | ||
| 9 | |||
| 10 | /** POST /api/logout. Ending the session frees the name through {@link EngineBootstrap}. */ | ||
| 11 | @WebServlet("/api/logout") | ||
| 12 | public final class LogoutServlet extends HttpServlet { | ||
| 13 | @Override | ||
| 14 | protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { | ||
| 15 | var session = req.getSession(false); | ||
| 16 | if (session != null) { | ||
| 17 | session.invalidate(); | ||
| 18 | } | ||
| 19 | Json.send(res, HttpServletResponse.SC_OK, Map.of("loggedOut", true)); | ||
| 20 | } | ||
| 21 | } | ||
diff --git a/server/src/main/java/market/guess/server/ServerEngine.java b/server/src/main/java/market/guess/server/ServerEngine.java index af7edd9..41b8786 100644 --- a/server/src/main/java/market/guess/server/ServerEngine.java +++ b/server/src/main/java/market/guess/server/ServerEngine.java | |||
| @@ -32,6 +32,7 @@ public final class ServerEngine { | |||
| 32 | private final CatalogContext catalog; | 32 | private final CatalogContext catalog; |
| 33 | private final AccountContext accounts; | 33 | private final AccountContext accounts; |
| 34 | private final GuessMarketContext market; | 34 | private final GuessMarketContext market; |
| 35 | private final Sessions sessions; | ||
| 35 | 36 | ||
| 36 | public ServerEngine(Clock clock) { | 37 | public ServerEngine(Clock clock) { |
| 37 | var marketInfra = new MarketContext(events, users); | 38 | var marketInfra = new MarketContext(events, users); |
| @@ -40,6 +41,7 @@ public final class ServerEngine { | |||
| 40 | this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); | 41 | this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); |
| 41 | this.catalog = new LocalCatalogContext(uploads, marketInfra, events); | 42 | this.catalog = new LocalCatalogContext(uploads, marketInfra, events); |
| 42 | this.accounts = new LocalAccountContext(users, ledger); | 43 | this.accounts = new LocalAccountContext(users, ledger); |
| 44 | this.sessions = new Sessions(users); | ||
| 43 | this.market = | 45 | this.market = |
| 44 | new LocalGuessMarketContext( | 46 | new LocalGuessMarketContext( |
| 45 | marketInfra, | 47 | marketInfra, |
| @@ -80,4 +82,8 @@ public final class ServerEngine { | |||
| 80 | public GuessMarketContext market() { | 82 | public GuessMarketContext market() { |
| 81 | return market; | 83 | return market; |
| 82 | } | 84 | } |
| 85 | |||
| 86 | public Sessions sessions() { | ||
| 87 | return sessions; | ||
| 88 | } | ||
| 83 | } | 89 | } |
diff --git a/server/src/main/java/market/guess/server/Sessions.java b/server/src/main/java/market/guess/server/Sessions.java new file mode 100644 index 0000000..ae9d530 --- /dev/null +++ b/server/src/main/java/market/guess/server/Sessions.java | |||
| @@ -0,0 +1,60 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.http.HttpServletRequest; | ||
| 4 | import jakarta.servlet.http.HttpSession; | ||
| 5 | import java.util.Map; | ||
| 6 | import java.util.concurrent.ConcurrentHashMap; | ||
| 7 | import market.guess.api.Result; | ||
| 8 | import market.guess.service.catalog.infrastructure.repository.UserRepository; | ||
| 9 | import market.guess.service.domain.User; | ||
| 10 | |||
| 11 | public final class Sessions { | ||
| 12 | private static final String USER = "user"; | ||
| 13 | |||
| 14 | private final UserRepository users; | ||
| 15 | private final Map<String, String> active = new ConcurrentHashMap<>(); | ||
| 16 | |||
| 17 | public Sessions(UserRepository users) { | ||
| 18 | this.users = users; | ||
| 19 | } | ||
| 20 | |||
| 21 | public Result<String> login(HttpSession session, String username) { | ||
| 22 | if (username == null || username.isBlank()) { | ||
| 23 | return Result.error("INVALID_USERNAME", "Please enter a user name."); | ||
| 24 | } | ||
| 25 | var name = username.trim(); | ||
| 26 | |||
| 27 | var current = (String) session.getAttribute(USER); | ||
| 28 | if (name.equalsIgnoreCase(current)) { | ||
| 29 | return Result.ok(current); | ||
| 30 | } | ||
| 31 | if (current != null) { | ||
| 32 | release(session); | ||
| 33 | } | ||
| 34 | |||
| 35 | var holder = active.putIfAbsent(name.toLowerCase(), session.getId()); | ||
| 36 | if (holder != null && !holder.equals(session.getId())) { | ||
| 37 | return Result.error("NAME_TAKEN", "The user name '" + name + "' is already in use."); | ||
| 38 | } | ||
| 39 | |||
| 40 | User user; | ||
| 41 | synchronized (users) { | ||
| 42 | user = users.get(name).orElseGet(() -> users.add(new User(name, 0))); | ||
| 43 | } | ||
| 44 | session.setAttribute(USER, user.getName()); | ||
| 45 | return Result.ok(user.getName()); | ||
| 46 | } | ||
| 47 | |||
| 48 | public void release(HttpSession session) { | ||
| 49 | var name = (String) session.getAttribute(USER); | ||
| 50 | if (name != null) { | ||
| 51 | active.remove(name.toLowerCase(), session.getId()); | ||
| 52 | session.removeAttribute(USER); | ||
| 53 | } | ||
| 54 | } | ||
| 55 | |||
| 56 | public static String currentUser(HttpServletRequest req) { | ||
| 57 | var session = req.getSession(false); | ||
| 58 | return session == null ? null : (String) session.getAttribute(USER); | ||
| 59 | } | ||
| 60 | } | ||
diff --git a/server/src/test/java/market/guess/server/LoginTest.java b/server/src/test/java/market/guess/server/LoginTest.java new file mode 100644 index 0000000..fc556ae --- /dev/null +++ b/server/src/test/java/market/guess/server/LoginTest.java | |||
| @@ -0,0 +1,73 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| 4 | import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| 5 | |||
| 6 | import java.nio.file.Path; | ||
| 7 | import org.junit.jupiter.api.AfterAll; | ||
| 8 | import org.junit.jupiter.api.BeforeAll; | ||
| 9 | import org.junit.jupiter.api.Test; | ||
| 10 | import org.junit.jupiter.api.io.TempDir; | ||
| 11 | |||
| 12 | class LoginTest { | ||
| 13 | @TempDir static Path base; | ||
| 14 | private static TestServer server; | ||
| 15 | |||
| 16 | @BeforeAll | ||
| 17 | static void start() throws Exception { | ||
| 18 | server = new TestServer(base); | ||
| 19 | } | ||
| 20 | |||
| 21 | @AfterAll | ||
| 22 | static void stop() throws Exception { | ||
| 23 | server.close(); | ||
| 24 | } | ||
| 25 | |||
| 26 | @Test | ||
| 27 | void nameIsHeldByOneSessionUntilLogout() throws Exception { | ||
| 28 | var alice = TestServer.client(); | ||
| 29 | var res = server.post(alice, "/login", "username", " Ann "); | ||
| 30 | assertEquals(200, res.statusCode(), res.body()); | ||
| 31 | assertTrue(res.body().contains("\"username\":\"Ann\""), res.body()); | ||
| 32 | |||
| 33 | var impostor = TestServer.client(); | ||
| 34 | var taken = server.post(impostor, "/login", "username", "ann"); | ||
| 35 | assertEquals(409, taken.statusCode()); | ||
| 36 | assertTrue(taken.body().contains("NAME_TAKEN"), taken.body()); | ||
| 37 | |||
| 38 | assertEquals(200, server.post(alice, "/login", "username", "Ann").statusCode()); | ||
| 39 | |||
| 40 | assertEquals(200, server.post(alice, "/logout").statusCode()); | ||
| 41 | var back = server.post(impostor, "/login", "username", "ann"); | ||
| 42 | assertEquals(200, back.statusCode(), back.body()); | ||
| 43 | assertTrue(back.body().contains("\"username\":\"Ann\""), back.body()); | ||
| 44 | } | ||
| 45 | |||
| 46 | @Test | ||
| 47 | void switchingNameFreesThePreviousOne() throws Exception { | ||
| 48 | var client = TestServer.client(); | ||
| 49 | assertEquals(200, server.post(client, "/login", "username", "Ben").statusCode()); | ||
| 50 | assertEquals(200, server.post(client, "/login", "username", "Bob").statusCode()); | ||
| 51 | assertEquals(200, server.post(TestServer.client(), "/login", "username", "Ben").statusCode()); | ||
| 52 | } | ||
| 53 | |||
| 54 | @Test | ||
| 55 | void rejectsBlankNames() throws Exception { | ||
| 56 | var res = server.post(TestServer.client(), "/login", "username", " "); | ||
| 57 | assertEquals(400, res.statusCode()); | ||
| 58 | assertTrue(res.body().contains("INVALID_USERNAME"), res.body()); | ||
| 59 | assertEquals(400, server.post(TestServer.client(), "/login").statusCode()); | ||
| 60 | } | ||
| 61 | |||
| 62 | @Test | ||
| 63 | void loginRegistersAnAccount() throws Exception { | ||
| 64 | server.post(TestServer.client(), "/login", "username", "Cleo"); | ||
| 65 | var health = server.get(TestServer.client(), "/health"); | ||
| 66 | assertTrue(health.body().matches(".*\"users\":[1-9].*"), health.body()); | ||
| 67 | } | ||
| 68 | |||
| 69 | @Test | ||
| 70 | void logoutWithoutSessionIsHarmless() throws Exception { | ||
| 71 | assertEquals(200, server.post(TestServer.client(), "/logout").statusCode()); | ||
| 72 | } | ||
| 73 | } | ||
diff --git a/server/src/test/java/market/guess/server/ServerBootTest.java b/server/src/test/java/market/guess/server/ServerBootTest.java index 6fdcdc6..f8b21cf 100644 --- a/server/src/test/java/market/guess/server/ServerBootTest.java +++ b/server/src/test/java/market/guess/server/ServerBootTest.java | |||
| @@ -5,16 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; | |||
| 5 | import static org.junit.jupiter.api.Assertions.assertNull; | 5 | import static org.junit.jupiter.api.Assertions.assertNull; |
| 6 | import static org.junit.jupiter.api.Assertions.assertTrue; | 6 | import static org.junit.jupiter.api.Assertions.assertTrue; |
| 7 | 7 | ||
| 8 | import java.net.URI; | ||
| 9 | import java.net.http.HttpClient; | ||
| 10 | import java.net.http.HttpRequest; | 8 | import java.net.http.HttpRequest; |
| 11 | import java.net.http.HttpResponse; | 9 | import java.net.http.HttpResponse; |
| 12 | import java.nio.file.Files; | ||
| 13 | import java.nio.file.Path; | 10 | import java.nio.file.Path; |
| 14 | import org.apache.catalina.startup.Tomcat; | ||
| 15 | import org.apache.catalina.webresources.DirResourceSet; | ||
| 16 | import org.apache.catalina.webresources.StandardRoot; | ||
| 17 | import org.apache.tomcat.util.scan.StandardJarScanner; | ||
| 18 | import org.junit.jupiter.api.AfterAll; | 11 | import org.junit.jupiter.api.AfterAll; |
| 19 | import org.junit.jupiter.api.BeforeAll; | 12 | import org.junit.jupiter.api.BeforeAll; |
| 20 | import org.junit.jupiter.api.Test; | 13 | import org.junit.jupiter.api.Test; |
| @@ -22,49 +15,27 @@ import org.junit.jupiter.api.io.TempDir; | |||
| 22 | 15 | ||
| 23 | class ServerBootTest { | 16 | class ServerBootTest { |
| 24 | private static final String ORIGIN = "http://localhost:5173"; | 17 | private static final String ORIGIN = "http://localhost:5173"; |
| 25 | private static final HttpClient HTTP = HttpClient.newHttpClient(); | ||
| 26 | 18 | ||
| 27 | @TempDir static Path base; | 19 | @TempDir static Path base; |
| 28 | private static Tomcat tomcat; | 20 | private static TestServer server; |
| 29 | private static String api; | ||
| 30 | 21 | ||
| 31 | @BeforeAll | 22 | @BeforeAll |
| 32 | static void start() throws Exception { | 23 | static void start() throws Exception { |
| 33 | tomcat = new Tomcat(); | 24 | server = new TestServer(base); |
| 34 | tomcat.setBaseDir(base.toString()); | ||
| 35 | tomcat.setPort(0); | ||
| 36 | tomcat.getConnector(); | ||
| 37 | |||
| 38 | var docBase = Files.createDirectories(base.resolve("webapp")); | ||
| 39 | var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); | ||
| 40 | ctx.setParentClassLoader(ServerBootTest.class.getClassLoader()); | ||
| 41 | ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); | ||
| 42 | var resources = new StandardRoot(ctx); | ||
| 43 | resources.addPreResources( | ||
| 44 | new DirResourceSet( | ||
| 45 | resources, | ||
| 46 | "/WEB-INF/classes", | ||
| 47 | Path.of("build/classes/server").toAbsolutePath().toString(), | ||
| 48 | "/")); | ||
| 49 | ctx.setResources(resources); | ||
| 50 | |||
| 51 | tomcat.start(); | ||
| 52 | api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; | ||
| 53 | } | 25 | } |
| 54 | 26 | ||
| 55 | @AfterAll | 27 | @AfterAll |
| 56 | static void stop() throws Exception { | 28 | static void stop() throws Exception { |
| 57 | tomcat.stop(); | 29 | server.close(); |
| 58 | tomcat.destroy(); | ||
| 59 | } | 30 | } |
| 60 | 31 | ||
| 61 | private static HttpResponse<String> send(HttpRequest.Builder req) throws Exception { | 32 | private static HttpResponse<String> send(HttpRequest.Builder req) throws Exception { |
| 62 | return HTTP.send(req.build(), HttpResponse.BodyHandlers.ofString()); | 33 | return TestServer.client().send(req.build(), HttpResponse.BodyHandlers.ofString()); |
| 63 | } | 34 | } |
| 64 | 35 | ||
| 65 | @Test | 36 | @Test |
| 66 | void healthReportsEmptyMarket() throws Exception { | 37 | void healthReportsEmptyMarket() throws Exception { |
| 67 | var res = send(HttpRequest.newBuilder(URI.create(api + "/health"))); | 38 | var res = send(server.request("/health")); |
| 68 | assertEquals(200, res.statusCode()); | 39 | assertEquals(200, res.statusCode()); |
| 69 | assertTrue(res.headers().firstValue("Content-Type").orElse("").startsWith("application/json")); | 40 | assertTrue(res.headers().firstValue("Content-Type").orElse("").startsWith("application/json")); |
| 70 | assertTrue(res.body().contains("\"status\":\"ok\""), res.body()); | 41 | assertTrue(res.body().contains("\"status\":\"ok\""), res.body()); |
| @@ -75,7 +46,8 @@ class ServerBootTest { | |||
| 75 | void preflightAllowsCredentialedCrossOriginCalls() throws Exception { | 46 | void preflightAllowsCredentialedCrossOriginCalls() throws Exception { |
| 76 | var res = | 47 | var res = |
| 77 | send( | 48 | send( |
| 78 | HttpRequest.newBuilder(URI.create(api + "/health")) | 49 | server |
| 50 | .request("/health") | ||
| 79 | .method("OPTIONS", HttpRequest.BodyPublishers.noBody()) | 51 | .method("OPTIONS", HttpRequest.BodyPublishers.noBody()) |
| 80 | .header("Origin", ORIGIN) | 52 | .header("Origin", ORIGIN) |
| 81 | .header("Access-Control-Request-Method", "POST")); | 53 | .header("Access-Control-Request-Method", "POST")); |
| @@ -87,10 +59,10 @@ class ServerBootTest { | |||
| 87 | 59 | ||
| 88 | @Test | 60 | @Test |
| 89 | void corsHeadersOnlyForCrossOriginRequests() throws Exception { | 61 | void corsHeadersOnlyForCrossOriginRequests() throws Exception { |
| 90 | var cross = send(HttpRequest.newBuilder(URI.create(api + "/health")).header("Origin", ORIGIN)); | 62 | var cross = send(server.request("/health").header("Origin", ORIGIN)); |
| 91 | assertEquals(ORIGIN, cross.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); | 63 | assertEquals(ORIGIN, cross.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); |
| 92 | 64 | ||
| 93 | var same = send(HttpRequest.newBuilder(URI.create(api + "/health"))); | 65 | var same = send(server.request("/health")); |
| 94 | assertNull(same.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); | 66 | assertNull(same.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); |
| 95 | assertFalse(same.body().isEmpty()); | 67 | assertFalse(same.body().isEmpty()); |
| 96 | } | 68 | } |
diff --git a/server/src/test/java/market/guess/server/TestServer.java b/server/src/test/java/market/guess/server/TestServer.java new file mode 100644 index 0000000..9b77819 --- /dev/null +++ b/server/src/test/java/market/guess/server/TestServer.java | |||
| @@ -0,0 +1,77 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import java.net.CookieManager; | ||
| 4 | import java.net.URI; | ||
| 5 | import java.net.URLEncoder; | ||
| 6 | import java.net.http.HttpClient; | ||
| 7 | import java.net.http.HttpRequest; | ||
| 8 | import java.net.http.HttpResponse; | ||
| 9 | import java.nio.charset.StandardCharsets; | ||
| 10 | import java.nio.file.Files; | ||
| 11 | import java.nio.file.Path; | ||
| 12 | import org.apache.catalina.startup.Tomcat; | ||
| 13 | import org.apache.catalina.webresources.DirResourceSet; | ||
| 14 | import org.apache.catalina.webresources.StandardRoot; | ||
| 15 | import org.apache.tomcat.util.scan.StandardJarScanner; | ||
| 16 | |||
| 17 | final class TestServer implements AutoCloseable { | ||
| 18 | private final Tomcat tomcat; | ||
| 19 | final String api; | ||
| 20 | |||
| 21 | TestServer(Path base) throws Exception { | ||
| 22 | tomcat = new Tomcat(); | ||
| 23 | tomcat.setBaseDir(base.toString()); | ||
| 24 | tomcat.setPort(0); | ||
| 25 | tomcat.getConnector(); | ||
| 26 | |||
| 27 | var docBase = Files.createDirectories(base.resolve("webapp")); | ||
| 28 | var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); | ||
| 29 | ctx.setParentClassLoader(TestServer.class.getClassLoader()); | ||
| 30 | ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); | ||
| 31 | var resources = new StandardRoot(ctx); | ||
| 32 | resources.addPreResources( | ||
| 33 | new DirResourceSet( | ||
| 34 | resources, | ||
| 35 | "/WEB-INF/classes", | ||
| 36 | Path.of("build/classes/server").toAbsolutePath().toString(), | ||
| 37 | "/")); | ||
| 38 | ctx.setResources(resources); | ||
| 39 | |||
| 40 | tomcat.start(); | ||
| 41 | api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; | ||
| 42 | } | ||
| 43 | |||
| 44 | static HttpClient client() { | ||
| 45 | return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); | ||
| 46 | } | ||
| 47 | |||
| 48 | HttpRequest.Builder request(String path) { | ||
| 49 | return HttpRequest.newBuilder(URI.create(api + path)); | ||
| 50 | } | ||
| 51 | |||
| 52 | HttpResponse<String> get(HttpClient client, String path) throws Exception { | ||
| 53 | return client.send(request(path).build(), HttpResponse.BodyHandlers.ofString()); | ||
| 54 | } | ||
| 55 | |||
| 56 | HttpResponse<String> post(HttpClient client, String path, String... fields) throws Exception { | ||
| 57 | var form = new StringBuilder(); | ||
| 58 | for (var i = 0; i < fields.length; i += 2) { | ||
| 59 | if (!form.isEmpty()) form.append('&'); | ||
| 60 | form.append(fields[i]) | ||
| 61 | .append('=') | ||
| 62 | .append(URLEncoder.encode(fields[i + 1], StandardCharsets.UTF_8)); | ||
| 63 | } | ||
| 64 | var req = | ||
| 65 | request(path) | ||
| 66 | .header("Content-Type", "application/x-www-form-urlencoded") | ||
| 67 | .POST(HttpRequest.BodyPublishers.ofString(form.toString())) | ||
| 68 | .build(); | ||
| 69 | return client.send(req, HttpResponse.BodyHandlers.ofString()); | ||
| 70 | } | ||
| 71 | |||
| 72 | @Override | ||
| 73 | public void close() throws Exception { | ||
| 74 | tomcat.stop(); | ||
| 75 | tomcat.destroy(); | ||
| 76 | } | ||
| 77 | } | ||