Merge branch 'stable-3.0.5'

Marius Cramer

2015-05-21 985390fdb8ba94cbcf7312e32a484396c3d49702

Merge branch 'stable-3.0.5'

Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/monitor/show_sys_state.php
	interface/web/themes/default/templates/tabbed_form.tpl.htm

 interface/lib/classes/tform_base.inc.php

@@ -414,6 +414,30 @@
        if(!is_array($this->formDef)) $app->error("No form definition found.");
        if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");

        /* CSRF PROTECTION */
        // generate csrf protection id and key
        $_csrf_id = uniqid($this->formDef['name'] . '_');
        $_csrf_value = sha1(uniqid(microtime(true), true));
        if(!isset($_SESSION['_csrf'])) $_SESSION['_csrf'] = array();
        if(!isset($_SESSION['_csrf_timeout'])) $_SESSION['_csrf_timeout'] = array();
        $_SESSION['_csrf'][$_csrf_id] = $_csrf_value;
        $_SESSION['_csrf_timeout'][$_csrf_id] = time() + 3600; // timeout hash in 1 hour
        $this->formDef['tabs'][$tab]['fields']['_csrf_id'] = array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
            'default' => $_csrf_id,
            'value' => $_csrf_id
        );
        $this->formDef['tabs'][$tab]['fields']['_csrf_key'] = array(
            'datatype' => 'VARCHAR',
            'formtype' => 'TEXT',
            'default' => $_csrf_value,
            'value' => $_csrf_value
        );
        $record['_csrf_id'] = $_csrf_id;
        $record['_csrf_key'] = $_csrf_value;
        /* CSRF PROTECTION */
		
        $new_record = array();
        if($action == 'EDIT') {
            $record = $this->decode($record, $tab);
@@ -669,8 +693,46 @@
     */
    protected function _encode($record, $tab, $dbencode = true, $api = false) {
        global $app;
        if($api == true) $fields = &$this->formDef['fields'];
        else $fields = &$this->formDef['tabs'][$tab]['fields'];
        if($api == true) {
            $fields = &$this->formDef['fields'];
        } else {
            $fields = &$this->formDef['tabs'][$tab]['fields'];
            /* CSRF PROTECTION */
            if(isset($_POST) && is_array($_POST)) {
                $_csrf_valid = false;
                if(isset($_POST['_csrf_id']) && isset($_POST['_csrf_key'])) {
                    $_csrf_id = trim($_POST['_csrf_id']);
                    $_csrf_key = trim($_POST['_csrf_key']);
                    if(isset($_SESSION['_csrf']) && isset($_SESSION['_csrf'][$_csrf_id]) && isset($_SESSION['_csrf_timeout']) && isset($_SESSION['_csrf_timeout'][$_csrf_id])) {
                        if($_SESSION['_csrf'][$_csrf_id] === $_csrf_key && $_SESSION['_csrf_timeout'] >= time()) $_csrf_valid = true;
                    }
                }
                if($_csrf_valid !== true) {
                    $app->log('CSRF attempt blocked. Referer: ' . (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 'unknown'), LOGLEVEL_WARN);
                    unset($_POST);
                    unset($record);
                }
                $_SESSION['_csrf'][$_csrf_id] = ' ';
                $_SESSION['_csrf_timeout'][$_csrf_id] = ' ';
                unset($_SESSION['_csrf'][$_csrf_id]);
                unset($_SESSION['_csrf_timeout'][$_csrf_id]);
				
                if(isset($_SESSION['_csrf_timeout']) && is_array($_SESSION['_csrf_timeout'])) {
                    $to_unset = array();
                    foreach($_SESSION['_csrf_timeout'] as $_csrf_id => $timeout) {
                        if($timeout < time()) $to_unset[] = $_csrf_id;
                    }
                    foreach($to_unset as $_csrf_id) {
                        unset($_SESSION['_csrf'][$_csrf_id]);
                        unset($_SESSION['_csrf_timeout'][$_csrf_id]);
                    }
                    unset($to_unset);
                }
            }
            /* CSRF PROTECTION */
        }
		
        $new_record = array();
        if(is_array($record)) {
            foreach($fields as $key => $field) {


 interface/web/themes/default/templates/tabbed_form.tpl.htm

@@ -36,8 +36,8 @@
            </div>
        </div>

        <input type="hidden" name="_csrf_id" value="{tmpl_var name='_csrf_id'}" />
        <input type="hidden" name="_csrf_key" value="{tmpl_var name='_csrf_key'}" />
        <input type="hidden" name="next_tab" value="">
        <input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
    </div>