Skip to content

Verify fee schedule file with PipeRoot.isUnderRoot #1031

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
labkey-matthewb merged 2 commits into from
Oct 29, 2026
Merged

Verify fee schedule file with PipeRoot.isUnderRoot #1031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aea0f6
Verify fee schedule file with PipeRoot.isUnderRoot
labkey-matthewb Oct 29, 2026
f8a092c
Merge remote-tracking branch 'origin/develop' into fb_docker_tar
labkey-matthewb Oct 29, 2026
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
23 changes: 4 additions & 19 deletions snprc_ehr/src/org/labkey/snprc_ehr/controllers/FeeScheduleController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
import org.labkey.api.security.RequiresPermission;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.Path;
import org.labkey.api.util.URIUtil;
import org.labkey.api.util.URLHelper;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.JspView;
Expand All @@ -40,13 +38,11 @@
import org.labkey.snprc_ehr.pipeline.FeeScheduleImportForm;
import org.labkey.snprc_ehr.pipeline.FeeSchedulePipelineJob;
import org.labkey.vfs.FileLike;
import org.labkey.vfs.FileSystemLike;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.web.servlet.ModelAndView;

import java.io.File;
import java.net.URI;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -155,30 +151,19 @@ public ModelAndView getView(FeeScheduleImportForm form, boolean reshow, BindExce

private File getVerifiedFile(String filePath)
{
File fileToVerify = new File(filePath);

PipeRoot pipeRoot = PipelineService.get().findPipelineRoot(getContainer());
if (pipeRoot == null)
{
throw new NotFoundException("Could not find a pipeline root for '" + getContainer().getPath() + "'");
}

FileLike allowedRoot = pipeRoot.getRootFileLike();
URI relativeURI = URIUtil.relativize(allowedRoot.toURI(), fileToVerify.toURI()); // if root = /a/b/c/ and file = /a/b/c/d/e/f.xlsx, relativeURI = d/e/f.xlsx

if (relativeURI == null)
File file = new File(filePath).toPath().normalize().toFile();
if (!pipeRoot.isUnderRoot(file))
{
throw new IllegalArgumentException("File '" + fileToVerify.toURI().getPath() + "' is outside the allowed root '" + allowedRoot.toURI().getPath() + "'");
throw new NotFoundException("File '" + filePath + "' is outside the pipeline root");
}

if (allowedRoot.isDescendant(fileToVerify.toURI())) // if root = /a/b/c/ and file = /a/b/c/d/e/f.xlsx - among other things, this essentially checks if '/a/b/c/d/e/f.xlsx' starts with '/a/b/c/'
{
return FileSystemLike.toFile(allowedRoot.resolveFile(new Path(relativeURI.getPath())));
}
else
{
throw new IllegalArgumentException("File '" + relativeURI.getPath() + "' is not a descendent of '" + allowedRoot.toURI().getPath() + "'");
}
return file;
}

@Override
Expand Down
Loading