Fix error message on localFolderWhitelist (#7776)

* Update ExploreRemoteLayerService.scala * Update RemoteSourceDescriptorService.scala --------- Co-authored-by: Florian M <[email protected]>
scalableminds · May 2, 2024 · 0e6ce88 · 0e6ce88
1 parent 6ee06fb
commit 0e6ce88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/dataset/explore/ExploreRemoteLayerService.scala b/app/models/dataset/explore/ExploreRemoteLayerService.scala
@@ -139,7 +139,7 @@ class ExploreRemoteLayerService @Inject()(credentialService: CredentialService,
 
   private def assertLocalPathInWhitelist(uri: URI)(implicit ec: ExecutionContext): Fox[Unit] =
     if (uri.getScheme == DataVaultService.schemeFile) {
-      bool2Fox(wkConf.Datastore.localFolderWhitelist.exists(whitelistEntry => uri.getPath.startsWith(whitelistEntry))) ?~> s"Absolute path ${uri.getPath} in local file system is not in path whitelist. Consider adding it to datastore.pathWhitelist"
+      bool2Fox(wkConf.Datastore.localFolderWhitelist.exists(whitelistEntry => uri.getPath.startsWith(whitelistEntry))) ?~> s"Absolute path ${uri.getPath} in local file system is not in path whitelist. Consider adding it to datastore.localFolderWhitelist"
     } else Fox.successful(())
 
   private def exploreRemoteLayersForRemotePath(remotePath: VaultPath,

diff --git a/...re/app/com/scalableminds/webknossos/datastore/storage/RemoteSourceDescriptorService.scala b/...re/app/com/scalableminds/webknossos/datastore/storage/RemoteSourceDescriptorService.scala
@@ -65,7 +65,7 @@ class RemoteSourceDescriptorService @Inject()(dSRemoteWebknossosClient: DSRemote
               uri
             else
               throw new Exception(
-                s"Absolute path $localPath in local file system is not in path whitelist. Consider adding it to datastore.pathWhitelist")
+                s"Absolute path $localPath in local file system is not in path whitelist. Consider adding it to datastore.localFolderWhitelist")
           } else { // relative local path, resolve in dataset dir
             val magPathRelativeToDataset = localDatasetDir.resolve(localPath)
             val magPathRelativeToLayer = localDatasetDir.resolve(layerName).resolve(localPath)