From 1229b7f6999cad430053efbf52befc4c042a1da3 Mon Sep 17 00:00:00 2001 From: Florian M Date: Thu, 26 Jun 2025 09:36:39 +0200 Subject: [PATCH 1/2] Fix check for relative mag paths in datasource validation --- .../webknossos/datastore/services/DataSourceService.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/DataSourceService.scala b/webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/DataSourceService.scala index a313a99405d..0db71b5a843 100644 --- a/webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/DataSourceService.scala +++ b/webknossos-datastore/app/com/scalableminds/webknossos/datastore/services/DataSourceService.scala @@ -226,7 +226,10 @@ class DataSourceService @Inject()( val uri = new URI(pathStr) if (DataVaultService.isRemoteScheme(uri.getScheme)) true else { - val path = Path.of(new URI(pathStr).getPath).normalize().toAbsolutePath + val path = organizationDir + .resolve(dataSource.id.directoryName) + .resolve(Path.of(new URI(pathStr).getPath).normalize()) + .toAbsolutePath val allowedParent = organizationDir.toAbsolutePath if (path.startsWith(allowedParent)) true else false } From 489c68ca29c243f989cb17717b999ecb09fec1ed Mon Sep 17 00:00:00 2001 From: Florian M Date: Thu, 26 Jun 2025 09:40:13 +0200 Subject: [PATCH 2/2] changelog --- unreleased_changes/8720.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 unreleased_changes/8720.md diff --git a/unreleased_changes/8720.md b/unreleased_changes/8720.md new file mode 100644 index 00000000000..5e4adb50845 --- /dev/null +++ b/unreleased_changes/8720.md @@ -0,0 +1,2 @@ +### Fixed +- Fixed a bug where the checks on relative paths were too strict when editing dataset settings.