fix: throw a new exception for safeStorage before app is ready

Signed-off-by: Darshan Sen <raisinten@gmail.com>
electron · May 5, 2022 · 6107654 · 6107654
1 parent bc7c8b3
commit 6107654
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/shell/browser/api/electron_api_safe_storage.cc b/shell/browser/api/electron_api_safe_storage.cc
@@ -44,6 +44,11 @@ bool IsEncryptionAvailable() {
 v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
                                    const std::string& plaintext) {
   if (!IsEncryptionAvailable()) {
+    if (!Browser::Get()->is_ready()) {
+      gin_helper::ErrorThrower(isolate).ThrowError(
+          "safeStorage cannot be used before app is ready");
+      return v8::Local<v8::Value>();
+    }
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "
@@ -67,6 +72,11 @@ v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
 
 std::string DecryptString(v8::Isolate* isolate, v8::Local<v8::Value> buffer) {
   if (!IsEncryptionAvailable()) {
+    if (!Browser::Get()->is_ready()) {
+      gin_helper::ErrorThrower(isolate).ThrowError(
+          "safeStorage cannot be used before app is ready");
+      return v8::Local<v8::Value>();
+    }
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "

diff --git a/spec-main/fixtures/crash-cases/safe-storage/index.js b/spec-main/fixtures/crash-cases/safe-storage/index.js
@@ -14,8 +14,8 @@ const { expect } = require('chai');
       expect(Buffer.isBuffer(ciphertext)).to.equal(true);
       expect(safeStorage.decryptString(ciphertext)).to.equal(plaintext);
     } else {
-      expect(() => safeStorage.encryptString('plaintext')).to.throw(/Encryption is not available/);
-      expect(() => safeStorage.decryptString(Buffer.from(''))).to.throw(/Decryption is not available/);
+      expect(() => safeStorage.encryptString('plaintext')).to.throw(/safeStorage cannot be used before app is ready/);
+      expect(() => safeStorage.decryptString(Buffer.from(''))).to.throw(/safeStorage cannot be used before app is ready/);
     }
   }
   await app.whenReady();