Add administrator-controlled IP project entry redirects
This commit is contained in:
1 parent
1f25bbd1f9
commit
2f93fb023a
13 files changed
+439
-5
No files matched your search
@@ -137,6 +137,80 @@ class DomainIntegrationTest {
|
||||
coordinator.execute(row);
|
||||
}
|
||||
|
||||
@Test
|
||||
void ipPathRequiresAdminAndRedirectsOnlyToAnActiveReviewedProject() throws Exception {
|
||||
UUID admin = users.create("ip-admin@test.com", "Admin", "StrongPassword123", "test");
|
||||
users.db().update("INSERT INTO user_roles VALUES (?,'SUPER_ADMIN')", admin);
|
||||
String adminToken =
|
||||
users
|
||||
.login("ip-admin@test.com", "StrongPassword123", "test", "test", 1)
|
||||
.get("token")
|
||||
.toString();
|
||||
String memberToken =
|
||||
users
|
||||
.login("domains@test.com", "StrongPassword123", "test", "test", 1)
|
||||
.get("token")
|
||||
.toString();
|
||||
String ip = "192.0.2.20:8088", alias = "/student-info";
|
||||
String adminRoute = "/api/admin/sites/" + project + "/ip-entry";
|
||||
String memberRoute = "/api/projects/" + project + "/ip-entry";
|
||||
String enable = "{\"enabled\":true,\"alias\":\"student-info\"}";
|
||||
try {
|
||||
mvc.perform(
|
||||
put("/api/admin/settings")
|
||||
.header("Authorization", "Bearer " + adminToken)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("{\"ipEntryOrigin\":\"http://" + ip + "\"}"))
|
||||
.andExpect(status().isOk());
|
||||
mvc.perform(
|
||||
put(adminRoute)
|
||||
.header("Authorization", "Bearer " + memberToken)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(enable))
|
||||
.andExpect(status().isForbidden());
|
||||
mvc.perform(
|
||||
put(adminRoute)
|
||||
.header("Authorization", "Bearer " + adminToken)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(enable))
|
||||
.andExpect(status().isOk());
|
||||
mvc.perform(get(memberRoute).header("Authorization", "Bearer " + memberToken))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$.status").value("WAITING"));
|
||||
mvc.perform(get(alias).header("Host", ip)).andExpect(status().isNotFound());
|
||||
publish();
|
||||
UUID domain = (UUID) platform("published-student-site").get("id");
|
||||
users.db().update("UPDATE project_domains SET status='ACTIVE' WHERE id=?", domain);
|
||||
mvc.perform(get(alias).header("Host", "unrelated.example"))
|
||||
.andExpect(status().isUnauthorized());
|
||||
mvc.perform(get(alias + "/").header("Host", ip))
|
||||
.andExpect(status().isFound())
|
||||
.andExpect(header().string("Location", "https://published-student-site.webup.run/"))
|
||||
.andExpect(header().string("Cache-Control", "no-store"));
|
||||
mvc.perform(get(memberRoute).header("Authorization", "Bearer " + memberToken))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$.url").value("http://" + ip + alias));
|
||||
users
|
||||
.db()
|
||||
.update("UPDATE project_moderation SET status='BANNED' WHERE project_id=?", project);
|
||||
mvc.perform(get(alias).header("Host", ip)).andExpect(status().isNotFound());
|
||||
users
|
||||
.db()
|
||||
.update("UPDATE project_moderation SET status='APPROVED' WHERE project_id=?", project);
|
||||
mvc.perform(
|
||||
put(adminRoute)
|
||||
.header("Authorization", "Bearer " + adminToken)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content("{\"enabled\":false}"))
|
||||
.andExpect(status().isOk());
|
||||
mvc.perform(get(alias).header("Host", ip)).andExpect(status().isNotFound());
|
||||
} finally {
|
||||
users
|
||||
.db()
|
||||
.update("UPDATE system_settings SET setting_value='' WHERE setting_key='ipEntryOrigin'");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void stablePlatformBindingIsIdempotentAndNeverReassignsRemovedHost() {
|
||||
var a = platform("stable-project");
|
||||
|
||||
Reference in new issue
Block a user