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

93239 Commits

This Branch
This Branch
All Branches
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ř
5f3b69908a Document that we are using AES for encryption 
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
Marc Delisle
ceb77ce6d4 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-12 08:28:33 -04: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
Michal Čihař
2b8bb91bc3 Merge pull request #1223 from D-storm/bug-4454 
bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da...
 2014-06-12 13:36:23 +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ř
a7bcbbc35f Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:51:29 +02:00
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ř
bd482546bc Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 09:45:43 +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ř
1cd945e548 Merge commit '59bb241cf13fd9a02626eb73daf5a5ca8476b29e' 2014-06-12 09:44:51 +02:00
Weblate
76c051bcea Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-12 09:44:11 +02:00
Burak Yavuz
e664c931d2 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:09 +02:00
Matías Bellone
480b992aae Translated using Weblate (Spanish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:06 +02:00
Giovanni Sora
bfb0f98a91 Translated using Weblate (Interlingua) 
Currently translated at 51.1% (1417 of 2770)
 2014-06-12 09:44:03 +02:00
Marc Delisle
ffb543b6e3 Translated using Weblate (French) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:01 +02:00
Dieter Adriaenssens
88910393e5 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2768 of 2770)
 2014-06-12 09:44:00 +02:00
Michal Čihař
29094da204 Translated using Weblate (Czech) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:43:58 +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
Weblate
ada85ff63e Merge remote-tracking branch 'origin/master' 2014-06-11 14:08:21 +02:00
Giovanni Sora
359a9c3d53 Translated using Weblate (Interlingua) 
Currently translated at 51.4% (1441 of 2803)
 2014-06-11 14:08:17 +02:00
Kristjan Räts
0e4b51ac2f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-11 14:08:15 +02:00
Dieter Adriaenssens
c17d6e3f9a Translated using Weblate (Dutch) 
Currently translated at 99.6% (2793 of 2803)
 2014-06-11 14:08:13 +02:00
Michal Čihař
42111aa0e9 Translated using Weblate (Czech) 
Currently translated at 99.1% (2780 of 2803)
 2014-06-11 14:08:11 +02: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
Kristjan Räts
59bb241cf1 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-11 09:06:45 +02:00
Matías Bellone
2ca9001608 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-11 04:59:43 +02:00
Domen
a92fe0541b Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 21:35:20 +02:00
Domen
e9f7dafd21 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-10 21:34:11 +02:00
Burak Yavuz
8371ae9ea3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 19:40:03 +02:00
Marc Delisle
ee063a664d Translated using Weblate (French) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 19:15:45 +02:00
Marc Delisle
548982acf7 Update po files 2014-06-10 12:46:53 -04:00
Marc Delisle
1c47963a82 Merge commit '92aaa7f' 2014-06-10 12:46:32 -04:00
Marc Delisle
92aaa7f900 Update po files 2014-06-10 12:45:56 -04:00
Weblate
a4d35bcc1b Merge remote-tracking branch 'origin/master' 2014-06-10 18:44:23 +02:00
Burak Yavuz
331e7b9fda Translated using Weblate (Turkish) 
Currently translated at 100.0% (2803 of 2803)
 2014-06-10 18:44:20 +02:00