set content-disposition in s3 object metadata on archived recording u…

…pload
cryostatio · Jan 12, 2024 · 979bbc3 · 979bbc3
1 parent 6f6d316
commit 979bbc3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -432,6 +432,11 @@ public String saveRecording(ActiveRecording recording) throws Exception {
     }
 
     public String saveRecording(ActiveRecording recording, Instant expiry) throws Exception {
+        return saveRecording(recording, null, expiry);
+    }
+
+    public String saveRecording(ActiveRecording recording, String savename, Instant expiry)
+            throws Exception {
         // AWS object key name guidelines advise characters to avoid (% so we should not pass url
         // encoded characters)
         String transformedAlias =
@@ -441,6 +446,9 @@ public String saveRecording(ActiveRecording recording, Instant expiry) throws Ex
                 clock.now().truncatedTo(ChronoUnit.SECONDS).toString().replaceAll("[-:]+", "");
         String filename =
                 String.format("%s_%s_%s.jfr", transformedAlias, recording.name, timestamp);
+        if (StringUtils.isBlank(savename)) {
+            savename = filename;
+        }
         int mib = 1024 * 1024;
         String key = archivedRecordingKey(recording.target.jvmId, filename);
         String multipartId = null;
@@ -453,6 +461,8 @@ public String saveRecording(ActiveRecording recording, Instant expiry) throws Ex
                             .bucket(archiveBucket)
                             .key(key)
                             .contentType(JFR_MIME)
+                            .contentDisposition(
+                                    String.format("attachment; filename=\"%s\"", savename))
                             .tagging(createActiveRecordingTagging(recording, expiry));
             if (expiry != null && expiry.isAfter(Instant.now())) {
                 builder = builder.expires(expiry);

diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -965,11 +965,13 @@ public Response createAndRedirectPresignedDownload(@RestPath long id) throws Exc
         if (recording == null) {
             throw new NotFoundException();
         }
+        String savename = recording.name;
         String filename =
                 recordingHelper.saveRecording(
-                        recording, Instant.now().plusSeconds(60)); // TODO make expiry configurable
+                        recording,
+                        savename,
+                        Instant.now().plusSeconds(60)); // TODO make expiry configurable
         String encodedKey = recordingHelper.encodedKey(recording.target.jvmId, filename);
-        String savename = recording.name;
         if (!savename.endsWith(".jfr")) {
             savename += ".jfr";
         }