gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,311 Commits 12 Branches 481 Tags 2.4 GiB
c83457fb8a
Commit Graph

11800 Commits

Author SHA1 Message Date
Dhananjay Nakrani
0b9439a246 Make automatic php error report submission ('sendErrorReport'='always') aysnchronous. Stop infinite auto error reporting loop. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
9a1fb901d0 Remove included 'common_error_reporting.php' script and its inclusion from all the scripts. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
e1ee8d2d9e Move error reporting code to a separate function 'PMA_Error_Handler::reportError()'. Hook it in 'PMA_Footer::getErrorMessages()'. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:53 +05:30
Dhananjay Nakrani
86b3f352a9 Stop false alarms (displaying prompts-reporting form and reporting for 'false' (user warnings) errors). 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:53 +05:30
Dhananjay Nakrani
ed564f4d63 Remove unnecessary code. A deliberate error & local error-reporting-server URL. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:53 +05:30
Dhananjay Nakrani
6d04bc17bc Send only backtrace (not displayBacktrace). Change getBacktrace to return first 'X' frames. Send stackhash too. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:53 +05:30
Dhananjay Nakrani
1ba7140be5 Send only(without HTML) error message string. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
7b8006651b Make "Ignore All" button work on login page. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
43e1aa5ce2 Fix Syntax errors. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
e74cd6ec1d Report errors based on user preference. All the cases taken care of. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
64451c557a Add standard pma code for the library files. Add comments explaining file usage. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
087f7b7829 Add script that will report all the errors of current-script-run. This script is intended to be used same as common.inc.php, but at the end of each script. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 10:07:38 -04:00
Marc Delisle
c43df7d140 Clarify parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 17:42:08 -04:00
Marc Delisle
f6c44d8ccb Merge pull request #1230 from smita786/gsoc_central_columns_list 
PHPUnit test case for central_columns.lib.php
 2014-06-14 14:27:08 -04:00
Marc Delisle
d4a45f66cc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:36:55 -04:00
Smita Kumari
b663334c5b PHPUnit test case 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding styl

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-14 22:06:37 +05:30
Marc Delisle
03fb581447 Refactor vertical display links 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:34:06 -04:00
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 23:56:24 +05:30
Isaac Bennetch
85fdd3cef3 Merge branch 'D-storm-so' 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:43:56 -04:00
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 00:39:28 +05:30
Michal Čihař
bd4cccc039 Move password change handling to authenticaton plugins 
We should not care about plugin type while changing password, we should
just notify it and the plugin should be responsible for anything needed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
92a10d0968 Factor out cookie storing to separate methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
234cfbf73f Document AES usage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
e433d8189b Use phpseclib for generating session encryption key 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
da047efbd1 Use random per session key for encrypting password 
This makes it impossible to decrypt cookies later if the key would be
compromised.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
5e51f178dd Remove some blowfish mentions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
cd4d54395b Remove another reference to Blowfish 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable 
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 13:45:03 +02:00
Michal Čihař
ddac366fd6 Merge remote-tracking branch 'origin/QA_4_2' 
Conflicts:
	libraries/DatabaseInterface.class.php
 2014-06-12 13:37:35 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-12 16:55:27 +05:30
Michal Čihař
96977c994e Use require here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:50:52 +02:00
Michal Čihař
20640592f0 Always use phpseclib for cookie encryption 
- it provides fallback in case mcrypt is not found
- we now use AES in both mcrypt and PHP code case
- cleanup the code by removing mcrypt conditials
- rename some methods and cookies so that they don't refer to
  implementation details
- switching encryption implementations no longer invalidates the
  credentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:39:52 +02:00
Michal Čihař
0652ca9ccd Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 10:19:00 +02:00
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
Michal Čihař
c6e76422c4 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:06:20 +02:00
Michal Čihař
d69f8bdd09 Update phpseclib to latest Git snapshot 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:02:52 +02:00
Michal Čihař
716f6d4c55 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 09:47:17 +02:00
Michal Čihař
953c7415ad Separate check for password cookie 
Otherwise it would not be possible to recall user name.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:47:04 +02:00
Michal Čihař
5d39998a86 Merge commit '7cba81de271d62bdf93ded7598709702a96f92d7' 
Conflicts:
	libraries/plugins/auth/AuthenticationCookie.class.php
 2014-06-12 09:45:13 +02:00
Michal Čihař
7cba81de27 Regenerate cookie encryption IV for every session 
The IV for cookie encryption was generated just once for every browser
and kept in a cookie. Generating it for every session is much better to
avoid information leaks (eg. that same user has logged in).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:41:27 +02:00
Michal Čihař
b252cb9981 Use better source of entropy for mcrypt IV 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:16:20 +02:00
Marc Delisle
a6d379caf2 Since PHP 5.3.0, it's not longer required to call srand() before 
mcrypt_create_iv().

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-11 08:31:23 -04:00
Marc Delisle
08790597c7 Merge pull request #1220 from smita786/gsoc_central_columns_list 
security bug fixes
 2014-06-11 08:08:08 -04:00
Smita Kumari
b749a7b1d6 security bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

use existing escapeHtml function

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-11 17:31:36 +05:30
Marc Delisle
a83ca5d73b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-10 19:00:16 +05:30
Marc Delisle
62a1d6d030 Merge pull request #1215 from smita786/gsoc_central_columns_list 
using $GLOBALS['controllink'] for queries being executed on cebtral coulumns tab...
 2014-06-10 08:44:52 -04:00
Smita Kumari
ac759f96b4 using ['controllink'] for queries veing executed on cebtral coulumns table 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

use link 'userlink' for query being fired on tables other than central columns table

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-10 17:57:01 +05:30