Skip to content

Commit

Permalink
Normalize the workspace path before comparing with other folders.
Browse files Browse the repository at this point in the history
  • Loading branch information
uhafner committed May 20, 2023
1 parent 7a4ea3e commit d1a630e
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,18 @@ public Set<String> getPermittedSourceDirectories(
final Set<String> allowedSourceDirectories,
final Set<String> requestedSourceDirectories,
final FilteredLog log) {
var normalizedWorkspacePath = PATH_UTIL.getAbsolutePath(workspacePath);
Set<String> filteredDirectories = new HashSet<>();
for (String sourceDirectory : requestedSourceDirectories) {
if (isValidDirectory(sourceDirectory)) {
if (PATH_UTIL.isAbsolute(sourceDirectory)) {
verifyAbsoluteDirectory(workspacePath, allowedSourceDirectories, filteredDirectories,
verifyAbsoluteDirectory(normalizedWorkspacePath, allowedSourceDirectories, filteredDirectories,
PATH_UTIL.getAbsolutePath(sourceDirectory), log
);
}
else {
filteredDirectories.add(PATH_UTIL.createAbsolutePath(workspacePath,
sourceDirectory)); // relative workspace paths are always ok
filteredDirectories.add(
PATH_UTIL.createAbsolutePath(normalizedWorkspacePath, sourceDirectory)); // relative workspace paths are always ok
}
}
}
Expand Down

0 comments on commit d1a630e

Please sign in to comment.