Fix bug for password decrypt in auth service

src/js/service/auth.js

@@ -76,9 +76,13 @@ Auth.prototype.getCredentials = function() {
 
         if (self.passwordNeedsDecryption) {
             // decrypt password
-            return self._pgp.decrypt(self.password, undefined).then(function(cleartext) {
+            return self._pgp.decrypt(self.password, undefined).then(function(pt) {
+                if (!pt.signaturesValid) {
+                    throw new Error('Verifying PGP signature of encrypted password failed!');
+                }
+
                 self.passwordNeedsDecryption = false;
-                self.password = cleartext;
+                self.password = pt.decrypted;
             }).then(done);
         }
 

test/unit/service/auth-test.js

@@ -74,7 +74,10 @@ describe('Auth unit tests', function() {
             storageStub.listItems.withArgs(REALNAME_DB_KEY, 0, null).returns(resolves([realname]));
             storageStub.listItems.withArgs(IMAP_DB_KEY, 0, null).returns(resolves([imap]));
             storageStub.listItems.withArgs(SMTP_DB_KEY, 0, null).returns(resolves([smtp]));
-            pgpStub.decrypt.withArgs(encryptedPassword, undefined).returns(resolves(password));
+            pgpStub.decrypt.withArgs(encryptedPassword, undefined).returns(resolves({
+                decrypted: password,
+                signaturesValid: true
+            }));
 
             auth.getCredentials().then(function(cred) {
                 expect(auth.emailAddress).to.equal(emailAddress);