moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-02-07 10:30:18 -05:00
Code Issues Releases Wiki Activity

add input verification for public key import

Browse Source
This commit is contained in:
Tankred Hase 2014-03-10 18:30:06 +01:00
parent 0cfc66e60d
commit 81001ed193
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/controller/contacts.js
View File

@ -56,8 +56,24 @@ define(function(require) {
}; };
$scope.importKey = function(publicKeyArmored) { $scope.importKey = function(publicKeyArmored) {
var keyParams = pgp.getKeyParams(publicKeyArmored); var keyParams, pubkey;
var pubkey = {
// verifiy public key string
if (publicKeyArmored.indexOf('-----BEGIN PGP PUBLIC KEY BLOCK-----') < 0) {
$scope.onError({
errMsg: 'Invalid public key!'
});
return;
}
try {
keyParams = pgp.getKeyParams(publicKeyArmored);
} catch (e) {
$scope.onError(e);
return;
}
pubkey = {
_id: keyParams._id, _id: keyParams._id,
userId: keyParams.userId, userId: keyParams.userId,
publicKey: publicKeyArmored publicKey: publicKeyArmored

36
test/new-unit/contacts-ctrl-test.js
View File

@ -91,7 +91,7 @@ define(function(require) {
describe('importKey', function() { describe('importKey', function() {
it('should work', function(done) { it('should work', function(done) {
var keyArmored = 'ARMORED PUBLICKEY'; var keyArmored = '-----BEGIN PGP PUBLIC KEY BLOCK-----';
cryptoMock.getKeyParams.returns({ cryptoMock.getKeyParams.returns({
_id: '12345', _id: '12345',
@ -101,7 +101,7 @@ define(function(require) {
keychainMock.saveLocalPublicKey.withArgs({ keychainMock.saveLocalPublicKey.withArgs({
_id: '12345', _id: '12345',
userId: 'max@example.com', userId: 'max@example.com',
publicKey: 'ARMORED PUBLICKEY' publicKey: '-----BEGIN PGP PUBLIC KEY BLOCK-----'
}).yields(); }).yields();
scope.listKeys = function() { scope.listKeys = function() {
@ -111,19 +111,39 @@ define(function(require) {
scope.importKey(keyArmored); scope.importKey(keyArmored);
}); });
it('should fail due to invalid armored key', function(done) {
var keyArmored = '-----BEGIN PGP PRIVATE KEY BLOCK-----';
scope.onError = function(err) {
expect(err).to.exist;
done();
};
scope.importKey(keyArmored);
});
it('should fail due to error in pgp.getKeyParams', function(done) {
var keyArmored = '-----BEGIN PGP PUBLIC KEY BLOCK-----';
cryptoMock.getKeyParams.throws(new Error('WAT'));
scope.onError = function(err) {
expect(err).to.exist;
done();
};
scope.importKey(keyArmored);
});
it('should fail due to error in keychain.saveLocalPublicKey', function(done) { it('should fail due to error in keychain.saveLocalPublicKey', function(done) {
var keyArmored = 'ARMORED PUBLICKEY'; var keyArmored = '-----BEGIN PGP PUBLIC KEY BLOCK-----';
cryptoMock.getKeyParams.returns({ cryptoMock.getKeyParams.returns({
_id: '12345', _id: '12345',
userId: 'max@example.com' userId: 'max@example.com'
}); });
keychainMock.saveLocalPublicKey.withArgs({ keychainMock.saveLocalPublicKey.yields(42);
_id: '12345',
userId: 'max@example.com',
publicKey: 'ARMORED PUBLICKEY'
}).yields(42);
scope.onError = function(err) { scope.onError = function(err) {
expect(err).to.equal(42); expect(err).to.equal(42);