Fix security issue in delete-response action - allow only ajax request. Uni...

Aleksander Machniak

2014-07-05 7152d0fdefc0cb60b26c928342436604479dc610

Fix security issue in delete-response action - allow only ajax request.
Unify code for identities and responses deletion.

Conflicts:

	program/steps/settings/func.inc

 CHANGELOG

@@ -18,6 +18,7 @@
- Fix list reload after sending message in another window (#1489931)
- Fix so address format errors are ignored when saving a draft (#1489954)
- Fix incorrect label translation in return receipt (#1489963)
- Fix security issue in delete-response action - allow only ajax request

RELEASE 1.0.1
-------------

 program/js/app.js

@@ -3555,10 +3555,7 @@
    // submit delete request
    if (key && confirm(this.get_label('deleteresponseconfirm'))) {
      this.http_post('settings/delete-response', { _key: key }, false);
      return true;
    }

    return false;
  };

  this.stop_spellchecking = function()
@@ -5612,10 +5609,8 @@
      id = this.env.iid ? this.env.iid : selection[0];

    // submit request with appended token
    if (confirm(this.get_label('deleteidentityconfirm')))
      this.goto_url('delete-identity', { _iid: id, _token: this.env.request_token }, true);

    return true;
    if (id && confirm(this.get_label('deleteidentityconfirm')))
      this.http_post('settings/delete-identity', { _iid: id }, true);
  };

  this.update_identity_row = function(id, name, add)
@@ -5661,6 +5656,19 @@
    }
  };

  this.remove_identity = function(id)
  {
    var frame, list = this.identity_list,
      rid = this.html_identifier(id);

    if (list && id) {
      list.remove_row(rid);
      if (this.env.contentframe && (frame = this.get_frame_window(this.env.contentframe))) {
        frame.location.href = this.env.blankpage;
      }
    }
  };


  /*********************************************************/
  /*********        folder manager methods         *********/

 program/steps/settings/delete_identity.inc

File was deleted

 program/steps/settings/func.inc

@@ -44,6 +44,7 @@
    'add-response'  => 'edit_response.inc',
    'save-response' => 'edit_response.inc',
    'delete-response' => 'responses.inc',
    'delete-identity' => 'identities.inc',
));



 program/steps/settings/identities.inc

@@ -19,6 +19,28 @@
 +-----------------------------------------------------------------------+
*/

if ($RCMAIL->action == 'delete-identity' && $OUTPUT->ajax_call) {
    $iid = rcube_utils::get_input_value('_iid', rcube_utils::INPUT_POST);

    if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid)) {
        $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));

        $deleted = !$plugin['abort'] ? $RCMAIL->user->delete_identity($iid) : $plugin['result'];

        if ($deleted > 0 && $deleted !== false) {
            $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
            $OUTPUT->command('remove_identity', $iid);
        }
        else {
            $msg = $plugin['message'] ? $plugin['message'] : ($deleted < 0 ? 'nodeletelastidentity' : 'errorsaving');
            $OUTPUT->show_message($msg, 'error', null, false);
        }
    }

    $OUTPUT->send();
}


define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));

$OUTPUT->set_pagetitle($RCMAIL->gettext('identities'));

 program/steps/settings/responses.inc

@@ -51,8 +51,8 @@
    $RCMAIL->output->send();
}

if ($RCMAIL->action == 'delete-response') {
    if ($key = rcube_utils::get_input_value('_key', rcube_utils::INPUT_GPC)) {
if ($RCMAIL->action == 'delete-response' && $RCMAIL->output->ajax_call) {
    if ($key = rcube_utils::get_input_value('_key', rcube_utils::INPUT_POST)) {
        $responses = $RCMAIL->get_compose_responses(false, true);
        foreach ($responses as $i => $response) {
            if (empty($response['key']))
@@ -70,9 +70,7 @@
        $RCMAIL->output->command('remove_response', $key);
    }

    if ($RCMAIL->output->ajax_call) {
        $RCMAIL->output->send();
    }
    $RCMAIL->output->send();
}