Commit Graph

157 Commits

Author SHA1 Message Date
Madhura Jayaratne
d74fe20f8e Fix phpmyadmin-security#254 CSRF allowing password reset
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-12-11 09:33:50 -05:00
Maurício Meneghini Fauth
9901a61324 Replace static methods with instance methods
Replace PhpMyAdmin\UserPassword static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-25 13:37:14 -03:00
Maurício Meneghini Fauth
6cd23f8d2b Refactor user_password functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-14 17:51:33 -03:00
Maurício Meneghini Fauth
2217b4c960 Refactor change password function to static method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-06 21:42:18 -03:00
Maurício Meneghini Fauth
b803dc42dd Move server privileges to static methods
Move libraries/server_privileges.lib.php to libraries/classes/Server/Privileges.php

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-04 19:29:22 -03:00
Michal Čihař
e471d6b5eb Remove PMA_MYSQL_INT_VERSION from privileges code
This allows us to get rid of runkit dependency on testing this.

Fixes #13484

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-17 15:17:41 +02:00
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-08 10:54:21 -03:00
Maurício Meneghini Fauth
119563b7ea Move classes to PhpMyAdmin namespace
- Move OpenDocument to PhpMyAdmin namespace
- Move OutputBuffering to PhpMyAdmin namespace
- Move Partition to PhpMyAdmin namespace
- Move Pdf class to PhpMyAdmin namespace
- Move RecentFavoriteTable to PhpMyAdmin namespace
- Move Response to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 23:44:10 -03:00
Maurício Meneghini Fauth
54a15dbd9c Move classes to PhpMyAdmin namespace
- Move Logging to PhpMyAdmin namespace
- Move Menu to PhpMyAdmin namespace
- Move Message to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-30 13:30:04 -03:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Maurício Meneghini Fauth
3f632ef7bc Move js/zxcvbn.js to js/vendor/zxcvbn.js
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-14 02:01:11 -03:00
Maurício Meneghini Fauth
e330402b5b Refactor the core functions into static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-03 00:52:22 -03:00
Michal Čihař
d10cf08393 Avoid duplicating $response
We need to get it just once, see
https://github.com/phpmyadmin/phpmyadmin/issues/13154#issuecomment-300301726

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 23:43:39 +02:00
Fenn-CS
a661c06fd6 Added a locale reference for $response in PMA_getChangePassMessage() of user_password.php
Fixes #13154

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-07 15:23:26 +02:00
Michal Čihař
308c9d7951 Simplify Response object handling
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 18:17:59 +01:00
Michal Čihař
b56f101039 Remove is_ajax_request global
We already have the same information on Response object, so let's use it
from there.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-07 17:54:34 +01:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
ac2cfef6c8 Move scripts loading to correct location
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-11-10 09:59:48 +01:00
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
2016-10-29 10:45:12 +05:30
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
76a471a790 Avoid problems with PHP comparison
- allow password where empty returns true
- compare using ===

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-17 13:18:45 +02:00
Michal Čihař
1cd7b757bf Merge branch 'master' into master-security 2016-08-02 08:45:23 +02:00
Michal Čihař
afcec9d9d7 Merge branch 'QA_4_6' 2016-08-02 08:34:42 +02:00
Michal Čihař
ef9bd20e7a Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:33:39 +02:00
Michal Čihař
cdcf74ab0b Fixed password change on MariaDB without auth plugin
Fixes #12424

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-02 08:32:59 +02:00
Michal Čihař
b6df1bd1e3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 17:04:39 +02:00
Michal Čihař
c90967071a Do not allow to set too long password
We do not accept password longer than 256 chars, so do not accept it on
password change as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 17:04:26 +02:00
Michal Čihař
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Deven Bansod
68903ae7a7 Merge branch 'QA_4_6' 2016-07-26 01:05:17 +05:30
Deven Bansod
25182fb6c3 Fix #12391 : Message with 'Change password successfully' displayed, but does not take effect
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-07-26 00:25:08 +05:30
Michal Čihař
c136a74705 Cache current user information for DBI lifetime
We query this information quite often, so it makes sense to fetch it
only once from the MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-06 09:45:53 +02:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Michal Čihař
f141cb1463 Merge branch 'QA_4_5' 2016-01-17 18:44:09 +01:00
Michal Čihař
bfaa77ef21 Fix password change on MariaDB 10.1 and newer
Use SET PASSWORD which seems again do the correct thing there.

Fixes #11855

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-17 18:43:32 +01:00
Michal Čihař
20a508358b Fix comment
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-17 18:35:42 +01:00
Marc Delisle
1daeb372db Remove unneeded code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-20 18:33:43 -05:00
Deven Bansod
996a6b6636 Move the variable assignment inside the else-if block
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-12-19 16:37:33 -05:00
Deven Bansod
c7b40c9717 Add a base case for MySQL versions 5.5.0 - 5.5.7 - Might give an error on these versions otherwise
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-12-19 22:59:15 +05:30
Deven Bansod
dc64071185 Add a base case for MySQL versions 5.5.0 - 5.5.7
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-12-19 22:00:39 +05:30
Deven Bansod
7c0a25c937 Move the variable assignment inside the else-if block
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-12-19 21:56:57 +05:30
Marc Delisle
a93160128f Fix indenting
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-19 10:53:31 -05:00
Marc Delisle
74a867fd45 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-19 10:46:56 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-04 09:05:42 -05:00
Madhura Jayaratne
1cffd63940 More coding style fixes
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-26 19:54:39 +11:00
Deven Bansod
107f054ed6 Merge branch 'QA_4_5'
Conflicts:
	libraries/server_privileges.lib.php
	po/pt_BR.po
	user_password.php
2015-11-26 14:40:25 +05:30
Deven Bansod
d55abcd5ff Fix issue 11684
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-24 15:46:50 +05:30
Hugues Peccatte
ffc4422db7 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-19 20:33:21 +02:00
Marc Delisle
da5e605ba7 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-15 12:26:17 -04:00
Deven Bansod
19f1536a1c Fixed error in PR : 11569
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-10-16 02:55:07 +05:30
Marc Delisle
7ddbfefb9d Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-13 11:32:21 -04:00