SnapshotManager

Author: szetszwo

ratis-common/src/main/java/org/apache/ratis/util/FileUtils.java

@@ -60,6 +60,39 @@ static <T> T attempt(CheckedSupplier<T, IOException> op, Supplier<?> name) throw
     }
   }
 
+  /** @return true iff the given dir is an ancestor of the given sub path.  */
+  static boolean isAncestor(File dir, File sub) throws IOException {
+    Objects.requireNonNull(dir, "dir == null");
+    Objects.requireNonNull(sub, "sub == null");
+
+    String dirPath = dir.getCanonicalPath();
+    final String subPath = sub.getCanonicalPath();
+    if (Objects.equals(dirPath, subPath)) {
+      return true;
+    } else if (!dirPath.endsWith(File.separator)) {
+      dirPath += File.separator;
+    }
+    LOG.debug("dirPath: {}", dirPath);
+    LOG.debug("subPath: {}", subPath);
+    return subPath.startsWith(dirPath);
+  }
+
+  /**
+   * Resolve the full path from the given dir and sub,
+   * where dir is supposed to be an ancestor of the resolved path.
+   *
+   * @return the full path
+   * @throws IOException if the dir is not an ancestor of the resolved path.
+   */
+  static File resolveFullPath(File dir, String sub) throws IOException {
+    final File full = new File(dir, sub);
+    if (!isAncestor(dir, full)) {
+      throw new IOException("The dir is not an ancestor of the full path: dir=" + dir
+          + ", sub=" + sub + ", full=" + full);
+    }
+    return full;
+  }
+
   static void truncateFile(File f, long target) throws IOException {
     final long original = f.length();
     LogUtils.runAndLog(LOG,

ratis-common/src/test/java/org/apache/ratis/util/TestFileUtils.java

@@ -26,6 +26,32 @@
 
 /** Test methods of {@link FileUtils}. */
 public class TestFileUtils extends BaseTest {
+  @Test
+  public void testIsAncestor() throws IOException {
+    runTestIsAncestor(true, "/a", "/a/b");
+    runTestIsAncestor(true, "/a", "/a/");
+    runTestIsAncestor(true, "/a", "/a");
+    runTestIsAncestor(true, "a", "a/b");
+    runTestIsAncestor(true, "a", "a/");
+    runTestIsAncestor(true, "a", "a");
+
+    runTestIsAncestor(false, "/a", "/c");
+    runTestIsAncestor(false, "/a", "/abc");
+    runTestIsAncestor(false, "/a", "/a/../c");
+    runTestIsAncestor(false, "a", "a/../c");
+    runTestIsAncestor(false, "a", "/c");
+  }
+
+  static void runTestIsAncestor(boolean expected, String ancestor, String path) throws IOException {
+    final boolean computed = isAncestor(ancestor, path);
+    System.out.printf("isAncestor(%2s, %-9s)? %s, expected? %s%n",
+        ancestor, path, computed, expected);
+    Assertions.assertSame(expected, computed);
+  }
+
+  static boolean isAncestor(String ancestor, String path) throws IOException {
+    return FileUtils.isAncestor(new File(ancestor), new File(path));
+  }
 
   @Test
   public void testRenameToCorrupt() throws IOException {

ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java

@@ -31,6 +31,7 @@
 import org.apache.ratis.util.MemoizedSupplier;
 import org.apache.ratis.util.Preconditions;
 import org.apache.ratis.util.StringUtils;
+import org.apache.ratis.util.function.CheckedFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +44,6 @@
 import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -61,7 +61,7 @@ public class SnapshotManager {
 
   private final Supplier<File> snapshotDir;
   private final Supplier<File> snapshotTmpDir;
-  private final Function<FileChunkProto, String> getRelativePath;
+  private final CheckedFunction<FileChunkProto, String, IOException> getRelativePath;
   private MessageDigest digester;
 
   SnapshotManager(RaftPeerId selfId, Supplier<RaftStorageDirectory> dir, StateMachineStorage smStorage) {
@@ -73,7 +73,7 @@ public class SnapshotManager {
 
     final Supplier<Path> smDir = MemoizedSupplier.valueOf(() -> dir.get().getStateMachineDir().toPath());
     this.getRelativePath = c -> smDir.get().relativize(
-        new File(dir.get().getRoot(), c.getFilename()).toPath()).toString();
+        FileUtils.resolveFullPath(dir.get().getRoot(), c.getFilename()).toPath()).toString();
   }
 
   @SuppressWarnings({"squid:S2095"}) // Suppress closeable  warning
@@ -121,7 +121,7 @@ public void installSnapshot(InstallSnapshotRequestProto request, StateMachine st
             + " with endIndex >= lastIncludedIndex " + lastIncludedIndex);
       }
 
-      final File tmpSnapshotFile = new File(tmpDir, getRelativePath.apply(chunk));
+      final File tmpSnapshotFile = FileUtils.resolveFullPath(tmpDir, getRelativePath.apply(chunk));
       FileUtils.createDirectoriesDeleteExistingNonDirectory(tmpSnapshotFile.getParentFile());
 
       try (FileChannel out = open(chunk, tmpSnapshotFile)) {
@@ -180,8 +180,8 @@ private static void rename(File tmpDir, File stateMachineDir) throws IOException
       try {
         moved = FileUtils.move(stateMachineDir, TMP + StringUtils.currentDateTime());
       } catch(IOException e) {
-        LOG.warn("Failed to rename state machine directory " + stateMachineDir.getAbsolutePath()
-            + " to a " + TMP + " directory.  Try deleting it directly.", e);
+        LOG.warn("Failed to rename state machine directory {} to a {} directory.  Try deleting it directly.",
+            TMP, stateMachineDir.getAbsolutePath(), e);
         FileUtils.deleteFully(stateMachineDir);
       }
       existingDir = moved;