From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
plugins/enigma/enigma.js | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/plugins/enigma/enigma.js b/plugins/enigma/enigma.js
index a9b56eb..a5497f4 100644
--- a/plugins/enigma/enigma.js
+++ b/plugins/enigma/enigma.js
@@ -6,7 +6,7 @@
if (rcmail.gui_objects.keyslist) {
rcmail.keys_list = new rcube_list_widget(rcmail.gui_objects.keyslist,
- {multiselect:false, draggable:false, keyboard:false});
+ {multiselect:true, draggable:false, keyboard:false});
rcmail.keys_list
.addEventListener('select', function(o) { rcmail.enigma_keylist_select(o); })
.addEventListener('keypress', function(o) { rcmail.enigma_keylist_keypress(o); })
@@ -25,11 +25,16 @@
rcmail.register_command('search', function(props) {return rcmail.enigma_search(props); }, true);
rcmail.register_command('reset-search', function(props) {return rcmail.enigma_search_reset(props); }, true);
rcmail.register_command('plugin.enigma-import', function() { rcmail.enigma_import(); }, true);
-// rcmail.register_command('plugin.enigma-export', function() { rcmail.enigma_key_export(); }, true);
- rcmail.register_command('plugin.enigma-key-import', function() { rcmail.enigma_key_import() }, true);
- rcmail.register_command('plugin.enigma-key-delete', function(props) { return rcmail.enigma_key_delete(); });
+ rcmail.register_command('plugin.enigma-key-export', function() { rcmail.enigma_export(); });
+ rcmail.register_command('plugin.enigma-key-export-selected', function() { rcmail.enigma_export(true); });
+ rcmail.register_command('plugin.enigma-key-import', function() { rcmail.enigma_key_import(); }, true);
+ rcmail.register_command('plugin.enigma-key-delete', function(props) { return rcmail.enigma_delete(); });
rcmail.register_command('plugin.enigma-key-create', function(props) { return rcmail.enigma_key_create(); }, true);
rcmail.register_command('plugin.enigma-key-save', function(props) { return rcmail.enigma_key_create_save(); }, true);
+
+ rcmail.addEventListener('responseafterplugin.enigmakeys', function() {
+ rcmail.enable_command('plugin.enigma-key-export', rcmail.env.rowcount > 0);
+ });
}
}
else if (rcmail.env.task == 'mail') {
@@ -42,6 +47,11 @@
e.stopPropagation();
});
}
+
+ $.each(['encrypt', 'sign'], function() {
+ if (rcmail.env['enigma_force_' + this])
+ $('[name="_enigma_' + this + '"]').prop('checked', true);
+ });
if (rcmail.env.enigma_password_request) {
rcmail.enigma_password_request(rcmail.env.enigma_password_request);
@@ -77,13 +87,13 @@
// validate the form
if (!password || !confirm)
- return alert(this.gettext('enigma.formerror'));
+ return alert(this.get_label('enigma.formerror'));
if (password != confirm)
- return alert(this.gettext('enigma.passwordsdiffer'));
+ return alert(this.get_label('enigma.passwordsdiffer'));
if (user.match(/^<[^>]+>$/))
- return alert(this.gettext('enigma.nonameident'));
+ return alert(this.get_label('enigma.nonameident'));
// generate keys
// use OpenPGP.js if browser supports required features
@@ -97,19 +107,24 @@
openpgp.generateKeyPair(options).then(function(keypair) {
// success
- post = {_a: 'import', _keys: keypair.privateKeyArmored};
+ var post = {_a: 'import', _keys: keypair.privateKeyArmored};
// send request to server
rcmail.http_post('plugin.enigmakeys', post, lock);
- }).catch(function(error) {
+ }, function(error) {
// failure
rcmail.set_busy(false, null, lock);
- rcmail.display_message(rcmail.gettext('enigma.keygenerateerror'), 'error');
+ rcmail.display_message(rcmail.get_label('enigma.keygenerateerror'), 'error');
});
}
// generate keys on the server
+ else if (rcmail.env.enigma_keygen_server) {
+ lock = this.set_busy(true, 'enigma.keygenerating');
+ options = {_a: 'generate', _user: user, _password: password, _size: size};
+ rcmail.http_post('plugin.enigmakeys', options, lock);
+ }
else {
- // @TODO
+ rcmail.display_message(rcmail.get_label('enigma.keygennosupport'), 'error');
}
};
@@ -120,7 +135,7 @@
};
// Delete key(s)
-rcube_webmail.prototype.enigma_key_delete = function()
+rcube_webmail.prototype.enigma_delete = function()
{
var keys = this.keys_list.get_selection();
@@ -132,6 +147,17 @@
// send request to server
this.http_post('plugin.enigmakeys', post, lock);
+};
+
+// Export key(s)
+rcube_webmail.prototype.enigma_export = function(selected)
+{
+ var keys = selected ? this.keys_list.get_selection().join(',') : '*';
+
+ if (!keys.length)
+ return;
+
+ this.goto_url('plugin.enigmakeys', {_a: 'export', _keys: keys}, false, true);
};
// Submit key(s) import form
@@ -158,11 +184,13 @@
// list row selection handler
rcube_webmail.prototype.enigma_keylist_select = function(list)
{
- var id;
- if (id = list.get_single_selection())
- this.enigma_loadframe('&_action=plugin.enigmakeys&_a=info&_id=' + id);
+ var id = list.get_single_selection(), url;
- this.enable_command('plugin.enigma-key-delete', list.selection.length > 0);
+ if (id)
+ url = '&_action=plugin.enigmakeys&_a=info&_id=' + id;
+
+ this.enigma_loadframe(url);
+ this.enable_command('plugin.enigma-key-delete', 'plugin.enigma-key-export-selected', list.selection.length > 0);
};
rcube_webmail.prototype.enigma_keylist_keypress = function(list)
@@ -270,6 +298,8 @@
this.enigma_loadframe();
if (this.keys_list)
this.keys_list.clear(true);
+
+ this.enable_command('plugin.enigma-key-delete', 'plugin.enigma-key-delete-selected', false);
}
// Adds a row to the list
--
Gitblit v1.9.1