Do not descend after forbidden symlinks or access exceptions

Author: idodeclare

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

@@ -419,9 +419,11 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                 } catch (IllegalAccessException iae) {
                     LOGGER.log(Level.WARNING, "Could not create repository for '"
                             + file + "', missing access rights.", iae);
+                    continue;
                 } catch (ForbiddenSymlinkException e) {
-                    LOGGER.log(Level.WARNING, "Could not create repository for '"
-                            + file + "', path traversal issues.", e);
+                    LOGGER.log(Level.WARNING, "Could not create repository for ''{0}'': {1}",
+                            new Object[] {file, e.getMessage()});
+                    continue;
                 }
                 if (repository == null) {
                     // Not a repository, search its sub-dirs.

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

@@ -123,14 +123,16 @@ public static Repository getRepository(File file, boolean interactive)
     public static Repository getRepository(File file, boolean interactive, boolean isNested)
             throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException,
             IOException, ForbiddenSymlinkException {
+
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
-        Repository repo = null;
+        String relFile = env.getPathRelativeToSourceRoot(file);
 
+        Repository repo = null;
         for (Repository rep : repositories) {
             if ((!isNested || rep.isNestable()) && rep.isRepositoryFor(file, interactive)) {
                 repo = rep.getClass().getDeclaredConstructor().newInstance();
 
-                if (env.isProjectsEnabled() && env.getPathRelativeToSourceRoot(file).equals(File.separator)) {
+                if (env.isProjectsEnabled() && relFile.equals(File.separator)) {
                     LOGGER.log(Level.WARNING, "{0} was detected as {1} repository however with directory " +
                             "matching source root. This is invalid because projects are enabled. Ignoring this " +
                             "repository.",