Skip to content

fix subdirectory validation #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2015
Merged

fix subdirectory validation #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,14 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
}

private FilePath getSourceDirectory(FilePath basePath) throws IOException, InterruptedException {
String subdirectory = this.subdirectory.trim().length() > 0 ? this.subdirectory.trim() : "";
String subdirectory = StringUtils.trimToEmpty(this.subdirectory);
if (!subdirectory.isEmpty() && !subdirectory.startsWith("/")) {
subdirectory = "/" + subdirectory;
}
FilePath sourcePath = basePath.withSuffix(subdirectory).absolutize();
File sourceDirectory = new File(sourcePath.getRemote());
if (!sourceDirectory.isDirectory() || !isSubDirectory(basePath, sourcePath)) {
throw new IllegalArgumentException("Provided path is not a subdirectory of the workspace: " + sourcePath );
if (!sourcePath.isDirectory() || !isSubDirectory(basePath, sourcePath)) {
Copy link

@varmenise varmenise Jul 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can isSubDirectory(basePath, sourcePath)) ever be false? Since we said FilePath sourcePath = basePath.withSuffix(subdirectory).absolutize();

Copy link
Author

@ydubreuil ydubreuil Jul 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it could be false if subdirectory contains something like "../non-workspace-dir". I guess that's what the original author wanted to check.

throw new IllegalArgumentException("Provided path (resolved as '" + sourcePath
+"') is not a subdirectory of the workspace (resolved as '" + basePath + "')");
}
return sourcePath;
}
Expand Down