Git

git@phpmyadmin.net

13 participants
38228 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-1408-g0593112
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, QA_3_4 has been updated via 05931126744134ff1aa13e7104c87d428a756daf (commit) via dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) from 1b309ed30a8707f370fa0069dd2286c5eceadc3b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 637f3b8..ea60343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,8 +135,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-20-gbc0b9fa
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, QA_3_3 has been updated via bc0b9fa744bd1b1a7ff460f728248e581ee106f0 (commit) from b1103e2db99405d032a230ed50f0b88b799605a3 (commit) - Log ----------------------------------------------------------------- commit bc0b9fa744bd1b1a7ff460f728248e581ee106f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 13:01:59 2010 -0500 3.3.8.1 correct release date and PMASA ref ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41c784f..f25d225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,8 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-1383-gdff18d6
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, MAINT_3_4_0 has been updated via dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) from 75411c999bb771f8fb71f4b2e92d9adb186c0f52 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5895330..2c791ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,8 +133,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. eba8989fad267c75cf0921aab77bbb038dca3fc2
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, master has been updated via eba8989fad267c75cf0921aab77bbb038dca3fc2 (commit) from 1dba678617085aed739e65fad249327c4290680e (commit) - Log ----------------------------------------------------------------- commit eba8989fad267c75cf0921aab77bbb038dca3fc2 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:53:44 2010 -0500 PMASA-2010-8 ----------------------------------------------------------------------- Summary of changes: templates/security/{PMASA-2010-7 => PMASA-2010-8} | 23 +++++++++----------- 1 files changed, 10 insertions(+), 13 deletions(-) copy templates/security/{PMASA-2010-7 => PMASA-2010-8} (54%) diff --git a/templates/security/PMASA-2010-7 b/templates/security/PMASA-2010-8 similarity index 54% copy from templates/security/PMASA-2010-7 copy to templates/security/PMASA-2010-8 index 105dcf5..29bd1a1 100644 --- a/templates/security/PMASA-2010-7 +++ b/templates/security/PMASA-2010-8 @@ -1,19 +1,19 @@ <html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> <py:def function="announcement_id"> -PMASA-2010-7 +PMASA-2010-8 </py:def> <py:def function="announcement_date"> -2010-09-08 +2010-11-29 </py:def> <py:def function="announcement_summary"> -XSS attack on setup script. +XSS attack in database search. </py:def> <py:def function="announcement_description"> -It was possible to conduct a XSS attack using spoofed request to setup script. +It was possible to conduct a XSS attack using spoofed request on the db search script. </py:def> <py:def function="announcement_severity"> @@ -21,25 +21,22 @@ We consider this vulnerability to be non critical. </py:def> <py:def function="announcement_affected"> -For 3.x: versions before 3.3.7 are affected. -</py:def> - -<py:def function="announcement_unaffected"> -Branch 2.11.x is not affected by this. +For 3.x: versions before 3.3.8.1 are affected. For 2.11.x: versions before 2.11.11.1 are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.3.7 or newer or apply patch listed below. +Upgrade to phpMyAdmin 3.3.8.1 or newer, or 2.11.11.1 if using the 2.11.x family. You can also apply the patch listed below. </py:def> <py:def function="announcement_references"> -Thanks to <a href="http://tenable.com/">Tenable Network Security</a> for reporting this issue. +Thanks to Alexander Opitz for reporting this issue. </py:def> -<py:def function="announcement_cve">CVE-2010-3263</py:def> +<py:def function="announcement_cve">CVE-2010-4329</py:def> <py:def function="announcement_commits"> -73ce5705bd1e0b62060f75702d62f88247ce09dd +4341818d73d454451f024950a4ce0141608ac7f8 +e1f4901ffc400b6d2df15eac0ba5015fe48a27c4 </py:def> <xi:include href="_page.tpl" /> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_0ALPHA1-22-g3a8a0bb
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, TESTING has been updated via 3a8a0bb72980135e1138ab75b7db49b4f76108a1 (commit) via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from c00efbe9888588c5b44cdc429fa59cc8b8157e38 (commit) - Log ----------------------------------------------------------------- commit 3a8a0bb72980135e1138ab75b7db49b4f76108a1 Merge: c00efbe9888588c5b44cdc429fa59cc8b8157e38 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:28:46 2010 -0500 Merge branch 'MAINT_3_3_8' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- Documentation.html | 4 ++-- README | 7 +++---- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 +- translators.html | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a10389..b7274b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,9 @@ - bug #3077463 [core] Events were not copied when copying/renaming database - bug #1762306 [core] Copy database with view of a view +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -141,9 +144,6 @@ 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 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 848c19e..58538ce 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.0-alpha1 - Documentation</title> + <title>phpMyAdmin 3.3.8.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.0-alpha1 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index f08e7b0..74276f7 100644 --- a/README +++ b/README @@ -25,10 +25,9 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as published by the Free Software Foundation. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + Version 3.3.8.1 + --------------- + http://www.phpmyadmin.net/ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ae584da..743a729 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.0-alpha1'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } diff --git a/translators.html b/translators.html index 89bb761..2094e3f 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <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.0-alpha1 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-alpha1 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_3_8_1-9-g19e56ea
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, STABLE has been updated via 19e56eacec926545507d9805b49b34c682e17d0a (commit) via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from 8291c2069dd503155f59a6ea4c480fceed998e61 (commit) - Log ----------------------------------------------------------------- commit 19e56eacec926545507d9805b49b34c682e17d0a Merge: 8291c2069dd503155f59a6ea4c480fceed998e61 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:28:46 2010 -0500 Merge branch 'MAINT_3_3_8' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 +- translators.html | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4827fb6..8fad918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -18,9 +21,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 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 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index a233ccd..bf30068 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,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.3.8 - Documentation</title> + <title>phpMyAdmin 3.3.8.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,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.3.8 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index 967acde..d84e8d7 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8 - ------------- + Version 3.3.8.1 + --------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6594e3a..8f5c43d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 610438c..b926e92 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1634,7 +1634,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } diff --git a/translators.html b/translators.html index 598e218..f390397 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <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.3.8 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_8_1, created. RELEASE_3_3_8_1
by Marc Delisle 29 Nov '10

