Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

Use "real paths" instead of absolute paths

Browse Source 
See issue #82 for details:
https://bitbucket.org/sdorra/scm-manager/issues/82/symbolic-link-in-hg-repository-path
This commit is contained in:
René Pfeuffer
2018-11-23 11:59:12 +01:00
parent 5cff79fc97
commit c0000df508
3 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
View File

@@ -45,8 +45,8 @@ import sonia.scm.store.ConfigurationStoreFactory;
import sonia.scm.xml.AbstractXmlDAO;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Optional;
@@ -158,11 +158,22 @@ public class XmlRepositoryDAO
@Override
public String getIdForDirectory(File path) {
return db.getPaths().stream()
.filter(p -> path.toPath().startsWith(context.getBaseDirectory().toPath().resolve(p.getPath()).toAbsolutePath()))
.map(RepositoryPath::getId)
.findAny()
.orElseThrow(() -> new RuntimeException("could not find repository for directory: " + path));
for (RepositoryPath p : db.getPaths()) {
if (toRealPath(path.toPath()).startsWith(toRealPath(context.getBaseDirectory().toPath().resolve(p.getPath())))) {
return p.getId();
}
}
throw new RuntimeException("could not find repository for directory: " + path);
}
private Path toRealPath(Path path) {
try {
// resolve links and other indirections
// (see issue #82, https://bitbucket.org/sdorra/scm-manager/issues/82/symbolic-link-in-hg-repository-path)
return path.toRealPath();
} catch (IOException e) {
throw new RuntimeException("could not get Path$toRealPath for path: " + path);
}
}
private Optional<RepositoryPath> findExistingRepositoryPath(Repository repository) {