Skip to content

Improved sanity checks on archiveFileName field in package_index.json #9649

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 2 commits into from
Jan 21, 2020
Merged

Improved sanity checks on archiveFileName field in package_index.json #9649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59a3e98
Improved sanity checks on filenames in package_index.json
cmaglie Jan 21, 2020
723f19e
Even stricter sanity checks
cmaglie Jan 21, 2020
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
7 changes: 6 additions & 1 deletion arduino-core/src/cc/arduino/contributions/DownloadableContributionsDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ public File download(DownloadableContribution contribution, Progress progress, f

public File download(DownloadableContribution contribution, Progress progress, final String statusText, ProgressListener progressListener, boolean noResume, boolean allowCache) throws Exception {
URL url = new URL(contribution.getUrl());
Path outputFile = Paths.get(stagingFolder.getAbsolutePath(), contribution.getArchiveFileName());
// Filter out paths from file name
String filename = new File(contribution.getArchiveFileName()).getName();
Path outputFile = Paths.get(stagingFolder.getAbsolutePath(), filename).normalize();
if (outputFile.toFile().isDirectory()) {
throw new Exception(format("Can't download {0}: invalid filename or exinsting directory", contribution.getArchiveFileName()));
}

// Ensure the existence of staging folder
Files.createDirectories(stagingFolder.toPath());
Expand Down