aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/market
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/main/java/market')
-rw-r--r--server/src/main/java/market/guess/server/EngineBootstrap.java12
-rw-r--r--server/src/main/java/market/guess/server/HealthServlet.java15
-rw-r--r--server/src/main/java/market/guess/server/Json.java30
-rw-r--r--server/src/main/java/market/guess/server/LoginServlet.java27
-rw-r--r--server/src/main/java/market/guess/server/LogoutServlet.java21
-rw-r--r--server/src/main/java/market/guess/server/ServerEngine.java6
-rw-r--r--server/src/main/java/market/guess/server/Sessions.java60
7 files changed, 160 insertions, 11 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;
3import jakarta.servlet.ServletContextEvent; 3import jakarta.servlet.ServletContextEvent;
4import jakarta.servlet.ServletContextListener; 4import jakarta.servlet.ServletContextListener;
5import jakarta.servlet.annotation.WebListener; 5import jakarta.servlet.annotation.WebListener;
6import jakarta.servlet.http.HttpSessionEvent;
7import jakarta.servlet.http.HttpSessionListener;
6import java.time.Clock; 8import java.time.Clock;
7 9
8@WebListener 10@WebListener
9public final class EngineBootstrap implements ServletContextListener { 11public 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 @@
1package market.guess.server; 1package market.guess.server;
2 2
3import com.google.gson.Gson;
4import jakarta.servlet.annotation.WebServlet; 3import jakarta.servlet.annotation.WebServlet;
5import jakarta.servlet.http.HttpServlet; 4import jakarta.servlet.http.HttpServlet;
6import jakarta.servlet.http.HttpServletRequest; 5import jakarta.servlet.http.HttpServletRequest;
@@ -10,23 +9,19 @@ import java.util.Map;
10 9
11@WebServlet("/api/health") 10@WebServlet("/api/health")
12public final class HealthServlet extends HttpServlet { 11public 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 @@
1package market.guess.server;
2
3import com.google.gson.Gson;
4import jakarta.servlet.http.HttpServletResponse;
5import java.io.IOException;
6import java.util.Map;
7import market.guess.api.Result;
8
9final 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 @@
1package market.guess.server;
2
3import jakarta.servlet.annotation.WebServlet;
4import jakarta.servlet.http.HttpServlet;
5import jakarta.servlet.http.HttpServletRequest;
6import jakarta.servlet.http.HttpServletResponse;
7import java.io.IOException;
8import java.util.Map;
9
10/** POST /api/login with form field {@code username}. No passwords, by the spec. */
11@WebServlet("/api/login")
12public 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 @@
1package market.guess.server;
2
3import jakarta.servlet.annotation.WebServlet;
4import jakarta.servlet.http.HttpServlet;
5import jakarta.servlet.http.HttpServletRequest;
6import jakarta.servlet.http.HttpServletResponse;
7import java.io.IOException;
8import java.util.Map;
9
10/** POST /api/logout. Ending the session frees the name through {@link EngineBootstrap}. */
11@WebServlet("/api/logout")
12public 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 @@
1package market.guess.server;
2
3import jakarta.servlet.http.HttpServletRequest;
4import jakarta.servlet.http.HttpSession;
5import java.util.Map;
6import java.util.concurrent.ConcurrentHashMap;
7import market.guess.api.Result;
8import market.guess.service.catalog.infrastructure.repository.UserRepository;
9import market.guess.service.domain.User;
10
11public 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}