[bugfix] Make sure filesystem paths are normalised

Author: adamretter

exist-core/src/main/java/org/exist/client/InteractiveClient.java

@@ -2173,7 +2173,7 @@ private void applyDefaultConfig(Optional<Path> home) throws ClassNotFoundExcepti
                 configFile = Optional.ofNullable(ConfigurationHelper.lookup((String) CONF_XML.get("")));
             }
         }
-        configFile.ifPresent(value -> properties.setProperty(CONFIGURATION, value.toAbsolutePath().toString()));
+        configFile.ifPresent(value -> properties.setProperty(CONFIGURATION, value.toString()));
     }
 
     final boolean isInteractive() {

exist-core/src/main/java/org/exist/util/Configuration.java

@@ -127,6 +127,8 @@ public Configuration(String configFilename, Optional<Path> existHomeDirname) thr
         InputStream is = null;
         try {
 
+            existHomeDirname = existHomeDirname.map(Path::normalize);
+
             if(configFilename == null) {
                 // Default file name
                 configFilename = DatabaseImpl.CONF_XML;
@@ -164,7 +166,6 @@ public Configuration(String configFilename, Optional<Path> existHomeDirname) thr
                     }
                 }
 
-
                 Path configFile = Paths.get(configFilename);
 
                 if(!configFile.isAbsolute() && existHome.isPresent()) {
@@ -889,15 +890,15 @@ private void configureBackend( final Optional<Path> dbHome, Element con ) throws
         final String dataFiles = getConfigAttributeValue( con, BrokerPool.DATA_DIR_ATTRIBUTE );
 
         if (dataFiles != null) {
-            final Path df = ConfigurationHelper.lookup( dataFiles, dbHome );
+            final Path df = ConfigurationHelper.lookup(dataFiles, dbHome);
             if (!Files.isReadable(df)) {
                 try {
                     Files.createDirectories(df);
                 } catch (final IOException ioe) {
-                    throw new DatabaseConfigurationException("cannot read data directory: " + df.toAbsolutePath().toString(), ioe);
+                    throw new DatabaseConfigurationException("cannot read data directory: " + df, ioe);
                 }
             }
-            config.put(BrokerPool.PROPERTY_DATA_DIR, df.toAbsolutePath());
+            config.put(BrokerPool.PROPERTY_DATA_DIR, df);
             LOG.debug(BrokerPool.PROPERTY_DATA_DIR + ": {}", config.get(BrokerPool.PROPERTY_DATA_DIR));
         }
 
@@ -1116,9 +1117,9 @@ private void configureRecovery( final Optional<Path> dbHome, Element recovery )
             final Path rf = ConfigurationHelper.lookup( option, dbHome );
 
             if(!Files.isReadable(rf)) {
-                throw new DatabaseConfigurationException( "cannot read data directory: " + rf.toAbsolutePath());
+                throw new DatabaseConfigurationException( "cannot read data directory: " + rf);
             }
-            setProperty(Journal.PROPERTY_RECOVERY_JOURNAL_DIR, rf.toAbsolutePath());
+            setProperty(Journal.PROPERTY_RECOVERY_JOURNAL_DIR, rf);
             LOG.debug(Journal.PROPERTY_RECOVERY_JOURNAL_DIR + ": {}", config.get(Journal.PROPERTY_RECOVERY_JOURNAL_DIR));
         }
 

exist-core/src/main/java/org/exist/util/ConfigurationHelper.java

@@ -109,7 +109,7 @@ public static Optional<Path> getExistHome(final String config) {
         final Path userHomeRelativeConfig = userHome.resolve(config);
         if (Files.isDirectory(userHome) && Files.isRegularFile(userHomeRelativeConfig)) {
             final Path existHome = userHomeRelativeConfig.getParent().normalize();
-            LOG.debug("Got eXist home: {} from system property 'user.home': {}", existHome.toAbsolutePath().toString(), userHome.toAbsolutePath().toString());
+            LOG.debug("Got eXist home: {} from system property 'user.home': {}", existHome.toAbsolutePath(), userHome.toAbsolutePath());
             return Optional.of(existHome);
         }
 
@@ -119,7 +119,7 @@ public static Optional<Path> getExistHome(final String config) {
         final Path userDirRelativeConfig = userDir.resolve(config);
         if (Files.isDirectory(userDir) && Files.isRegularFile(userDirRelativeConfig)) {
             final Path existHome = userDirRelativeConfig.getParent().normalize();
-            LOG.debug("Got eXist home: {} from system property 'user.dir': {}", existHome.toAbsolutePath().toString(), userDir.toAbsolutePath().toString());
+            LOG.debug("Got eXist home: {} from system property 'user.dir': {}", existHome.toAbsolutePath(), userDir.toAbsolutePath());
             return Optional.of(existHome);
         }
 
@@ -132,7 +132,7 @@ public static Optional<Path> getExistHome(final String config) {
                     existHome = Paths.get(new URI(configUrl.getPath())).getParent().getParent().normalize();
                     LOG.warn("{} file was found on the classpath, but inside a Jar file! Derived EXIST_HOME from Jar's parent folder: {}", config, existHome);
                 } else {
-                    existHome = Paths.get(configUrl.toURI()).getParent();
+                    existHome = Paths.get(configUrl.toURI()).getParent().normalize();
                     if (FileUtils.fileName(existHome).equals("etc")) {
                         existHome = existHome.getParent().normalize();
                     }
@@ -179,15 +179,14 @@ public static Path lookup(final String path) {
      * @return the file handle
      */
     public static Path lookup(final String path, final Optional<Path> parent) {
-        // resolvePath is used for things like ~user/folder
-        final Path p = decodeUserHome(path);
-        if (p.isAbsolute()) {
-            return p;
+        // attempt to first resolve the path that is used for things like ~user/folder
+        Path p = decodeUserHome(path);
+        if (!p.isAbsolute()) {
+            p = parent
+                    .orElse(getExistHome().orElse(Paths.get(System.getProperty("user.dir"))))
+                    .resolve(path);
         }
-
-        return parent
-                .orElse(getExistHome().orElse(Paths.get(System.getProperty("user.dir"))))
-                .resolve(path);
+        return p.normalize().toAbsolutePath();
     }
 
 

exist-core/src/main/java/org/exist/util/SingleInstanceConfiguration.java

@@ -66,7 +66,7 @@ public SingleInstanceConfiguration(String configFilename, Optional<Path> existHo
     public static Optional<Path> getPath() {
         if (!_configFile.isPresent()) {
             final Path f = ConfigurationHelper.lookup("conf.xml");
-            return Optional.of(f.toAbsolutePath());
+            return Optional.of(f);
         }
         return _configFile;
     }