Skip to content

Improved exception if other than the currently active workspace is validated #1925

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copierrj merged 1 commit into from
Jan 28, 2026
+10 −4
Merged

Improved exception if other than the currently active workspace is validated #1925

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
9 changes: 8 additions & 1 deletion ...s/deegree-services-config/src/main/java/org/deegree/services/config/actions/Validate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.apache.commons.io.IOUtils.write;
import static org.deegree.services.config.actions.Utils.getWorkspaceAndPath;
import static org.deegree.services.controller.OGCFrontController.getServiceWorkspace;
import static org.slf4j.LoggerFactory.getLogger;

import java.io.File;
Expand All @@ -16,7 +17,6 @@
import java.util.TreeMap;

import jakarta.servlet.http.HttpServletResponse;

import org.deegree.commons.config.DeegreeWorkspace;
import org.deegree.commons.config.ResourceInitException;
import org.deegree.commons.utils.Pair;
Expand Down Expand Up @@ -44,6 +44,13 @@ public class Validate {
*/
public static void validate(String path, HttpServletResponse resp) throws IOException {
Pair<DeegreeWorkspace, String> p = getWorkspaceAndPath(path);
DeegreeWorkspace currentWorkspace = getServiceWorkspace();
if (!currentWorkspace.getName().equals(p.getFirst().getName())) {
setStatusCodeAndContentType(400, resp);
write("Validating the requested workspace is not allowed: " + p.getFirst().getName()
+ " is not the currently active workspace.", resp.getOutputStream());
return;
}

try {
DeegreeWorkspace workspace = p.getFirst();
Expand Down
5 changes: 2 additions & 3 deletions ...gree-services-config/src/main/java/org/deegree/services/config/servlet/ConfigServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
import static org.deegree.services.config.actions.ListFonts.listFonts;
import static org.deegree.services.config.actions.ListWorkspaces.listWorkspaces;
import static org.deegree.services.config.actions.Restart.restart;
import static org.deegree.services.config.actions.UpdateBboxCache.updateBboxCache;
import static org.deegree.services.config.actions.Update.update;
import static org.deegree.services.config.actions.UpdateBboxCache.updateBboxCache;
import static org.deegree.services.config.actions.Upload.upload;
import static org.deegree.services.config.actions.Validate.validate;
import static org.slf4j.LoggerFactory.getLogger;
Expand All @@ -56,7 +56,6 @@
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.apache.commons.io.IOUtils;
import org.deegree.services.config.ApiKey;
import org.slf4j.Logger;
Expand Down Expand Up @@ -111,7 +110,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
data.append(
"GET /config/validate[/path] - validate currently running workspace or file in workspace\n");
data.append(
"GET /config/validate/wsname[/path] - validate workspace with name <wsname> or file in workspace\n");
"GET /config/validate/wsname[/path] - validate workspace with name <wsname> or file in workspace. Only the active workspace can be validated.\n");
data.append(
"GET /config/update/bboxcache[?featureStoreId=] - recalculates the bounding boxes of all feature stores of the currently running workspace, with the parameter 'featureStoreId' a comma separated list of feature stores to update can be passed\n");
data.append(
Expand Down