From 33d313e17b841db3736c465447913df0cc73d5df Mon Sep 17 00:00:00 2001 From: Kostya Date: Fri, 9 Oct 2026 18:44:33 +0300 Subject: server: add username login and logout endpoints The spec asks for a login by unique name only, with no passwords or sign-up, and an error that lets the user try again if the name exists. Add POST /api/login (form field "username") and POST /api/logout. Sessions maps each name, ignoring case, to the one HTTP session holding it. A second session asking for a held name gets 409 NAME_TAKEN, and a blank name gets 400. When a session ends, by logout or by Tomcat timing it out after a client quits without logging out, an HttpSessionListener frees the name. The account itself (ledger, Market Maker roles) stays, and logging in with that name again resumes it rather than locking the user out for the life of the server. New accounts start with a zero balance and are funded through deposits. Json gives every endpoint the same response shape, with errors as {"error": CODE, "message": text} built from a failed Result. Tomcat setup for the tests moves into a shared TestServer helper, whose clients each keep their own cookie jar and so act as separate users. --- .../java/market/guess/server/EngineBootstrap.java | 12 +++- .../java/market/guess/server/HealthServlet.java | 15 ++--- server/src/main/java/market/guess/server/Json.java | 30 +++++++++ .../java/market/guess/server/LoginServlet.java | 27 ++++++++ .../java/market/guess/server/LogoutServlet.java | 21 ++++++ .../java/market/guess/server/ServerEngine.java | 6 ++ .../main/java/market/guess/server/Sessions.java | 60 +++++++++++++++++ .../test/java/market/guess/server/LoginTest.java | 73 ++++++++++++++++++++ .../java/market/guess/server/ServerBootTest.java | 46 +++---------- .../test/java/market/guess/server/TestServer.java | 77 ++++++++++++++++++++++ 10 files changed, 319 insertions(+), 48 deletions(-) create mode 100644 server/src/main/java/market/guess/server/Json.java create mode 100644 server/src/main/java/market/guess/server/LoginServlet.java create mode 100644 server/src/main/java/market/guess/server/LogoutServlet.java create mode 100644 server/src/main/java/market/guess/server/Sessions.java create mode 100644 server/src/test/java/market/guess/server/LoginTest.java create mode 100644 server/src/test/java/market/guess/server/TestServer.java (limited to 'server/src') 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; import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextListener; import jakarta.servlet.annotation.WebListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import java.time.Clock; @WebListener -public final class EngineBootstrap implements ServletContextListener { +public final class EngineBootstrap implements ServletContextListener, HttpSessionListener { @Override public void contextInitialized(ServletContextEvent sce) { ServerEngine.install(sce.getServletContext(), new ServerEngine(Clock.systemUTC())); } + + @Override + public void sessionDestroyed(HttpSessionEvent se) { + var engine = ServerEngine.from(se.getSession().getServletContext()); + if (engine != null) { + engine.sessions().release(se.getSession()); + } + } } 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 @@ package market.guess.server; -import com.google.gson.Gson; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; @@ -10,23 +9,19 @@ import java.util.Map; @WebServlet("/api/health") public final class HealthServlet extends HttpServlet { - private static final Gson GSON = new Gson(); - @Override protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException { var engine = ServerEngine.from(getServletContext()); - res.setContentType("application/json"); - res.setCharacterEncoding("UTF-8"); if (engine == null) { - res.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); - GSON.toJson(Map.of("status", "starting"), res.getWriter()); + Json.send(res, HttpServletResponse.SC_SERVICE_UNAVAILABLE, Map.of("status", "starting")); return; } - GSON.toJson( + Json.send( + res, + HttpServletResponse.SC_OK, Map.of( "status", "ok", "events", engine.events().getAll().size(), - "users", engine.users().getAll().size()), - res.getWriter()); + "users", engine.users().getAll().size())); } } 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 @@ +package market.guess.server; + +import com.google.gson.Gson; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; +import market.guess.api.Result; + +final class Json { + static final Gson GSON = new Gson(); + + private Json() {} + + static void send(HttpServletResponse res, int status, Object body) throws IOException { + res.setStatus(status); + res.setContentType("application/json"); + res.setCharacterEncoding("UTF-8"); + GSON.toJson(body, res.getWriter()); + } + + static void error(HttpServletResponse res, int status, String code, String message) + throws IOException { + send(res, status, Map.of("error", code, "message", message)); + } + + static void error(HttpServletResponse res, int status, Result failed) throws IOException { + var code = failed.getMessage() != null ? failed.getMessage() : "ERROR"; + error(res, status, code, failed.getDetails() != null ? failed.getDetails() : code); + } +} 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 @@ +package market.guess.server; + +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + +/** POST /api/login with form field {@code username}. No passwords, by the spec. */ +@WebServlet("/api/login") +public final class LoginServlet extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { + var sessions = ServerEngine.from(getServletContext()).sessions(); + var result = sessions.login(req.getSession(), req.getParameter("username")); + if (!result.isSuccess()) { + var status = + "NAME_TAKEN".equals(result.getMessage()) + ? HttpServletResponse.SC_CONFLICT + : HttpServletResponse.SC_BAD_REQUEST; + Json.error(res, status, result); + return; + } + Json.send(res, HttpServletResponse.SC_OK, Map.of("username", result.getData())); + } +} 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 @@ +package market.guess.server; + +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + +/** POST /api/logout. Ending the session frees the name through {@link EngineBootstrap}. */ +@WebServlet("/api/logout") +public final class LogoutServlet extends HttpServlet { + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse res) throws IOException { + var session = req.getSession(false); + if (session != null) { + session.invalidate(); + } + Json.send(res, HttpServletResponse.SC_OK, Map.of("loggedOut", true)); + } +} 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 { private final CatalogContext catalog; private final AccountContext accounts; private final GuessMarketContext market; + private final Sessions sessions; public ServerEngine(Clock clock) { var marketInfra = new MarketContext(events, users); @@ -40,6 +41,7 @@ public final class ServerEngine { this.uploads = new XMLLoaderV3(events, new EventMapperV3(), new XMLValidatorV3()); this.catalog = new LocalCatalogContext(uploads, marketInfra, events); this.accounts = new LocalAccountContext(users, ledger); + this.sessions = new Sessions(users); this.market = new LocalGuessMarketContext( marketInfra, @@ -80,4 +82,8 @@ public final class ServerEngine { public GuessMarketContext market() { return market; } + + public Sessions sessions() { + return sessions; + } } 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 @@ +package market.guess.server; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import market.guess.api.Result; +import market.guess.service.catalog.infrastructure.repository.UserRepository; +import market.guess.service.domain.User; + +public final class Sessions { + private static final String USER = "user"; + + private final UserRepository users; + private final Map active = new ConcurrentHashMap<>(); + + public Sessions(UserRepository users) { + this.users = users; + } + + public Result login(HttpSession session, String username) { + if (username == null || username.isBlank()) { + return Result.error("INVALID_USERNAME", "Please enter a user name."); + } + var name = username.trim(); + + var current = (String) session.getAttribute(USER); + if (name.equalsIgnoreCase(current)) { + return Result.ok(current); + } + if (current != null) { + release(session); + } + + var holder = active.putIfAbsent(name.toLowerCase(), session.getId()); + if (holder != null && !holder.equals(session.getId())) { + return Result.error("NAME_TAKEN", "The user name '" + name + "' is already in use."); + } + + User user; + synchronized (users) { + user = users.get(name).orElseGet(() -> users.add(new User(name, 0))); + } + session.setAttribute(USER, user.getName()); + return Result.ok(user.getName()); + } + + public void release(HttpSession session) { + var name = (String) session.getAttribute(USER); + if (name != null) { + active.remove(name.toLowerCase(), session.getId()); + session.removeAttribute(USER); + } + } + + public static String currentUser(HttpServletRequest req) { + var session = req.getSession(false); + return session == null ? null : (String) session.getAttribute(USER); + } +} 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 @@ +package market.guess.server; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.nio.file.Path; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class LoginTest { + @TempDir static Path base; + private static TestServer server; + + @BeforeAll + static void start() throws Exception { + server = new TestServer(base); + } + + @AfterAll + static void stop() throws Exception { + server.close(); + } + + @Test + void nameIsHeldByOneSessionUntilLogout() throws Exception { + var alice = TestServer.client(); + var res = server.post(alice, "/login", "username", " Ann "); + assertEquals(200, res.statusCode(), res.body()); + assertTrue(res.body().contains("\"username\":\"Ann\""), res.body()); + + var impostor = TestServer.client(); + var taken = server.post(impostor, "/login", "username", "ann"); + assertEquals(409, taken.statusCode()); + assertTrue(taken.body().contains("NAME_TAKEN"), taken.body()); + + assertEquals(200, server.post(alice, "/login", "username", "Ann").statusCode()); + + assertEquals(200, server.post(alice, "/logout").statusCode()); + var back = server.post(impostor, "/login", "username", "ann"); + assertEquals(200, back.statusCode(), back.body()); + assertTrue(back.body().contains("\"username\":\"Ann\""), back.body()); + } + + @Test + void switchingNameFreesThePreviousOne() throws Exception { + var client = TestServer.client(); + assertEquals(200, server.post(client, "/login", "username", "Ben").statusCode()); + assertEquals(200, server.post(client, "/login", "username", "Bob").statusCode()); + assertEquals(200, server.post(TestServer.client(), "/login", "username", "Ben").statusCode()); + } + + @Test + void rejectsBlankNames() throws Exception { + var res = server.post(TestServer.client(), "/login", "username", " "); + assertEquals(400, res.statusCode()); + assertTrue(res.body().contains("INVALID_USERNAME"), res.body()); + assertEquals(400, server.post(TestServer.client(), "/login").statusCode()); + } + + @Test + void loginRegistersAnAccount() throws Exception { + server.post(TestServer.client(), "/login", "username", "Cleo"); + var health = server.get(TestServer.client(), "/health"); + assertTrue(health.body().matches(".*\"users\":[1-9].*"), health.body()); + } + + @Test + void logoutWithoutSessionIsHarmless() throws Exception { + assertEquals(200, server.post(TestServer.client(), "/logout").statusCode()); + } +} 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; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.net.URI; -import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.file.Files; import java.nio.file.Path; -import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.webresources.DirResourceSet; -import org.apache.catalina.webresources.StandardRoot; -import org.apache.tomcat.util.scan.StandardJarScanner; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -22,49 +15,27 @@ import org.junit.jupiter.api.io.TempDir; class ServerBootTest { private static final String ORIGIN = "http://localhost:5173"; - private static final HttpClient HTTP = HttpClient.newHttpClient(); @TempDir static Path base; - private static Tomcat tomcat; - private static String api; + private static TestServer server; @BeforeAll static void start() throws Exception { - tomcat = new Tomcat(); - tomcat.setBaseDir(base.toString()); - tomcat.setPort(0); - tomcat.getConnector(); - - var docBase = Files.createDirectories(base.resolve("webapp")); - var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); - ctx.setParentClassLoader(ServerBootTest.class.getClassLoader()); - ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); - var resources = new StandardRoot(ctx); - resources.addPreResources( - new DirResourceSet( - resources, - "/WEB-INF/classes", - Path.of("build/classes/server").toAbsolutePath().toString(), - "/")); - ctx.setResources(resources); - - tomcat.start(); - api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; + server = new TestServer(base); } @AfterAll static void stop() throws Exception { - tomcat.stop(); - tomcat.destroy(); + server.close(); } private static HttpResponse send(HttpRequest.Builder req) throws Exception { - return HTTP.send(req.build(), HttpResponse.BodyHandlers.ofString()); + return TestServer.client().send(req.build(), HttpResponse.BodyHandlers.ofString()); } @Test void healthReportsEmptyMarket() throws Exception { - var res = send(HttpRequest.newBuilder(URI.create(api + "/health"))); + var res = send(server.request("/health")); assertEquals(200, res.statusCode()); assertTrue(res.headers().firstValue("Content-Type").orElse("").startsWith("application/json")); assertTrue(res.body().contains("\"status\":\"ok\""), res.body()); @@ -75,7 +46,8 @@ class ServerBootTest { void preflightAllowsCredentialedCrossOriginCalls() throws Exception { var res = send( - HttpRequest.newBuilder(URI.create(api + "/health")) + server + .request("/health") .method("OPTIONS", HttpRequest.BodyPublishers.noBody()) .header("Origin", ORIGIN) .header("Access-Control-Request-Method", "POST")); @@ -87,10 +59,10 @@ class ServerBootTest { @Test void corsHeadersOnlyForCrossOriginRequests() throws Exception { - var cross = send(HttpRequest.newBuilder(URI.create(api + "/health")).header("Origin", ORIGIN)); + var cross = send(server.request("/health").header("Origin", ORIGIN)); assertEquals(ORIGIN, cross.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); - var same = send(HttpRequest.newBuilder(URI.create(api + "/health"))); + var same = send(server.request("/health")); assertNull(same.headers().firstValue("Access-Control-Allow-Origin").orElse(null)); assertFalse(same.body().isEmpty()); } 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 @@ +package market.guess.server; + +import java.net.CookieManager; +import java.net.URI; +import java.net.URLEncoder; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import org.apache.catalina.startup.Tomcat; +import org.apache.catalina.webresources.DirResourceSet; +import org.apache.catalina.webresources.StandardRoot; +import org.apache.tomcat.util.scan.StandardJarScanner; + +final class TestServer implements AutoCloseable { + private final Tomcat tomcat; + final String api; + + TestServer(Path base) throws Exception { + tomcat = new Tomcat(); + tomcat.setBaseDir(base.toString()); + tomcat.setPort(0); + tomcat.getConnector(); + + var docBase = Files.createDirectories(base.resolve("webapp")); + var ctx = tomcat.addWebapp("/guess-market", docBase.toString()); + ctx.setParentClassLoader(TestServer.class.getClassLoader()); + ((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false); + var resources = new StandardRoot(ctx); + resources.addPreResources( + new DirResourceSet( + resources, + "/WEB-INF/classes", + Path.of("build/classes/server").toAbsolutePath().toString(), + "/")); + ctx.setResources(resources); + + tomcat.start(); + api = "http://localhost:" + tomcat.getConnector().getLocalPort() + "/guess-market/api"; + } + + static HttpClient client() { + return HttpClient.newBuilder().cookieHandler(new CookieManager()).build(); + } + + HttpRequest.Builder request(String path) { + return HttpRequest.newBuilder(URI.create(api + path)); + } + + HttpResponse get(HttpClient client, String path) throws Exception { + return client.send(request(path).build(), HttpResponse.BodyHandlers.ofString()); + } + + HttpResponse post(HttpClient client, String path, String... fields) throws Exception { + var form = new StringBuilder(); + for (var i = 0; i < fields.length; i += 2) { + if (!form.isEmpty()) form.append('&'); + form.append(fields[i]) + .append('=') + .append(URLEncoder.encode(fields[i + 1], StandardCharsets.UTF_8)); + } + var req = + request(path) + .header("Content-Type", "application/x-www-form-urlencoded") + .POST(HttpRequest.BodyPublishers.ofString(form.toString())) + .build(); + return client.send(req, HttpResponse.BodyHandlers.ofString()); + } + + @Override + public void close() throws Exception { + tomcat.stop(); + tomcat.destroy(); + } +} -- cgit v1.2.3