29 Nov '10

The annotated tag, RELEASE_3_3_8_1 has been created at 9e8536cca8c7a97dc29c96ac838b7fa8400606a5 (tag) tagging 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) replaces RELEASE_3_3_8 tagged by Marc Delisle on Mon Nov 29 12:28:45 2010 -0500 - Log ----------------------------------------------------------------- Released 3.3.8.1 Herman van Rink (1): bug #3115519: fixed XSS on search Marc Delisle (3): ChangeLog for XSS fix 3.3.8.1 release 3.3.8.1 release date and PMASA ref ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_11_11_1, created. RELEASE_2_11_11_1
by Marc Delisle 29 Nov '10

29 Nov '10

The annotated tag, RELEASE_2_11_11_1 has been created at 14af0f77e983a3ebce39749b0dfc6f780888dd4e (tag) tagging 61d9e561580ccb4a07d6d0c5695c839a22cc3b78 (commit) replaces RELEASE_2_11_11 tagged by Marc Delisle on Mon Nov 29 12:18:56 2010 -0500 - Log ----------------------------------------------------------------- Released 2.11.11.1 Herman van Rink (1): bug #3115519: fixed XSS on search Marc Delisle (3): ChangeLog for XSS search 2.11.11.1 release 2.11.11.1 release date and PMASA ref ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, updated. RELEASE_3_3_8-4-g1507989
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, MAINT_3_3_8 has been updated via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) from fcc04991533333d18c86b3005967da2d75a56fb9 (commit) - Log ----------------------------------------------------------------- commit 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:16:27 2010 -0500 3.3.8.1 release date and PMASA ref ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a10607..8fad918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, updated. RELEASE_2_11_11-4-g61d9e56
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, MAINT_2_11_11 has been updated via 61d9e561580ccb4a07d6d0c5695c839a22cc3b78 (commit) from a6e79391b92a48ffef307fa107ce1a61965e4244 (commit) - Log ----------------------------------------------------------------- commit 61d9e561580ccb4a07d6d0c5695c839a22cc3b78 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:11:59 2010 -0500 2.11.11.1 release date and PMASA ref ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cb1ab2..89fe37c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -2.11.11.1 (2010-11-26) -- bug #3115519 (private) [security] XSS on db search +2.11.11.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 2.11.11.0 (2010-09-07) - [core] Fix broken cleanup of $_GET hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git