[#316] Make data export encryption based on parameter

HASEL-UZH · Oct 21, 2024 · 50778a6 · 50778a6
1 parent 1001f35
commit 50778a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/electron/electron/ipc/IpcHandler.ts b/src/electron/electron/ipc/IpcHandler.ts
@@ -152,12 +152,14 @@ export class IpcHandler {
   private async startDataExport(
     windowActivityExportType: DataExportType,
     userInputExportType: DataExportType,
-    obfuscationTerms: string[]
+    obfuscationTerms: string[],
+    encryptData: boolean
   ): Promise<string> {
     return this.dataExportService.startDataExport(
       windowActivityExportType,
       userInputExportType,
-      obfuscationTerms
+      obfuscationTerms,
+      encryptData
     );
   }
 

diff --git a/src/electron/electron/main/services/DataExportService.ts b/src/electron/electron/main/services/DataExportService.ts
@@ -19,7 +19,8 @@ export class DataExportService {
   public async startDataExport(
     windowActivityExportType: DataExportType,
     userInputExportType: DataExportType,
-    obfuscationTerms: string[]
+    obfuscationTerms: string[],
+    encryptData: boolean
   ): Promise<string> {
     LOG.info('startDataExport called');
     await UsageDataService.createNewUsageDataEvent(
@@ -59,11 +60,13 @@ export class DataExportService {
       // see https://github.com/WiseLibs/better-sqlite3/blob/master/docs/performance.md
       db.pragma('journal_mode = WAL');
 
-      // see https://github.com/m4heshd/better-sqlite3-multiple-ciphers/issues/5#issuecomment-1008330548
-      db.pragma(`cipher='sqlcipher'`);
-      db.pragma(`legacy=4`);
+      if (encryptData) {
+        // see https://github.com/m4heshd/better-sqlite3-multiple-ciphers/issues/5#issuecomment-1008330548
+        db.pragma(`cipher='sqlcipher'`);
+        db.pragma(`legacy=4`);
 
-      db.pragma(`rekey='PersonalAnalytics_${settings.subjectId}'`);
+        db.pragma(`rekey='PersonalAnalytics_${settings.subjectId}'`);
+      }
 
       if (
         windowActivityExportType === DataExportType.Obfuscate ||

diff --git a/src/electron/src/utils/Commands.ts b/src/electron/src/utils/Commands.ts
@@ -24,7 +24,8 @@ type Commands = {
   startDataExport: (
     windowActivityExportType: DataExportType,
     userInputExportType: DataExportType,
-    obfuscationTerms: string[]
+    obfuscationTerms: string[],
+    encryptData: boolean
   ) => Promise<string>;
   revealItemInFolder: (path: string) => Promise<void>;
   startAllTrackers: () => void;

diff --git a/src/electron/src/views/DataExportView.vue b/src/electron/src/views/DataExportView.vue
@@ -164,7 +164,8 @@ async function handleNextStep() {
         'startDataExport',
         exportWindowActivitySelectedOption.value,
         exportUserInputSelectedOption.value,
-        obfuscationTerms
+        obfuscationTerms,
+        studyConfig.dataExportEncrypted
       );
       hasExportError.value = false;
       const now = new Date();