Merge pull request #364 from jhaals/fix-binary-upload

Fix binary upload
jhaals · Jan 28, 2020 · d04c43b · d04c43b
2 parents 4b93248 + 5f7f7ea
commit d04c43b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/website/src/DisplaySecret.tsx b/website/src/DisplaySecret.tsx
@@ -22,7 +22,7 @@ const DisplaySecret = () => {
       const request = await fetch(`${url}/${key}`);
       if (request.status === 200) {
         const data = await request.json();
-        const r = await decryptMessage(data.message, password);
+        const r = await decryptMessage(data.message, password, 'utf8');
         setSecret(r.data as string);
         setLoading(false);
         return;

diff --git a/website/src/Download.tsx b/website/src/Download.tsx
@@ -23,7 +23,7 @@ const Download = () => {
       const request = await fetch(`${url}/${key}`);
       if (request.status === 200) {
         const data = await request.json();
-        const file = await decryptMessage(data.message, password);
+        const file = await decryptMessage(data.message, password, 'binary');
         saveAs(
           new Blob([file.data as string], {
             type: 'application/octet-stream',

diff --git a/website/src/utils.tsx b/website/src/utils.tsx
@@ -42,10 +42,15 @@ const post = async (url: string, body: any) => {
   return { data: await request.json(), status: request.status };
 };
 
-export const decryptMessage = async (data: string, passwords: string) => {
+export const decryptMessage = async (
+  data: string,
+  passwords: string,
+  format: 'utf8' | 'binary',
+) => {
   const r = await openpgp.decrypt({
     message: await openpgp.message.readArmored(data),
     passwords,
+    format,
   });
   return r;
 };