webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
93,239 Commits 12 Branches 481 Tags
e433d8189bb9cf00a17602cf183334bbf8684fc9
Commit Graph

11775 Commits

Author SHA1 Message Date
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
Michal Čihař
96366ce7bc Remove no longer used caching configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:15 +02:00
Michal Čihař
4c328aaf03 Remove workaround for older MySQL versions 
Remove workaround originally implemented for MySQL < 5.0.2, but also
useful in 5.1.x times for listing tables within database when
permissions on one of database directories are wrong.

I've tested this with several MySQL versions and it does not seem to be
needed now, the INFORMATION SCHEMA works correctly even if some of the
database directories have wrong permissions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:14 +02:00
Michal Čihař
dbd18940be Remove explicit unsetting of local variables 
This was useful in global scope, but makes no sense when used inside
method as all it's variables are cleaned up anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
697cbf22d5 Simplify code 
foreach on empty list does nothing, so we can skip the initial
condition.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
ecfcba84f1 Correct parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:26:08 +02:00
Michal Čihař
6751384d16 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 09:17:47 +02:00
Michal Čihař
e71869daf1 Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-06-10 09:15:00 +02:00
Michal Čihař
06abaaa33f Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 08:59:18 +02:00
Isaac Bennetch
307dd3b798 Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2014-06-09 16:37:43 -04:00
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-09 22:44:07 +05:30
Marc Delisle
a0c7ad52fe Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-09 12:44:47 -04:00
Marc Delisle
00bad7150b Merge pull request #1211 from smita786/gsoc_central_columns_list 
option to Make table consistent with central list of columns
 2014-06-09 12:27:40 -04:00
Smita Kumari
6b8575734c option to Make table consistent with central list of columns 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

make messages transtalable

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

Coding style fix

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

Make confirmation button options translatable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-09 20:35:10 +05:30
Hugues Peccatte
b55719206b Remove SQL format for multi-table queries. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 15:27:40 +02:00
Hugues Peccatte
22d3e26cba Minor PHPDoc and return update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 15:20:22 +02:00
Michal Čihař
2d489d3bc7 Add missing space 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:23:46 +02:00
Michal Čihař
273de91741 Simplify code as zero length array is empty as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:20:01 +02:00
Marc Delisle
199982f0d0 4.2.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-08 18:35:23 -04:00
Marc Delisle
060fb03afb Merge pull request #1206 from smita786/gsoc_central_columns_list 
Using central list of columns : pick a column from central list
 2014-06-07 15:37:42 -04:00
Smita Kumari
294e36bdb6 pick a column from central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

small bug fix

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

added own style

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

not display column name that already exist in tabl

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

added search to the pick column dialog

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

Fix coding style

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

check for central columns configuration relation

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

pagination in pick coulumn dialog

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

code cleanup

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

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-07 22:06:05 +05:30
Marc Delisle
563fcfab53 Merge commit 'e2ce715' 2014-06-07 09:33:30 -04:00
Marc Delisle
e2ce71566f Missing space in index creation/edit generated query 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 09:31:17 -04:00
Marc Delisle
36d2c402fa Merge branch 'QA_4_2' 2014-06-07 09:03:10 -04:00
Marc Delisle
9342cc6709 Incorrect menu tab generation from usergroups 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 09:02:10 -04:00
Marc Delisle
de6ad93d24 Merge pull request #1209 from ashutoshdhundhara/rfe_1145 
RFE#1145: Preview SQL instead of executing it.
 2014-06-07 06:39:32 -04:00