July 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. b5731f4ca159230c34db6ce111617ca27b1b2867
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, master has been updated via b5731f4ca159230c34db6ce111617ca27b1b2867 (commit) from 70b2a9718589eb4b040a5ac67de91fceff4930e8 (commit) - Log ----------------------------------------------------------------- commit b5731f4ca159230c34db6ce111617ca27b1b2867 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 3 07:02:15 2011 -0400 This syntax confuses render.py ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-6 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/security/PMASA-2011-6 b/templates/security/PMASA-2011-6 index 2a258e5..c06ba98 100644 --- a/templates/security/PMASA-2011-6 +++ b/templates/security/PMASA-2011-6 @@ -16,7 +16,7 @@ Possible code injection in setup script in case session variables are compromise <py:def function="announcement_description"> An unsanitized key from the Servers array is written in a comment of the generated config. -An attacker can modify this key by modifying the $_SESSION array. +An attacker can modify this key by modifying the SESSION superglobal array. This allows the attacker to close the comment and inject code. </py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-6507-g5560ad5
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, master has been updated via 5560ad53e07d56e6686964de288d487df02a6153 (commit) via 56883ec0c593cd96e47a3e7bf46ec4e293e3a93f (commit) via 311804dd728a13e4cd5ce13f303f7b690e7b1aa8 (commit) via 05519a2bcaf8afea90c2405b9cb9257f24ce41ba (commit) via 232b2a72c69f0f0baf74b2c26a4f446cf0ae707d (commit) via 71bb5415d8317764b10ec2424f2cc1bccb5f86d2 (commit) via d33590a544319dfcd395a94210a378c44a8f3e52 (commit) via 0cb77d14bad36196664f953d62e247193e1eb30d (commit) via 2c57318f1b61448cc55fb282efa30a88c9b9f5aa (commit) via f48271b74b2d475bb158aa05322ce1ac59d303de (commit) via 3345899ca2c0b537740f0480d7adbf9fbadee47d (commit) via 0c87f7c6b6c478757aa4d7b96fa85ccf1428937a (commit) via bc049c6311f3c8e9357b1b7252754a7673ddaa29 (commit) via 6104ef1ba478e68476963c41b4951baa1a7fc9c7 (commit) via 045499bd7533da31f262c5e5de739e31d9f08985 (commit) from 12fcc270f2d0cc7df3a94a131e2f234b0ee8414c (commit) - Log ----------------------------------------------------------------- commit 5560ad53e07d56e6686964de288d487df02a6153 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 3 06:24:29 2011 -0400 ChangeLog entries for new features commit 56883ec0c593cd96e47a3e7bf46ec4e293e3a93f Merge: 311804dd728a13e4cd5ce13f303f7b690e7b1aa8 12fcc270f2d0cc7df3a94a131e2f234b0ee8414c Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 3 10:52:56 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 311804dd728a13e4cd5ce13f303f7b690e7b1aa8 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 3 10:52:16 2011 +0530 Removed the modification for the multi row Export in Table Browse commit 05519a2bcaf8afea90c2405b9cb9257f24ce41ba Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 2 21:17:37 2011 +0530 Changed the link name in show hide indexes commit 232b2a72c69f0f0baf74b2c26a4f446cf0ae707d Merge: 71bb5415d8317764b10ec2424f2cc1bccb5f86d2 a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 2 15:19:45 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 71bb5415d8317764b10ec2424f2cc1bccb5f86d2 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 2 15:16:00 2011 +0530 Added show hide option for index table in table structure commit d33590a544319dfcd395a94210a378c44a8f3e52 Merge: 0cb77d14bad36196664f953d62e247193e1eb30d 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 1 23:50:58 2011 +0530 Resolved conflicts commit 0cb77d14bad36196664f953d62e247193e1eb30d Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 1 23:39:23 2011 +0530 Ajaxify Index edit in table structure commit 2c57318f1b61448cc55fb282efa30a88c9b9f5aa Merge: f48271b74b2d475bb158aa05322ce1ac59d303de 3c55511e5c81d479575f9527a0e5b2267440c872 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jun 26 23:30:26 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f48271b74b2d475bb158aa05322ce1ac59d303de Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jun 26 23:28:34 2011 +0530 Fixed bugs in show error message ine multi row change in table structure commit 3345899ca2c0b537740f0480d7adbf9fbadee47d Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 21:26:56 2011 +0530 Fixed bugs in multi column change in table structure commit 0c87f7c6b6c478757aa4d7b96fa85ccf1428937a Merge: bc049c6311f3c8e9357b1b7252754a7673ddaa29 5403fc13ced5e245632ba1b4f237ff5f1a52785f Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 16:58:39 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bc049c6311f3c8e9357b1b7252754a7673ddaa29 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 16:57:54 2011 +0530 Ajaxified the multi column change in table structure commit 6104ef1ba478e68476963c41b4951baa1a7fc9c7 Merge: 045499bd7533da31f262c5e5de739e31d9f08985 0a6f2823bd46fc3f486c0b1ef557c1e1284626ba Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jun 24 14:57:34 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 045499bd7533da31f262c5e5de739e31d9f08985 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jun 24 14:54:46 2011 +0530 Ajaxify the multi row export in table ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 +- js/messages.php | 2 + js/sql.js | 10 ++-- js/tbl_structure.js | 142 +++++++++++++++++++++++++++++++++++++++++++++ libraries/Index.class.php | 10 ++- tbl_indexes.php | 12 +++- tbl_structure.php | 5 +- 7 files changed, 171 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae70fb7..bd8ab2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,7 +25,9 @@ phpMyAdmin - ChangeLog + [display] More options for browsing GIS data + [interface] Support for spatial indexes + [display] GIS data visualization -+ AJAX for table structure multiple-columns change ++ AJAX for table structure multiple-column change ++ AJAX for table structure index edit ++ Show/hide indexes in table structure 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/messages.php b/js/messages.php index 7851a19..b8ac2ba 100644 --- a/js/messages.php +++ b/js/messages.php @@ -110,6 +110,8 @@ $js_messages['strNo'] = __('No'); /* For db_stucture.js */ $js_messages['strInsertTable'] = __('Insert Table'); +$js_messages['strHideIndexes'] = __('Hide indexes'); +$js_messages['strShowIndexes'] = __('Show indexes'); /* For db_search.js */ $js_messages['strSearching'] = __('Searching'); diff --git a/js/sql.js b/js/sql.js index 14f4c05..48fb65f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1163,7 +1163,7 @@ $(document).ready(function() { }) // end $.post() }) // end insert table button "Go" -/** +/**$("#buttonYes.ajax").live('click' * Click action for #buttonYes button in ajax dialog insertForm */ $("#buttonYes.ajax").live('click', function(event){ @@ -1370,22 +1370,22 @@ $(document).ready(function() { $("#sqlqueryresults").trigger('makegrid'); }); -/* +/* * Profiling Chart */ function createProfilingChart() { if($('#profilingchart').length==0) return; - + var cdata = new Array(); $.each(jQuery.parseJSON($('#profilingchart').html()),function(key,value) { cdata.push([key,parseFloat(value)]); }); - + // Prevent the user from seeing the JSON code $('div#profilingchart').html('').show(); PMA_createChart({ - chart: { + chart: { renderTo: 'profilingchart', backgroundColor: $('#sqlqueryresults fieldset').css('background-color') }, diff --git a/js/tbl_structure.js b/js/tbl_structure.js index d1a2676..d4ef1cd 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -250,4 +250,146 @@ $(document).ready(function() { }) // end $.post() }) // end insert table button "do_save_data" + /** + *Ajax event handler for index edit + **/ + $("#table_index tbody tr td.edit_index.ajax").live('click', function(event){ + event.preventDefault(); + var url = $(this).find("a").attr("href"); + if (url.substring(0, 16) == "tbl_indexes.php?") { + url = url.substring(16, url.length ); + } + url = url + "&ajax_request=true"; + + var div = $('<div id="edit_index_dialog"></div>'); + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + var $msgbox = PMA_ajaxShowMessage(); + + $.get( "tbl_indexes.php" , url , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + div + .append(data.error) + .dialog({ + title: PMA_messages['strEdit'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + } else { + div + .append(data) + .dialog({ + title: PMA_messages['strEdit'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }) + //Remove the top menu container from the dialog + .find("#topmenucontainer").hide() + ; // end dialog options + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() + }); + + /** + *Ajax action for submiting the index form + **/ + $("#index_frm.ajax input[name=do_save_data]").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#index_frm"); + + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + + /*Reload the field form*/ + $("#table_index").remove(); + var temp_div = $("<div id='temp_div'><div>").append(data.index_table); + $(temp_div).find("#table_index").insertAfter("#index_header"); + if ($("#edit_index_dialog").length > 0) { + $("#edit_index_dialog").dialog("close").remove(); + } + + } else { + var temp_div = $("<div id='temp_div'><div>").append(data.error); + var error = $(temp_div).find(".error code").addClass("error"); + PMA_ajaxShowMessage(error); + } + + }) // end $.post() + }) // end insert table button "do_save_data" + + /** + *Ajax action for submiting the index form for add more columns + **/ + $("#index_frm.ajax input[name=add_fields]").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#index_frm"); + + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) { + $("#index_columns").remove(); + var temp_div = $("<div id='temp_div'><div>").append(data); + $(temp_div).find("#index_columns").insertAfter("#index_frm fieldset .error"); + }) // end $.post() + }) // end insert table button "Go" + + /**Add the show/hide index table option if the index is available*/ + if ($("#index_div.ajax").find("#table_index").length != 0) { + /** + *Prepare a div containing a link for toggle the index table + */ + $('<div id="toggletableindexdiv"><a id="toggletableindexlink"></a></div>') + .insertAfter('#index_div') + /** don't show it until we have index table on-screen */ + .show(); + + /** Changing the displayed text according to the hide/show criteria in table index*/ + + $('#toggletableindexlink') + .html(PMA_messages['strHideIndexes']) + .bind('click', function() { + var $link = $(this); + $('#index_div').slideToggle(); + if ($link.text() == PMA_messages['strHideIndexes']) { + $link.text(PMA_messages['strShowIndexes']); + } else { + $link.text(PMA_messages['strHideIndexes']); + } + /** avoid default click action */ + return false; + }); + } //end show/hide table index + + }) // end $(document).ready() diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 9992e1c..1800aee 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -419,10 +419,10 @@ class PMA_Index $r = ''; - $r .= '<h2>' . __('Indexes') . ': '; + $r .= '<h2 id="index_header">' . __('Indexes') . ': '; $r .= PMA_showMySQLDocu('optimization', 'optimizing-database-structure'); $r .= '</h2>'; - $r .= '<table>'; + $r .= '<table id="table_index">'; $r .= '<thead>'; $r .= '<tr>'; if (! $print_mode) { @@ -450,7 +450,11 @@ class PMA_Index if (! $print_mode) { $this_params = $GLOBALS['url_params']; $this_params['index'] = $index->getName(); - $r .= '<td ' . $row_span . '>' + $r .= '<td class="edit_index '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $r .= 'ajax" '; + } + $r .= '" ' . $row_span . '>' . ' <a href="tbl_indexes.php' . PMA_generate_common_url($this_params) . '">' . PMA_getIcon('b_edit.png', __('Edit')) . '</a>' . '</td>' . "\n"; diff --git a/tbl_indexes.php b/tbl_indexes.php index e366047..995ee24 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -97,7 +97,13 @@ if (isset($_REQUEST['do_save_data'])) { PMA_DBI_query($sql_query); $message = PMA_Message::success(__('Table %1$s has been altered successfully')); $message->addParam($table); - + + if( $GLOBALS['is_ajax_request'] == true) { + $extra_data['index_table'] = PMA_Index::getView($table, $db); + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } + $active_page = 'tbl_structure.php'; require './tbl_structure.php'; exit; @@ -133,7 +139,7 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { // end preparing form values ?> -<form action="./tbl_indexes.php" method="post" name="index_frm" +<form action="./tbl_indexes.php" method="post" name="index_frm" id="index_frm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') { this.elements['index'].disabled = false}"> <?php @@ -183,7 +189,7 @@ if (isset($_REQUEST['create_index'])) { PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); ?> -<table> +<table id="index_columns"> <thead> <tr><th><?php echo __('Column'); ?></th> <th><?php echo __('Size'); ?></th> diff --git a/tbl_structure.php b/tbl_structure.php index 081b4b5..10cc8d3 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -14,7 +14,7 @@ require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'tbl_structure.js'; - +$GLOBALS['js_include'][] = 'indexes.js'; /** * handle multiple field commands if required * @@ -699,6 +699,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { </form> <iframe class="IE_hack" scrolling="no"></iframe> <hr /> +<div id="index_div" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> > <?php } @@ -720,7 +721,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { */ echo PMA_Index::getView($table, $db); ?> -<br /> +</div> <form action="./tbl_indexes.php" method="post" onsubmit="return checkFormElementInRange(this, 'idx_num_fields', '<?php echo str_replace('\'', '\\\'', __('Column count has to be larger than zero.')); ?>', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 70b2a9718589eb4b040a5ac67de91fceff4930e8
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, master has been updated via 70b2a9718589eb4b040a5ac67de91fceff4930e8 (commit) via b485ad1a022e5128e8f37c0384fbfb12b4553439 (commit) via 4fc90d8c6a9af036c8bb564faa15be1cae661284 (commit) via 950c4c98010ad59331351dfb4659fc106be2b62d (commit) via b9affc5b9701f68d168b0ee7feafb1cc67ccbee5 (commit) via c53a6a1d961f3819f0d1fc9890496a7986a482b4 (commit) via 924e97227865eb5e6666238096b675e986d9d4c5 (commit) via 7da34555f1d66de6b6e7d018b364fd6bc59eb5fc (commit) via 873a3c8bcca541b79e33f825791658f7ead7651f (commit) via 6b8c417c12222232369120ddd757324d51c3fb27 (commit) via f6b86afaec1d5c8ad7483451a45b89cdbf34ad4e (commit) via e8642202b392f4ac20c5f8b2108d8046b42cad15 (commit) via 5c69648b526ff22826018c4de8bb587d4159d663 (commit) via 9ec98517f2b7c602f605c3c9a2ce3f7b2979fbb6 (commit) from 1e1ed41354c775cbe25e3b708c549c78e4bf3b95 (commit) - Log ----------------------------------------------------------------- commit 70b2a9718589eb4b040a5ac67de91fceff4930e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 21:47:39 2011 -0400 Announcements date commit b485ad1a022e5128e8f37c0384fbfb12b4553439 Merge: 1e1ed41354c775cbe25e3b708c549c78e4bf3b95 4fc90d8c6a9af036c8bb564faa15be1cae661284 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 21:43:16 2011 -0400 Merge remote branch 'security/website-security' commit 4fc90d8c6a9af036c8bb564faa15be1cae661284 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Jul 2 23:23:49 2011 +0200 Lowered PMASA-2011-6 to non critical commit 950c4c98010ad59331351dfb4659fc106be2b62d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Jul 2 23:13:40 2011 +0200 Raised to critical commit b9affc5b9701f68d168b0ee7feafb1cc67ccbee5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Jul 2 23:13:20 2011 +0200 Added some CWE commit c53a6a1d961f3819f0d1fc9890496a7986a482b4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Jul 2 22:56:38 2011 +0200 Split commit hashes for 3.3 into separate section with announcement_commits_3_3 commit 924e97227865eb5e6666238096b675e986d9d4c5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Jul 2 22:52:21 2011 +0200 Added Frans Pehrson (Xxor AB) to announcement_references commit 7da34555f1d66de6b6e7d018b364fd6bc59eb5fc Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 30 17:00:07 2011 -0400 MIME should be spelt in caps commit 873a3c8bcca541b79e33f825791658f7ead7651f Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 22:32:56 2011 +0200 Added PMASA-2011-8 commit 6b8c417c12222232369120ddd757324d51c3fb27 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 22:32:31 2011 +0200 typo fixes commit f6b86afaec1d5c8ad7483451a45b89cdbf34ad4e Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 22:38:08 2011 +0200 Added trailing period to announcement_summary fields commit e8642202b392f4ac20c5f8b2108d8046b42cad15 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 30 15:16:22 2011 -0400 Typos fixed, clarifications added commit 5c69648b526ff22826018c4de8bb587d4159d663 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 15:18:57 2011 +0200 Added PMASA-2011-6 and PMASA-2011-7 draft commit 9ec98517f2b7c602f605c3c9a2ce3f7b2979fbb6 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 12:48:32 2011 +0200 PMASA-2011-5 draft ----------------------------------------------------------------------- Summary of changes: templates/security/{PMASA-2011-2 => PMASA-2011-5} | 33 ++++++------ templates/security/PMASA-2011-6 | 58 +++++++++++++++++++++ templates/security/{_PMASA_ => PMASA-2011-7} | 45 +++++----------- templates/security/{PMASA-2011-4 => PMASA-2011-8} | 26 +++++---- 4 files changed, 102 insertions(+), 60 deletions(-) copy templates/security/{PMASA-2011-2 => PMASA-2011-5} (51%) create mode 100644 templates/security/PMASA-2011-6 copy templates/security/{_PMASA_ => PMASA-2011-7} (50%) copy templates/security/{PMASA-2011-4 => PMASA-2011-8} (57%) diff --git a/templates/security/PMASA-2011-2 b/templates/security/PMASA-2011-5 similarity index 51% copy from templates/security/PMASA-2011-2 copy to templates/security/PMASA-2011-5 index 8dfca27..0661593 100644 --- a/templates/security/PMASA-2011-2 +++ b/templates/security/PMASA-2011-5 @@ -3,55 +3,54 @@ <py:def function="announcement_id"> -PMASA-2011-2 +PMASA-2011-5 </py:def> <py:def function="announcement_date"> -2011-02-11 +2011-07-02 </py:def> <py:def function="announcement_summary"> -SQL query could be executed under another user. +Possible session manipulation in Swekey authentication. </py:def> <py:def function="announcement_description"> -It was possible to create a bookmark which would be executed unintentionally by other users. +It was possible to manipulate the PHP session superglobal using some of the Swekey authentication code. +This could open a path for other attacks. </py:def> <py:def function="announcement_severity"> We consider this vulnerability to be critical. </py:def> -<py:def function="announcement_mitigation"> -To use this vulnerability, phpMyAdmin configuration storage needs to be -set up and enabled and bookmarks function needs to be enabled. +<py:def function="announcement_affected"> +The 3.4.3 and earlier versions are affected. </py:def> -<py:def function="announcement_affected"> -The 2.11.x and 3.3.x versions are affected. +<py:def function="announcement_unaffected"> +Branch 2.11.x is not affected by this. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.3.9.2 or newer (2.11.11.3 or newer for the older -family) or apply the related patch listed below. +Upgrade to phpMyAdmin 3.3.10.2 or 3.4.3.1 or apply the related patch listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by <a href="http://cihar.com/">Michal Čihař</a>. +This issue was found by Frans Pehrson from <a href="http://www.xxor.se">Xxor AB</a> </py:def>  -<py:def function="announcement_cve">CVE-2011-0987</py:def> +<py:def function="announcement_cve">CVE-2011-2505</py:def> -<py:def function="announcement_cwe">661 89</py:def> +<py:def function="announcement_cwe">661</py:def> <py:def function="announcement_commits"> -a5464b4daff0059cdf8c9e5f4d54a80e2dd2a5b0 +7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 </py:def> -<py:def function="announcement_commits_2_11"> -2fa4c8d97a92ae0d4e2051d5d18a18688c31f84f +<py:def function="announcement_commits_3_3"> +6e6e129f26295c83d67b74e202628a4b8bc49e54 </py:def> <xi:include href="_page.tpl" /> diff --git a/templates/security/PMASA-2011-6 b/templates/security/PMASA-2011-6 new file mode 100644 index 0000000..2a258e5 --- /dev/null +++ b/templates/security/PMASA-2011-6 @@ -0,0 +1,58 @@ + +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + + +<py:def function="announcement_id"> +PMASA-2011-6 +</py:def> + +<py:def function="announcement_date"> +2011-07-02 +</py:def> + +<py:def function="announcement_summary"> +Possible code injection in setup script in case session variables are compromised. +</py:def> + +<py:def function="announcement_description"> +An unsanitized key from the Servers array is written in a comment of the generated config. +An attacker can modify this key by modifying the $_SESSION array. +This allows the attacker to close the comment and inject code. +</py:def> + +<py:def function="announcement_severity"> +We consider this vulnerability to be non critical. +</py:def> + +<py:def function="announcement_affected"> +The 3.4.3 and earlier versions are affected. +</py:def> + +<py:def function="announcement_unaffected"> +Branch 2.11.x is not affected by this. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.3.10.2 or 3.4.3.1 or apply the related patch listed below. +</py:def> + + +<py:def function="announcement_references"> +This issue was found by Frans Pehrson from <a href="http://www.xxor.se">Xxor AB</a> +</py:def> + + +<py:def function="announcement_cve">CVE-2011-2506</py:def> + +<py:def function="announcement_cwe">661 116</py:def> + +<py:def function="announcement_commits"> +0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f +</py:def> + +<py:def function="announcement_commits_3_3"> +2e01647949df937040e73a94ce0bac0daecbdcf4 +</py:def> + +<xi:include href="_page.tpl" /> +</html> diff --git a/templates/security/_PMASA_ b/templates/security/PMASA-2011-7 similarity index 50% copy from templates/security/_PMASA_ copy to templates/security/PMASA-2011-7 index 42f4f53..6a1aeb6 100644 --- a/templates/security/_PMASA_ +++ b/templates/security/PMASA-2011-7 @@ -3,75 +3,58 @@ <py:def function="announcement_id"> -PMASA-2011-? +PMASA-2011-7 </py:def> <py:def function="announcement_date"> -2011-??-?? +2011-07-02 </py:def> - - <py:def function="announcement_summary"> +Regular expression quoting issue in Synchronize code. </py:def> - - <py:def function="announcement_description"> +Through a possible bug in PHP running on Windows systems a null byte can truncate the pattern string allowing an attacker to inject the /e modifier causing the preg_replace function to execute its second argument as PHP code. </py:def> <py:def function="announcement_severity"> +We consider this vulnerability to be serious. </py:def> - <py:def function="announcement_affected"> +The 3.4.3 and earlier versions are affected. </py:def> - <py:def function="announcement_solution"> -Upgrade to phpMyAdmin ???? or newer or apply patch listed below. +Upgrade to phpMyAdmin 3.3.10.2 or 3.4.3.1 or apply the related patch listed below. </py:def>  <py:def function="announcement_references"> +This issue was found by Frans Pehrson from <a href="http://www.xxor.se">Xxor AB</a> </py:def>  -<py:def function="announcement_cve">CVE-201x-xxxx</py:def> +<py:def function="announcement_cve">CVE-2011-2507</py:def> - <py:def function="announcement_cwe">661</py:def> - -<py:def function="announcement_patches"> -</py:def> - - - <xi:include href="_page.tpl" /> </html> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-8 similarity index 57% copy from templates/security/PMASA-2011-4 copy to templates/security/PMASA-2011-8 index 8ea0026..8cd1be6 100644 --- a/templates/security/PMASA-2011-4 +++ b/templates/security/PMASA-2011-8 @@ -3,20 +3,19 @@ <py:def function="announcement_id"> -PMASA-2011-4 +PMASA-2011-8 </py:def> <py:def function="announcement_date"> -2011-05-22 +2011-07-02 </py:def> <py:def function="announcement_summary"> -URL redirection to untrusted site. +Possible directory traversal. </py:def> <py:def function="announcement_description"> -It was possible to redirect to an arbitrary, untrusted site, leading to -a possible phishing attack. +Fixed filtering of a file path in the MIME-type transformation code, which allowed for directory traversal. </py:def> <py:def function="announcement_severity"> @@ -24,26 +23,29 @@ We consider this vulnerability to be serious. </py:def> <py:def function="announcement_affected"> -The 3.4.0 version is affected. +The 3.4.3 and earlier versions are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.4.1 or apply the related patch listed below. +Upgrade to phpMyAdmin 3.3.10.2 or 3.4.3.1 or apply the related patch listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by Kian Mohageri. +This issue was found by Frans Pehrson from <a href="http://www.xxor.se">Xxor AB</a> </py:def>  -<py:def function="announcement_cve">CVE-2011-1941</py:def> +<py:def function="announcement_cve">CVE-2011-2508</py:def> -<py:def function="announcement_cwe">661 601</py:def> +<py:def function="announcement_cwe">661 98</py:def> <py:def function="announcement_commits"> -b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f -ecfc8ba4f7b4ea612c58ab5726054ed0f28e200d +b434320eff8ca9c2fc1b043c1804f868341af9a7 +</py:def> + +<py:def function="announcement_commits_3_3"> +5ee357a572866e730d83f56d6187a67c7c48e523 </py:def> <xi:include href="_page.tpl" /> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_3_1-39-g50efb55
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, TESTING has been updated via 50efb55a96643e997120a88e06b1a854b2feebd7 (commit) via e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) via b434320eff8ca9c2fc1b043c1804f868341af9a7 (commit) via 69fb0f8e7dc38075427aceaf09bcac697d0590ff (commit) via 0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f (commit) via 7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 (commit) from dfae6aa3ee78806160113cb221ba1249d5b6fdf9 (commit) - Log ----------------------------------------------------------------- commit 50efb55a96643e997120a88e06b1a854b2feebd7 Merge: dfae6aa3ee78806160113cb221ba1249d5b6fdf9 e214683f9fe4955dcbf0ffce045983728c7fa9d3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 21:19:06 2011 -0400 Merge branch 'MAINT_3_4_3' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 18 ++++++++++++------ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee33037..28a5ee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ phpMyAdmin - ChangeLog ====================== +3.4.3.1 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong @@ -89,7 +95,7 @@ phpMyAdmin - ChangeLog + patch #2974341 [structure] Clicking on table name in db Structure should Browse the table if possible, thanks to bhdouglass - dougboybhd + patch #2975533 [search] New search operators, thanks to - Martynas Mickevičius + Martynas MickeviÄius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. @@ -246,7 +252,7 @@ phpMyAdmin - ChangeLog 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - a page size increase, thanks to Martin Schönberger - mad05 + a page size increase, thanks to Martin SchÃ¶nberger - mad05 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name @@ -267,7 +273,7 @@ phpMyAdmin - ChangeLog 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker + databases, thanks to StÃ©phane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases @@ -307,9 +313,9 @@ phpMyAdmin - ChangeLog - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - thanks to Björn Wiberg - bwiberg + thanks to BjÃ¶rn Wiberg - bwiberg - bug #2983066 [interface] Flush table on table operations shows the query twice, - thanks to Martynas Mickevičius - BlinK_ + thanks to Martynas MickeviÄius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table @@ -388,7 +394,7 @@ phpMyAdmin - ChangeLog + rfe #2839504 [engines] Support InnoDB plugin's new row formats + [core] Added ability for synchronizing databases among servers. + [lang] #2843101 Dutch update, thanks to scavenger2008 -+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Galician update, thanks to XosÃ© Calvo - xosecalvo + [export] Added MediaWiki export module, thanks to Derek Schaefer - drummingds1 + [lang] Turkish update, thanks to Burak Yavuz diff --git a/Documentation.html b/Documentation.html index 576c1f0..25b9731 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3 - Documentation</title> + <title>phpMyAdmin 3.4.3.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3 + 3.4.3.1 Documentation </h1> </div> diff --git a/README b/README index 02ad016..e57152a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3 +Version 3.4.3.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cd1a0bf..28625f2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.3'); + $this->set('PMA_VERSION', '3.4.3.1'); /** * @deprecated */ diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index d2ec1b1..c5f613b 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 64a0383..c7d74ef 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1308,7 +1308,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ba6f813..c9f1242 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 95c3325..e33775e 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -39,7 +39,7 @@ class ConfigGenerator if ($cf->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_4_3_1-22-ge1a95b8
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, STABLE has been updated via e1a95b8cca8ed2eb89683bb78067079d6a7128e1 (commit) via e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) via b434320eff8ca9c2fc1b043c1804f868341af9a7 (commit) via 69fb0f8e7dc38075427aceaf09bcac697d0590ff (commit) via 0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f (commit) via 7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 (commit) from da052729c9c1783836ed0de402939c54fc2a94f8 (commit) - Log ----------------------------------------------------------------- commit e1a95b8cca8ed2eb89683bb78067079d6a7128e1 Merge: da052729c9c1783836ed0de402939c54fc2a94f8 e214683f9fe4955dcbf0ffce045983728c7fa9d3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 21:19:06 2011 -0400 Merge branch 'MAINT_3_4_3' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 18 ++++++++++++------ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb3ba9a..fe71031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ phpMyAdmin - ChangeLog ====================== +3.4.3.1 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong @@ -89,7 +95,7 @@ phpMyAdmin - ChangeLog + patch #2974341 [structure] Clicking on table name in db Structure should Browse the table if possible, thanks to bhdouglass - dougboybhd + patch #2975533 [search] New search operators, thanks to - Martynas Mickevičius + Martynas MickeviÄius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. @@ -243,7 +249,7 @@ phpMyAdmin - ChangeLog 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - a page size increase, thanks to Martin Schönberger - mad05 + a page size increase, thanks to Martin SchÃ¶nberger - mad05 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name @@ -264,7 +270,7 @@ phpMyAdmin - ChangeLog 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker + databases, thanks to StÃ©phane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases @@ -304,9 +310,9 @@ phpMyAdmin - ChangeLog - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - thanks to Björn Wiberg - bwiberg + thanks to BjÃ¶rn Wiberg - bwiberg - bug #2983066 [interface] Flush table on table operations shows the query twice, - thanks to Martynas Mickevičius - BlinK_ + thanks to Martynas MickeviÄius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table @@ -385,7 +391,7 @@ phpMyAdmin - ChangeLog + rfe #2839504 [engines] Support InnoDB plugin's new row formats + [core] Added ability for synchronizing databases among servers. + [lang] #2843101 Dutch update, thanks to scavenger2008 -+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Galician update, thanks to XosÃ© Calvo - xosecalvo + [export] Added MediaWiki export module, thanks to Derek Schaefer - drummingds1 + [lang] Turkish update, thanks to Burak Yavuz diff --git a/Documentation.html b/Documentation.html index 576c1f0..25b9731 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3 - Documentation</title> + <title>phpMyAdmin 3.4.3.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3 + 3.4.3.1 Documentation </h1> </div> diff --git a/README b/README index 02ad016..e57152a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3 +Version 3.4.3.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cd1a0bf..28625f2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.3'); + $this->set('PMA_VERSION', '3.4.3.1'); /** * @deprecated */ diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index d2ec1b1..c5f613b 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 64a0383..c7d74ef 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1308,7 +1308,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ba6f813..c9f1242 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 95c3325..e33775e 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -39,7 +39,7 @@ class ConfigGenerator if ($cf->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_3_1, created. RELEASE_3_4_3_1
by Marc Delisle 03 Jul '11

