Skip to content

Add the will request routes to the realm allow-list #38

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbarlow97 merged 1 commit into from
Oct 13, 2026
Merged

Add the will request routes to the realm allow-list #38

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
6 changes: 4 additions & 2 deletions src/main/java/net/tfminecraft/tfmcweb/api/ProvinceSystemGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ private static boolean needsRealmQuery(String method, String barePath) {
return equalsPath(barePath, "/characters/plugin/pending")
|| equalsPath(barePath, "/skins/plugin/approved")
|| equalsPath(barePath, "/drinks/plugin/pending-apply")
|| equalsPath(barePath, "/characters/plugin/lore-items/pending");
|| equalsPath(barePath, "/characters/plugin/lore-items/pending")
|| equalsPath(barePath, "/characters/plugin/wills/pending");
}

private static boolean needsRealmBody(String method, String barePath) {
Expand All @@ -223,7 +224,8 @@ private static boolean needsRealmBody(String method, String barePath) {
// code from being spent on the live realm without a new plugin config key.
if ("POST".equals(method)) {
return equalsPath(barePath, "/wars/declare-codes/validate")
|| equalsPath(barePath, "/wars/declare-codes/redeem");
|| equalsPath(barePath, "/wars/declare-codes/redeem")
|| equalsPath(barePath, "/characters/plugin/wills/applied");
}
return false;
}
Expand Down
23 changes: 21 additions & 2 deletions src/test/java/net/tfminecraft/tfmcweb/api/ProvinceSystemGatewayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ProvinceSystemGatewayTest {
@Test void injectsQueryOnlyOnAllowlistedGetsAndPreservesExplicitRealm() {
assertNull(ProvinceSystemGateway.injectRealmPath("GET", null));
assertEquals(" ", ProvinceSystemGateway.injectRealmPath("GET", " "));
for (String path : List.of("/characters/plugin/pending", "/skins/plugin/approved", "/drinks/plugin/pending-apply", "/characters/plugin/lore-items/pending")) {
for (String path : List.of("/characters/plugin/pending", "/skins/plugin/approved", "/drinks/plugin/pending-apply", "/characters/plugin/lore-items/pending", "/characters/plugin/wills/pending")) {
assertEquals(path+"?realm_id=dev", ProvinceSystemGateway.injectRealmPath("GET", path));
assertEquals(path+"/?realm_id=dev", ProvinceSystemGateway.injectRealmPath("GET", path+"/"));
assertEquals(path+"?a=1&realm_id=dev", ProvinceSystemGateway.injectRealmPath("GET", path+"?a=1"));
Expand All @@ -67,7 +67,7 @@ class ProvinceSystemGatewayTest {
}
@Test void injectsBodiesOnlyOnAllowlistedWrites() {
for (String method : List.of("PUT", "POST")) {
List<String> paths = method.equals("PUT") ? List.of("/characters/plugin/roster", "/characters/plugin/rpc-player-meta") : List.of("/wars/declare-codes/validate", "/wars/declare-codes/redeem");
List<String> paths = method.equals("PUT") ? List.of("/characters/plugin/roster", "/characters/plugin/rpc-player-meta") : List.of("/wars/declare-codes/validate", "/wars/declare-codes/redeem", "/characters/plugin/wills/applied");
for (String path : paths) {
assertEquals("{\"realm_id\":\"dev\"}", ProvinceSystemGateway.injectRealmBody(method, path, "{}"));
assertEquals("{\"a\":1,\"realm_id\":\"dev\"}", ProvinceSystemGateway.injectRealmBody(method, path+"?x=1", " { \"a\":1 } "));
Expand All @@ -79,6 +79,25 @@ class ProvinceSystemGatewayTest {
assertEquals("{}", ProvinceSystemGateway.injectRealmBody("PUT", "/other", "{}"));
assertEquals("{}", ProvinceSystemGateway.injectRealmBody("PUT", null, "{}"));
}
@Test void willRoutesCarryTheRealmAndKeepAnExplicitOne() throws Exception {
http.reply(200, "{\"requests\":[]}");
assertTrue(ProvinceSystemGateway.request("GET", "/characters/plugin/wills/pending", null).ok);
assertEquals("/characters/plugin/wills/pending?realm_id=dev", http.request().path());
http.reply(200, "{\"requests\":[]}");
assertTrue(ProvinceSystemGateway.request("GET", "/characters/plugin/wills/pending?realm_id=main", null).ok);
assertEquals("/characters/plugin/wills/pending?realm_id=main", http.request().path());
http.reply(200, "{\"ok\":true}");
assertTrue(ProvinceSystemGateway.request("POST", "/characters/plugin/wills/applied", "{\"results\":[]}").ok);
var injected = com.google.gson.JsonParser.parseString(http.request().body()).getAsJsonObject();
assertEquals("dev", injected.get("realm_id").getAsString()); assertTrue(injected.get("results").isJsonArray());
http.reply(200, "{\"ok\":true}");
assertTrue(ProvinceSystemGateway.request("POST", "/characters/plugin/wills/applied", "{\"realm_id\":\"main\",\"results\":[]}").ok);
assertEquals("{\"realm_id\":\"main\",\"results\":[]}", http.request().body());
// The pull is GET-only and the ack is POST-only.
assertEquals("/characters/plugin/wills/applied", ProvinceSystemGateway.injectRealmPath("GET", "/characters/plugin/wills/applied"));
assertEquals("{}", ProvinceSystemGateway.injectRealmBody("PUT", "/characters/plugin/wills/applied", "{}"));
assertEquals("{}", ProvinceSystemGateway.injectRealmBody("POST", "/characters/plugin/wills/pending", "{}"));
}
@Test void patchWorksOnSupportedJavaWithoutOpeningJdkModules() throws Exception {
http.reply(200, "patched");
var result = ProvinceSystemGateway.request("PATCH", "/resource", "{}");
Expand Down