Skip to content
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

Jump to bottom

[bot] Merge 24.2 to develop #396

Merged
merged 3 commits into from
Feb 7, 2024
Merged

[bot] Merge 24.2 to develop #396

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00ea91d
Overwrite the Content-Disposition header in DownloadToolAction for Sk…
vagisha Feb 2, 2024
af898bd
Merge 23.11 to 24.2
labkey-teamcity Feb 6, 2024
982d0a2
Merge 24.2 to develop
labkey-teamcity Feb 7, 2024
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
29 changes: 25 additions & 4 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@
import org.labkey.api.util.URLHelper;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.HtmlView;
import org.labkey.api.view.HttpRedirectView;
import org.labkey.api.view.HttpView;
import org.labkey.api.view.JspView;
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NotFoundException;
import org.labkey.api.view.RedirectException;
import org.labkey.api.view.UnauthorizedException;
import org.labkey.api.webdav.WebdavResource;
import org.labkey.api.webdav.WebdavService;
import org.labkey.skylinetoolsstore.model.Rating;
import org.labkey.skylinetoolsstore.model.SkylineTool;
import org.labkey.skylinetoolsstore.view.SkylineToolDetails;
Expand Down Expand Up @@ -105,6 +106,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -1101,9 +1103,28 @@ else if (toolLsid != null &&
"Path=/; Domain=;");
}

return new HttpRedirectView(
AppProps.getInstance().getContextPath() + "/files" + tool.lookupContainer().getPath()
+ "/" + tool.getZipName());
Container toolContainer = ContainerManager.getForId(tool.getContainerId());
if (toolContainer == null)
{
throw new NotFoundException("Tool container not found");
}

org.labkey.api.util.Path path = WebdavService.getPath().append(toolContainer.getParsedPath()).append(FileContentService.FILES_LINK).append(tool.getZipName());
WebdavResource resource = WebdavService.get().getResolver().lookup(path);
if (resource == null || !resource.isFile())
throw new NotFoundException("Resource could not be found: " + path.toString());

// Issue 49580: https://www.labkey.org/MacCoss/Issue%20Tracker/issues-details.view?issueId=49580
// Add our own 'Content-Disposition' header so that it overwrites the one set in
// ResponseHelper.setContentDisposition(HttpServletResponse response, ContentDispositionType type, @NotNull String filename)
// Skyline expects the 'Content-Disposition' header value to look like this: filename="MSstatsShiny.zip".
Map<String, String> headers = Collections.singletonMap("Content-Disposition", "filename=\""+ tool.getZipName() + "\"");
PageFlowUtil.streamFile(getViewContext().getResponse(),
headers,
resource.getName(),
resource.getInputStream(getUser()),
true);
return null;
}

protected boolean recordDownload(HttpServletRequest httpServletRequest, int toolId)
Expand Down
Loading