03 Jul '11

The annotated tag, RELEASE_3_4_3_1 has been created at 11bdba6ae1a4484650f032d36842cf4c4c341be2 (tag) tagging e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) replaces RELEASE_3_4_3 tagged by Marc Delisle on Sat Jul 2 21:19:05 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.3.1 Herman van Rink (4): Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 Marc Delisle (1): 3.4.3.1 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_10_2, created. RELEASE_3_3_10_2
by Marc Delisle 03 Jul '11

03 Jul '11

The annotated tag, RELEASE_3_3_10_2 has been created at 5881d2a9e0cfbd3df4f1b5b60aca82eeda7fad42 (tag) tagging ab31a2565f494c69e6b0d9a82a2932c7656592b5 (commit) replaces RELEASE_3_3_10_1 tagged by Marc Delisle on Sat Jul 2 21:10:55 2011 -0400 - Log ----------------------------------------------------------------- Released 3.3.10.2 Herman van Rink (5): Fixed possible session corruption in swekey authentication Fixed possible code injection incase session variables are compromised Fixed regexp quoting issue in Synchronize code Updated Changelog to add PMASA references Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 Marc Delisle (1): 3.3.10.2 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6497-g12fcc27
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, master has been updated via 12fcc270f2d0cc7df3a94a131e2f234b0ee8414c (commit) via 041cd7e7d2dfa95dd055da6fd2eb5308902fda95 (commit) via 58d86350c439c2ea06d58ba37f723e6e8a8f1abf (commit) via e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) via b434320eff8ca9c2fc1b043c1804f868341af9a7 (commit) via 69fb0f8e7dc38075427aceaf09bcac697d0590ff (commit) via 0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f (commit) via 7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 (commit) from a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f (commit) - Log ----------------------------------------------------------------- commit 12fcc270f2d0cc7df3a94a131e2f234b0ee8414c Merge: a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f 041cd7e7d2dfa95dd055da6fd2eb5308902fda95 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 20:52:10 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 18 ++++++++++++------ libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 504f54c..ae70fb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,12 @@ phpMyAdmin - ChangeLog - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option - bug #3340151 [export] Working SQL query exports error page +3.4.3.1 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong @@ -121,7 +127,7 @@ phpMyAdmin - ChangeLog + patch #2974341 [structure] Clicking on table name in db Structure should Browse the table if possible, thanks to bhdouglass - dougboybhd + patch #2975533 [search] New search operators, thanks to - Martynas Mickevičius + Martynas MickeviÄius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. @@ -275,7 +281,7 @@ phpMyAdmin - ChangeLog 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - a page size increase, thanks to Martin Schönberger - mad05 + a page size increase, thanks to Martin SchÃ¶nberger - mad05 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name @@ -296,7 +302,7 @@ phpMyAdmin - ChangeLog 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker + databases, thanks to StÃ©phane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases @@ -336,9 +342,9 @@ phpMyAdmin - ChangeLog - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - thanks to Björn Wiberg - bwiberg + thanks to BjÃ¶rn Wiberg - bwiberg - bug #2983066 [interface] Flush table on table operations shows the query twice, - thanks to Martynas Mickevičius - BlinK_ + thanks to Martynas MickeviÄius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table @@ -417,7 +423,7 @@ phpMyAdmin - ChangeLog + rfe #2839504 [engines] Support InnoDB plugin's new row formats + [core] Added ability for synchronizing databases among servers. + [lang] #2843101 Dutch update, thanks to scavenger2008 -+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Galician update, thanks to XosÃ© Calvo - xosecalvo + [export] Added MediaWiki export module, thanks to Derek Schaefer - drummingds1 + [lang] Turkish update, thanks to Burak Yavuz diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index d2ec1b1..c5f613b 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 3a39bc6..0280d8b 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1383,7 +1383,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1d8aaa5..a2ea20b 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -610,7 +610,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 2872221..f3c6ed8 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -39,7 +39,7 @@ class ConfigGenerator if ($cf->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3-22-g041cd7e
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, QA_3_4 has been updated via 041cd7e7d2dfa95dd055da6fd2eb5308902fda95 (commit) via 58d86350c439c2ea06d58ba37f723e6e8a8f1abf (commit) via e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) via b434320eff8ca9c2fc1b043c1804f868341af9a7 (commit) via 69fb0f8e7dc38075427aceaf09bcac697d0590ff (commit) via 0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f (commit) via 7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 (commit) from 5217946601b64ee6e92f97443cf4e515c03c0c27 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 18 ++++++++++++------ libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ac61c1..6bdeb8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,12 @@ phpMyAdmin - ChangeLog - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option - bug #3340151 [export] Working SQL query exports error page +3.4.3.1 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong @@ -95,7 +101,7 @@ phpMyAdmin - ChangeLog + patch #2974341 [structure] Clicking on table name in db Structure should Browse the table if possible, thanks to bhdouglass - dougboybhd + patch #2975533 [search] New search operators, thanks to - Martynas Mickevičius + Martynas MickeviÄius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. @@ -249,7 +255,7 @@ phpMyAdmin - ChangeLog 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - a page size increase, thanks to Martin Schönberger - mad05 + a page size increase, thanks to Martin SchÃ¶nberger - mad05 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name @@ -270,7 +276,7 @@ phpMyAdmin - ChangeLog 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker + databases, thanks to StÃ©phane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases @@ -310,9 +316,9 @@ phpMyAdmin - ChangeLog - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - thanks to Björn Wiberg - bwiberg + thanks to BjÃ¶rn Wiberg - bwiberg - bug #2983066 [interface] Flush table on table operations shows the query twice, - thanks to Martynas Mickevičius - BlinK_ + thanks to Martynas MickeviÄius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table @@ -391,7 +397,7 @@ phpMyAdmin - ChangeLog + rfe #2839504 [engines] Support InnoDB plugin's new row formats + [core] Added ability for synchronizing databases among servers. + [lang] #2843101 Dutch update, thanks to scavenger2008 -+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Galician update, thanks to XosÃ© Calvo - xosecalvo + [export] Added MediaWiki export module, thanks to Derek Schaefer - drummingds1 + [lang] Turkish update, thanks to Burak Yavuz diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index d2ec1b1..c5f613b 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 64a0383..c7d74ef 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1308,7 +1308,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ba6f813..c9f1242 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 95c3325..e33775e 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -39,7 +39,7 @@ class ConfigGenerator if ($cf->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_10_1-16-g1d60fb6
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, QA_3_3 has been updated via 1d60fb6da9bc9488c897f57efca21cb683ca8b8a (commit) via b8be5ebe2f98354eb7273e12a32f450daaa1479f (commit) via ab31a2565f494c69e6b0d9a82a2932c7656592b5 (commit) via 5ee357a572866e730d83f56d6187a67c7c48e523 (commit) via 911a83393e5b7064084fd140889d0fb2f3166b99 (commit) via ca74f480f119a53ef07ca40d2ab28f063cc89ec9 (commit) via 2e01647949df937040e73a94ce0bac0daecbdcf4 (commit) via 6e6e129f26295c83d67b74e202628a4b8bc49e54 (commit) via 6eae88e65f39347e480cf67008f3d98f19f47248 (commit) from 1ec75facafab7fc88e486a20222c07c88730a925 (commit) - Log ----------------------------------------------------------------- commit 1d60fb6da9bc9488c897f57efca21cb683ca8b8a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 20:45:06 2011 -0400 3.3.10.2 release commit b8be5ebe2f98354eb7273e12a32f450daaa1479f Merge: 1ec75facafab7fc88e486a20222c07c88730a925 ab31a2565f494c69e6b0d9a82a2932c7656592b5 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 2 20:42:04 2011 -0400 Merge branch 'MAINT_3_3_10' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigFile.class.php | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 920123b..0aa00f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,13 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.11.0 (not yet released) +3.3.10.2 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory travers +al, see PMASA-2011-8 + 3.3.10.1 (2011-05-20) - [security] XSS on Tracking page diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index 3dbad75..2a790c4 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 7ef333d..186ce3e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1220,7 +1220,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 79948b9..646ef25 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigFile.class.php b/setup/lib/ConfigFile.class.php index c0ff63d..978eba3 100644 --- a/setup/lib/ConfigFile.class.php +++ b/setup/lib/ConfigFile.class.php @@ -286,7 +286,7 @@ class ConfigFile if ($this->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($this->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0