From 773c507cda348a5a5518fb5c5daa8ed0de176359 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 31 Jul 2014 07:00:58 -0400 Subject: [PATCH 1/8] 4.2.7 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79a98c23a7..7afac1ac44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.2.7.0 (not yet released) +4.2.7.0 (2014-07-31) - bug Broken links on home page - bug #4494 Overlap in navigation panel - bug #4427 Action icons not in horizontal order diff --git a/README b/README index 9f1cbb8725..3a009ab3a1 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.7-dev +Version 4.2.7 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 7dd6a63c5d..9b82d55c26 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.2.7-dev' +version = '4.2.7' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5b282b6a9b..5945fe2fef 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.7-dev'); + $this->set('PMA_VERSION', '4.2.7'); /** * @deprecated */ From 0cd293f5e13aa245e4a57b8d373597cc0e421b6f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:41:57 -0400 Subject: [PATCH 2/8] bug #4505 [security] XSS in view operations page Signed-off-by: Marc Delisle --- ChangeLog | 3 +++ js/functions.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7afac1ac44..cec9d77fad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ phpMyAdmin - ChangeLog ====================== +4.2.7.1 (2014-08-17) +- bug #4505 [security] XSS in view operations page + 4.2.7.0 (2014-07-31) - bug Broken links on home page - bug #4494 Overlap in navigation panel diff --git a/js/functions.js b/js/functions.js index 09bfeda57f..a970a81584 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3585,7 +3585,7 @@ AJAX.registerOnload('functions.js', function () { var question = PMA_messages.strDropTableStrongWarning + ' '; question += $.sprintf( PMA_messages.strDoYouReally, - 'DROP VIEW ' + PMA_commonParams.get('table') + 'DROP VIEW ' + escapeHtml(PMA_commonParams.get('table')) ); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { From 647c9d12e33a6b64e1c3ff7487f72696bdf2dccb Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:45:10 -0400 Subject: [PATCH 3/8] bug #4501 [security] XSS in table browse page Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/sql.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cec9d77fad..54120c2053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.2.7.1 (2014-08-17) +- bug #4501 [security] XSS in table browse page - bug #4505 [security] XSS in view operations page 4.2.7.0 (2014-07-31) diff --git a/js/sql.js b/js/sql.js index 8b77c1aae0..aad4a454e8 100644 --- a/js/sql.js +++ b/js/sql.js @@ -119,7 +119,7 @@ AJAX.registerOnload('sql.js', function () { // Delete row from SQL results $('a.delete_row.ajax').live('click', function (e) { e.preventDefault(); - var question = $.sprintf(PMA_messages.strDoYouReally, $(this).closest('td').find('div').text()); + var question = $.sprintf(PMA_messages.strDoYouReally, escapeHtml($(this).closest('td').find('div').text())); var $link = $(this); $link.PMA_confirm(question, $link.attr('href'), function (url) { $msgbox = PMA_ajaxShowMessage(); From 2c45d7caa614afd71dbe3d0f7270f51ce5569614 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:47:53 -0400 Subject: [PATCH 4/8] bug #4502 [security] Self-XSS in enum value editor Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 54120c2053..941a059ada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.2.7.1 (2014-08-17) - bug #4501 [security] XSS in table browse page +- bug #4502 [security] Self-XSS in enum value editor - bug #4505 [security] XSS in view operations page 4.2.7.0 (2014-07-31) diff --git a/js/functions.js b/js/functions.js index a970a81584..bcdead8e17 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2692,7 +2692,7 @@ AJAX.registerOnload('functions.js', function () { } else { title = PMA_messages.enum_columnVals.replace( /%s/, - '"' + decodeURIComponent(colname) + '"' + '"' + escapeHtml(decodeURIComponent(colname)) + '"' ); } // Get the values as a string From cd9f302bf7f91a160fe7080f9a612019ef847f1c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:50:27 -0400 Subject: [PATCH 5/8] bug #4503 [security] Self-XSSes in monitor Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/server_status_monitor.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 941a059ada..94b41b5d26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.2.7.1 (2014-08-17) - bug #4501 [security] XSS in table browse page - bug #4502 [security] Self-XSS in enum value editor +- bug #4503 [security] Self-XSSes in monitor - bug #4505 [security] XSS in view operations page 4.2.7.0 (2014-07-31) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index c3a0c53893..f5465ed6f7 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -908,7 +908,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { label: $('#variableInput').val().replace(/_/g, " ") }; newChart.series.push(newSeries); - $('#seriesPreview').append('- ' + newSeries.label + str + '
'); + $('#seriesPreview').append('- ' + escapeHtml(newSeries.label + str) + '
'); newChart.nodes.push(serie); $('#variableInput').val(''); $('input[name="differentialValue"]').prop('checked', true); From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:52:05 -0400 Subject: [PATCH 6/8] bug #4504 [security] Self-XSS in query charts Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/tbl_chart.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 94b41b5d26..eea09d6158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4501 [security] XSS in table browse page - bug #4502 [security] Self-XSS in enum value editor - bug #4503 [security] Self-XSSes in monitor +- bug #4504 [security] Self-XSS in query charts - bug #4505 [security] XSS in view operations page 4.2.7.0 (2014-07-31) diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 943d4aee35..04c9c40b0c 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -47,7 +47,7 @@ function PMA_queryChart(data, columnNames, settings) { }, axes : { xaxis : { - label : settings.xaxisLabel + label : escapeHtml(settings.xaxisLabel) }, yaxis : { label : settings.yaxisLabel From 3ffc967fb60cf2910cc2f571017e977558c67821 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 17 Aug 2014 08:54:05 -0400 Subject: [PATCH 7/8] bug #4517 [security] XSS in relation view Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/tbl_relation.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eea09d6158..1edd1858bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4503 [security] Self-XSSes in monitor - bug #4504 [security] Self-XSS in query charts - bug #4505 [security] XSS in view operations page +- bug #4517 [security] XSS in relation view 4.2.7.0 (2014-07-31) - bug Broken links on home page diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 0e1bc3d802..60b020ed47 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -554,7 +554,7 @@ function PMA_getHtmlForForeignKey($save_row, $i, $existrel_foreign, $myfield, $d $html_output .= __('Constraint name'); $html_output .= ''; + . ' value="' . htmlspecialchars($constraint_name) . '"/>'; $html_output .= '' . "\n"; $html_output .= ''; From 7f977f46335b9707fb5f7bf30d6bdb92263d2233 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 17 Aug 2014 08:56:43 -0400 Subject: [PATCH 8/8] 4.2.7.1 release Signed-off-by: Marc Delisle --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 3a009ab3a1..99eb9183c2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.7 +Version 4.2.7.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 9b82d55c26..9163679e37 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.2.7' +version = '4.2.7.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5945fe2fef..5c2189a67d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.7'); + $this->set('PMA_VERSION', '4.2.7.1'); /** * @deprecated */