Fixes #2950 : don't partially canonicalize in GitRepository

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/history/GitRepository.java

@@ -195,9 +195,8 @@ private HistoryRevResult getHistoryRev(
              * Be careful, git uses only forward slashes in its command and output (not in file path).
              * Using backslashes together with git show will get empty output and 0 status code.
              */
-            String filename = Paths.get(getDirectoryName()).relativize(Paths.get(fullpath))
-                                   .toString()
-                                   .replace(File.separatorChar, '/');
+            String filename = Paths.get(getCanonicalDirectoryName()).relativize(
+                    Paths.get(fullpath)).toString().replace(File.separatorChar, '/');
             ensureCommand(CMD_PROPERTY_KEY, CMD_FALLBACK);
             String[] argv = {
                 RepoCommand,
@@ -234,13 +233,9 @@ boolean getHistoryGet(
         String fullpath;
         try {
             fullpath = new File(parent, basename).getCanonicalPath();
-        } catch (IOException exp) {
-            LOGGER.log(Level.SEVERE, exp, new Supplier<String>() {
-                @Override
-                public String get() {
-                    return String.format("Failed to get canonical path: %s/%s", parent, basename);
-                }
-            });
+        } catch (IOException e) {
+            LOGGER.log(Level.WARNING, e, () -> String.format(
+                    "Failed to get canonical path: %s/%s", parent, basename));
             return false;
         }
 
@@ -265,7 +260,14 @@ public String get() {
             }
 
             if (origpath != null) {
-                final String fullRenamedPath = Paths.get(getDirectoryName(), origpath).toString();
+                String fullRenamedPath;
+                try {
+                    fullRenamedPath = Paths.get(getCanonicalDirectoryName(), origpath).toString();
+                } catch (IOException e) {
+                    LOGGER.log(Level.WARNING, e, () -> String.format(
+                            "Failed to get canonical path: .../%s", origpath));
+                    return false;
+                }
                 if (!fullRenamedPath.equals(fullpath)) {
                     result = getHistoryRev(sink, fullRenamedPath, rev);
                 }

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoryInfo.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.history;
 
@@ -54,11 +54,9 @@ public class RepositoryInfo implements Serializable {
 
     private static final long serialVersionUID = 3L;
 
-    // dummy to avoid storing absolute path in XML encoded configuration
-    // Do not use this member.
-    private transient String directoryName;
-    
     private String directoryNameRelative;
+    private transient String directoryNameCanonical;
+
     protected Boolean working;
     protected String type;  // type of the repository, should be unique
     protected boolean remote;
@@ -127,6 +125,7 @@ public String getDirectoryNameRelative() {
      */
     public void setDirectoryNameRelative(String dir) {
         this.directoryNameRelative = dir;
+        this.directoryNameCanonical = null;
     }
 
     /**
@@ -137,7 +136,18 @@ public void setDirectoryNameRelative(String dir) {
     public String getDirectoryName() {
         return Paths.get(RuntimeEnvironment.getInstance().getSourceRootPath(),
                 directoryNameRelative).toString();
+    }
 
+    /**
+     * Get the name of the root directory for this repository.
+     *
+     * @return the name of the root directory
+     */
+    public String getCanonicalDirectoryName() throws IOException {
+        if (directoryNameCanonical == null) {
+            directoryNameCanonical = new File(getDirectoryName()).getCanonicalPath();
+        }
+        return directoryNameCanonical;
     }
 
     /**