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

ALS-7712: ALlow PFB Export to 3rd party via signed URL #211

Merged
merged 7 commits into from
Nov 15, 2024
Merged

ALS-7712: ALlow PFB Export to 3rd party via signed URL #211

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eb3f36
ALS-7712: Add redirect handler for signed urls
ramari16 Nov 5, 2024
ed45d79
Fix Content type
ramari16 Nov 6, 2024
223034b
Add signed-url to jwt filter
ramari16 Nov 7, 2024
3e26b93
Revert redirect endpoint, fix jwt filter logic
ramari16 Nov 8, 2024
f6adc8e
Override content type
ramari16 Nov 8, 2024
1bb62d9
Override content type
ramari16 Nov 8, 2024
6f77eb2
ALS-7712: Cleanup imports
ramari16 Nov 15, 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
5 changes: 4 additions & 1 deletion pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/security/JWTFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,10 @@ private HashMap<String, Object> prepareRequestMap(ContainerRequestContext reques

Query initialQuery = null;
// Read the query from the backing store if we are getting the results (full query may not be specified in request)
if (requestPath.startsWith("/query/") && (requestPath.endsWith("result") || requestPath.endsWith("result/"))) {
if (requestPath.startsWith("/query/") &&
(requestPath.endsWith("result") || requestPath.endsWith("result/") ||
requestPath.endsWith("signed-url") || requestPath.endsWith("signed-url/"))
) {
// Path: /query/{queryId}/result
String[] pathParts = requestPath.split("/");
UUID uuid = UUID.fromString(pathParts[2]);
Expand Down
7 changes: 3 additions & 4 deletions pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/service/PicsureQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
import edu.harvard.dbmi.avillach.data.entity.Resource;
import edu.harvard.dbmi.avillach.data.repository.QueryRepository;
import edu.harvard.dbmi.avillach.data.repository.ResourceRepository;
import edu.harvard.dbmi.avillach.domain.FederatedQueryRequest;
import edu.harvard.dbmi.avillach.domain.GeneralQueryRequest;
import edu.harvard.dbmi.avillach.domain.QueryRequest;
import edu.harvard.dbmi.avillach.domain.QueryStatus;
import edu.harvard.dbmi.avillach.domain.*;
import edu.harvard.dbmi.avillach.security.JWTFilter;
import edu.harvard.dbmi.avillach.util.Utilities;
import edu.harvard.dbmi.avillach.util.exception.ApplicationException;
Expand All @@ -22,6 +19,8 @@
import javax.transaction.Transactional;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import java.net.URI;
import java.net.URLEncoder;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Remove

import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.util.*;
Expand Down
Loading